Merge branch 'develop' into change_operation_status_fix

# Conflicts:
#	src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
#	src/main/resources/fxml/CreateOperationController.fxml

1 files changed, 68 insertions, 87 deletions

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 99f2e22..dbdb4ef 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -6,92 +6,73 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController">
-   <children>
-      <AnchorPane layoutX="964.0" layoutY="-66.0" prefHeight="182.0" prefWidth="1200.0" style="-fx-background-color: #2D75B6;" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
-      <AnchorPane fx:id="apCreateOperation" layoutX="40.0" layoutY="71.0" prefHeight="151.0" prefWidth="920.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
-         <children>
-            <Label layoutX="14.0" layoutY="14.0" prefHeight="30.0" prefWidth="62.0" text="Code">
-               <font>
-                  <Font size="19.0" />
-               </font>
-            </Label>
-            <Label layoutX="185.0" layoutY="14.0" prefHeight="30.0" prefWidth="94.0" text="Adresse">
-               <font>
-                  <Font size="19.0" />
-               </font>
-            </Label>
-            <Label layoutX="587.0" layoutY="14.0" prefHeight="30.0" prefWidth="121.0" text="Anmerkung">
-               <font>
-                  <Font size="19.0" />
-               </font>
-            </Label>
-            <TextField fx:id="txtCode" layoutX="14.0" layoutY="48.0" prefHeight="39.0" prefWidth="163.0">
-               <font>
-                  <Font name="System Bold" size="20.0" />
-               </font>
-            </TextField>
-            <TextField fx:id="txtAddress" layoutX="185.0" layoutY="48.0" prefHeight="39.0" prefWidth="396.0">
-               <font>
-                  <Font name="System Bold" size="20.0" />
-               </font>
-            </TextField>
-            <TextField fx:id="txtNote" layoutX="587.0" layoutY="48.0" prefHeight="39.0" prefWidth="319.0">
-               <font>
-                  <Font name="System Bold" size="20.0" />
-               </font>
-            </TextField>
-            <Label layoutX="14.0" layoutY="101.0" prefHeight="30.0" prefWidth="102.0" text="Fahrzeuge:">
-               <font>
-                  <Font size="19.0" />
-               </font>
-            </Label>
-            <Label fx:id="lblChosenVehicles" layoutX="116.0" layoutY="102.0" prefHeight="30.0" prefWidth="610.0" text="keine ausgewählt">
-               <font>
-                  <Font size="19.0" />
-               </font>
-            </Label>
-            <Button fx:id="btnCreateOperation" layoutX="747.0" layoutY="95.0" mnemonicParsing="false" onAction="#createOperationClicked" prefHeight="0.0" prefWidth="158.0" text="Erstellen">
-               <font>
-                  <Font name="System Bold" size="21.0" />
-               </font>
-            </Button>
-         </children>
-      </AnchorPane>
-      <Hyperlink layoutX="44.0" layoutY="38.0" onAction="#onRegistrationLinkClicked" text="Anmeldungen" textFill="WHITE">
-         <font>
-            <Font size="15.0" />
-         </font>
-      </Hyperlink>
-      <Hyperlink layoutX="802.0" layoutY="38.0" onAction="#onEmployeeLinkClicked" text="Personen" textFill="WHITE">
-         <font>
-            <Font size="15.0" />
-         </font>
-      </Hyperlink>
-      <Hyperlink layoutX="877.0" layoutY="38.0" onAction="#onVehicleLinkClicked" text="Fahrzeuge" textFill="WHITE">
-         <font>
-            <Font size="15.0" />
-         </font>
-      </Hyperlink>
-      <AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0" prefWidth="207.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);">
-         <children>
-            <ListView fx:id="lvActiveOperations" layoutX="4.0" layoutY="74.0" prefHeight="242.0" prefWidth="200.0" style="-fx-background-color: white;" />
-            <Label layoutX="10.0" layoutY="14.0" prefHeight="46.0" prefWidth="103.0" text="Aktive Einsätze">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </Label>
-            <Label layoutX="148.0" layoutY="28.0" text="Archiv">
-               <font>
-                  <Font size="13.0" />
-               </font>
-            </Label>
-         </children>
-      </AnchorPane>
-      <ListView fx:id="lvVehicles" layoutX="40.0" layoutY="228.0" prefHeight="388.0" prefWidth="920.0" style="-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
-      <AnchorPane fx:id="apInvisible" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: rgba(0,0,0,0.7);" visible="false" />
-      <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0" />
-   </children>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+  prefHeight="650.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/9.0.1"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController"
+  stylesheets="@/styles/main.css">
+  <AnchorPane prefHeight="182.0" style="-fx-background-color: #2D75B6;" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" AnchorPane.rightAnchor="0.0"/>
+  <AnchorPane fx:id="apCreateOperation" layoutX="40.0" layoutY="71.0" prefHeight="151.0"
+    prefWidth="920.0"
+    styleClass="bg-white, shadowed">
+    <Label layoutX="14.0" layoutY="14.0" prefHeight="30.0" prefWidth="62.0" text="Code" styleClass="text-medium"/>
+    <Label layoutX="185.0" layoutY="14.0" prefHeight="30.0" prefWidth="94.0" text="Adresse"
+      styleClass="text-medium"/>
+    <Label layoutX="587.0" layoutY="14.0" prefHeight="30.0" prefWidth="121.0" text="Anmerkung" styleClass="text-medium"/>
+    <TextField fx:id="txtCode" layoutX="14.0" layoutY="48.0" prefHeight="39.0"
+      prefWidth="163.0" styleClass="text-big">
+      <font>
+        <Font name="System Bold"/>
+      </font>
+    </TextField>
+    <TextField fx:id="txtAddress" layoutX="185.0" layoutY="48.0" prefHeight="39.0"
+      prefWidth="396.0" styleClass="text-big">
+      <font>
+        <Font name="System Bold"/>
+      </font>
+    </TextField>
+    <TextField fx:id="txtNote" layoutX="587.0" layoutY="48.0" prefHeight="39.0"
+      prefWidth="319.0" styleClass="text-big">
+      <font>
+        <Font name="System Bold"/>
+      </font>
+    </TextField>
+    <Label layoutX="14.0" layoutY="101.0" prefHeight="30.0" prefWidth="102.0"
+      text="Fahrzeuge:" styleClass="text-medium"/>
+    <Label fx:id="lblChosenVehicles" layoutX="116.0" layoutY="102.0" prefHeight="30.0"
+      prefWidth="610.0" text="keine ausgewählt" styleClass="text-big"/>
+    <Button fx:id="btnCreateOperation"  layoutX="747.0" styleClass="text-big, button-main" layoutY="95.0" mnemonicParsing="false"
+      onAction="#createOperationClicked" prefHeight="0.0" prefWidth="158.0" text="Erstellen">
+      <font>
+        <Font name="System Bold"/>
+      </font>
+    </Button>
+  </AnchorPane>
+  <Hyperlink layoutX="44.0" layoutY="38.0" onAction="#onRegistrationLinkClicked" text="Anmeldungen"
+    textFill="WHITE" styleClass="text-small">
+  </Hyperlink>
+  <Hyperlink layoutX="802.0" layoutY="38.0" onAction="#onEmployeeLinkClicked" text="Personen" styleClass="text-small"
+    textFill="WHITE">
+  </Hyperlink>
+  <Hyperlink layoutX="877.0" layoutY="38.0" onAction="#onVehicleLinkClicked" text="Fahrzeuge" styleClass="text-small"
+    textFill="WHITE">
+  </Hyperlink>
+  <!--<AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0" prefWidth="207.0" style="-fx-background-color: white; -fx-effect: dropshadow(gaussian, rgba(0.5,0.5,0.5,0.8), 5, 0, 0, 3);">-->
+  <AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0"
+    prefWidth="207.0"
+    styleClass="bg-white, shadowed">
+    <ListView fx:id="lvActiveOperations" layoutX="4.0" layoutY="74.0" prefHeight="242.0"
+      prefWidth="200.0" style="-fx-background-color: white;"/>
+    <Label layoutX="10.0" layoutY="6.0"
+      text="Aktive Einsätze" styleClass="text-big">
+    </Label>
+    <Hyperlink onAction="#onArchivLinkClicked" layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"/>
+  </AnchorPane>
+  <FlowPane fx:id="fpVehicles" hgap="12" layoutX="40.0" layoutY="228.0" prefHeight="388.0"
+    prefWidth="920.0" vgap="12">
+  </FlowPane>
+  <AnchorPane fx:id="apInvisible" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: rgba(0,0,0,0.7);" visible="false" />
+  <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0" />
 </AnchorPane>