From 5ac73cfac0501f53d8a449d4181152725752ee20 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 18 Jun 2018 12:45:06 +0200
Subject: UI Changes to match UI Document. Coloring, Scrolling.

---
 .../controller/RegistrationWindowController.java   |   1 +
 .../resources/fxml/CreateOperationController.fxml  | 121 +++++++++------------
 src/main/resources/fxml/RegistrationWindow.fxml    |  73 +------------
 3 files changed, 58 insertions(+), 137 deletions(-)

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
index 76f31b3..ed5a12d 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
@@ -266,6 +266,7 @@ public class RegistrationWindowController {
 
     public void setVisible(boolean b) {
         root.setVisible(b);
+        reset();
     }
 
     public void tfVehicleSearch_TextChanged(KeyEvent keyEvent) {
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index d9194f7..5fd64f5 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -1,100 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.FlowPane?>
-<?import javafx.scene.text.Font?>
 <?import javafx.scene.layout.GridPane?>
-<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.controller.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"
-      onKeyReleased="#onOperationCodeChanged"
-      prefWidth="163.0" styleClass="text-big">
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" styleClass="bg-gray-blue" stylesheets="@/styles/main.css" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController">
+  <AnchorPane prefHeight="182.0" styleClass="bg-blue" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="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" styleClass="text-medium" text="Code" />
+    <Label layoutX="185.0" layoutY="14.0" prefHeight="30.0" prefWidth="94.0" styleClass="text-medium" text="Adresse" />
+    <Label layoutX="587.0" layoutY="14.0" prefHeight="30.0" prefWidth="121.0" styleClass="text-medium" text="Anmerkung" />
+    <TextField fx:id="txtCode" layoutX="14.0" layoutY="48.0" onKeyReleased="#onOperationCodeChanged" prefHeight="39.0" prefWidth="163.0" styleClass="text-big">
       <font>
-        <Font name="System Bold"/>
+        <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">
+    <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 name="System Bold" />
       </font>
     </TextField>
-    <TextField fx:id="txtNote" layoutX="587.0" layoutY="48.0" prefHeight="39.0"
-      prefWidth="319.0" styleClass="text-big">
+    <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 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">
+    <Label layoutX="14.0" layoutY="101.0" prefHeight="30.0" prefWidth="102.0" styleClass="text-medium" text="Fahrzeuge:" />
+    <Label fx:id="lblChosenVehicles" layoutX="116.0" layoutY="102.0" prefHeight="30.0" prefWidth="610.0" styleClass="text-big" text="keine ausgewählt" />
+    <Button fx:id="btnCreateOperation" layoutX="747.0" layoutY="95.0" mnemonicParsing="false" onAction="#createOperationClicked" prefHeight="0.0" prefWidth="158.0" styleClass="text-big, button-main" text="Erstellen">
       <font>
-        <Font name="System Bold"/>
+        <Font name="System Bold" />
       </font>
     </Button>
   </AnchorPane>
-  <Hyperlink layoutX="44.0" layoutY="38.0" onAction="#onRegistrationLinkClicked" text="Anmeldungen"
-    textFill="WHITE" styleClass="text-small">
+  <Hyperlink layoutX="44.0" layoutY="38.0" onAction="#onRegistrationLinkClicked" styleClass="text-small" text="Anmeldungen" textFill="WHITE">
   </Hyperlink>
-  <Hyperlink layoutX="802.0" layoutY="38.0" onAction="#onEmployeeLinkClicked" text="Personen"
-    styleClass="text-small"
-    textFill="WHITE">
+  <Hyperlink layoutX="802.0" layoutY="38.0" onAction="#onEmployeeLinkClicked" styleClass="text-small" text="Personen" textFill="WHITE">
   </Hyperlink>
-  <Hyperlink layoutX="877.0" layoutY="38.0" onAction="#onVehicleLinkClicked" text="Fahrzeuge"
-    styleClass="text-small"
-    textFill="WHITE">
+  <Hyperlink layoutX="877.0" layoutY="38.0" onAction="#onVehicleLinkClicked" styleClass="text-small" text="Fahrzeuge" textFill="WHITE">
   </Hyperlink>
-  <AnchorPane layoutX="968.0" layoutY="71.0" prefHeight="315.0"
-    prefWidth="207.0"
-    styleClass="bg-white, shadowed">
-    <ListView fx:id="lvActiveOperations" layoutX="4.0" layoutY="30.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">
+  <AnchorPane 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" styleClass="text-big" text="Aktive Einsätze">
     </Label>
-    <Hyperlink onAction="#onArchivLinkClicked" layoutY="7.0" text="Archiv" styleClass="text-medium"
-      AnchorPane.rightAnchor="12"/>
+    <Hyperlink layoutY="7.0" onAction="#onArchivLinkClicked" styleClass="text-medium" text="Archiv" 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" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0"
-    AnchorPane.rightAnchor="0" AnchorPane.bottomAnchor="0"
-    style="-fx-background-color: rgba(0,0,0,0.7);" visible="false"/>
+  <ScrollPane hbarPolicy="NEVER" layoutX="34.0" layoutY="222.0" prefHeight="388.0" prefWidth="920.0" vbarPolicy="ALWAYS">
+    <FlowPane fx:id="fpVehicles" hgap="12" vgap="12">
+      <padding>
+        <Insets topRightBottomLeft="6" />
+      </padding>
+    </FlowPane>
+  </ScrollPane>
+  <AnchorPane fx:id="apInvisible" style="-fx-background-color: rgba(0,0,0,0.7);" visible="false" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0" />
 
-  <GridPane fx:id="grdWindowContainer" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0"
-    AnchorPane.rightAnchor="0" AnchorPane.bottomAnchor="0" alignment="CENTER">
-    <fx:include source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/>
+  <GridPane fx:id="grdWindowContainer" alignment="CENTER" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0">
+    <padding>
+      <Insets topRightBottomLeft="12" />
+    </padding>
+    <fx:include fx:id="registrationWindow" source="/fxml/RegistrationWindow.fxml" />
+      <columnConstraints>
+         <ColumnConstraints />
+      </columnConstraints>
+      <rowConstraints>
+         <RowConstraints />
+      </rowConstraints>
   </GridPane>
-  <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml"
-    AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
-  <fx:include AnchorPane.leftAnchor="240.0" AnchorPane.topAnchor="60.0" fx:id="manageEmployees"
-    source="/fxml/manageEmployees.fxml"/>
-  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0"
-    source="/fxml/createCar.fxml" fx:id="createCar"/>
-  <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml"
-    fx:id="archiveOperation"/>
+  <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0" />
+  <fx:include fx:id="manageEmployees" source="/fxml/manageEmployees.fxml" AnchorPane.leftAnchor="240.0" AnchorPane.topAnchor="60.0" />
+  <fx:include fx:id="createCar" source="/fxml/createCar.fxml" AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" />
+  <fx:include fx:id="archiveOperation" source="/fxml/ArchiveOperation.fxml" AnchorPane.leftAnchor="100.0" />
 </AnchorPane>
diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index a1638f4..afd6d55 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -25,7 +25,7 @@
   <columnConstraints>
     <ColumnConstraints/>
     <ColumnConstraints prefWidth="20"/> <!--The gap between the colums-->
-    <ColumnConstraints prefWidth="360"/> <!--EmployeeListItem: 360-->
+    <ColumnConstraints prefWidth="320"/> <!--EmployeeListItem: 320-->
   </columnConstraints>
   <padding>
     <Insets topRightBottomLeft="12"/>
@@ -63,16 +63,16 @@
   <Label fx:id="lVehicles" text="ZZZ-40821" GridPane.valignment="TOP" alignment="TOP_LEFT" GridPane.rowIndex="2"
     styleClass="text-medium, text-white"/>
   <Label fx:id="lEmployees" wrapText="true" alignment="TOP_LEFT" prefHeight="20"
-    text="Ein seeeeeee eeeeeeeeeee eeeeeeeeeeee eeeeeeeehr langer Text" GridPane.rowIndex="2"
+    text="PERSONEN" GridPane.rowIndex="2"
     GridPane.columnIndex="2" styleClass="text-medium, text-white"/>
 
-  <ScrollPane GridPane.rowIndex="5">
+  <ScrollPane GridPane.rowIndex="5" hbarPolicy="NEVER" vbarPolicy="ALWAYS" >
     <GridPane.margin>
-      <Insets left="-6" right="-6" bottom="-12"/>
+      <Insets left="-7" right="-20" bottom="-12"/>
     </GridPane.margin>
     <VBox fx:id="vbVehicles" spacing="6">
       <padding>
-        <Insets top="6" left="6" right="6"/>
+        <Insets top="6" left="6" right="6" bottom="6"/>
       </padding>
     </VBox>
   </ScrollPane>
@@ -96,66 +96,3 @@
     <TextField fx:id="tfEmployeeSearch" onKeyTyped="#tfEmployeeSearch_TextChanged" styleClass="text-big, text-bold"/>
   </VBox>
 </GridPane>
-
-  <!--<VBox fx:id="registrationWindowVB" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" style="-fx-background-color: WHITE;" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.RegistrationWindowController">-->
-  <!--<children>-->
-  <!--<AnchorPane prefHeight="135.0" prefWidth="600.0">-->
-  <!--<children>-->
-  <!--<Label layoutX="14.0" layoutY="14.0" text="Neue Anmeldung" />-->
-  <!--<Label layoutX="14.0" layoutY="44.0" text="von" />-->
-  <!--<Label layoutX="133.0" layoutY="44.0" text="bis" />-->
-  <!--<ChoiceBox fx:id="cbStart" layoutX="42.0" layoutY="40.0" prefWidth="80.0" />-->
-  <!--<ChoiceBox fx:id="cbEnd" layoutX="159.0" layoutY="40.0" prefWidth="80.0" />-->
-  <!--<Label layoutX="10.0" layoutY="82.0" text="Fahrzeug" />-->
-  <!--<Label fx:id="lVehicles" layoutX="10.0" layoutY="108.0" text="Fahrzeugname" />-->
-  <!--<Label layoutX="216.0" layoutY="82.0" text="Personen" />-->
-  <!--<Label fx:id="lEmployees" layoutX="216.0" layoutY="108.0" text="Namen" />-->
-  <!--</children>-->
-  <!--</AnchorPane>-->
-  <!--<SplitPane dividerPositions="0.35" prefWidth="200.0">-->
-  <!--<items>-->
-  <!--<VBox prefHeight="200.0" prefWidth="100.0">-->
-  <!--<children>-->
-  <!--<Label text="Fahrzeugsuche" />-->
-  <!--<TextField fx:id="tfVehicleSearch" />-->
-  <!--<TableView fx:id="tvVehicles" prefHeight="200.0" prefWidth="200.0">-->
-  <!--<columns>-->
-  <!--<TableColumn fx:id="tcVehicles" prefWidth="75.0" text="Fahrzeuge" />-->
-  <!--</columns>-->
-  <!--<columnResizePolicy>-->
-  <!--<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />-->
-  <!--</columnResizePolicy>-->
-  <!--</TableView>-->
-  <!--</children>-->
-  <!--</VBox>-->
-  <!--<VBox prefHeight="200.0" prefWidth="100.0">-->
-  <!--<children>-->
-  <!--<Label text="Personensuche" />-->
-  <!--<TextField fx:id="tfEmployeeSearch" />-->
-  <!--<TableView fx:id="tvEmployees" prefHeight="200.0" prefWidth="200.0">-->
-  <!--<columns>-->
-  <!--<TableColumn fx:id="tcEmployees" prefWidth="75.0" text="Personen" />-->
-  <!--</columns>-->
-  <!--<columnResizePolicy>-->
-  <!--<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />-->
-  <!--</columnResizePolicy>-->
-  <!--</TableView>-->
-  <!--</children>-->
-  <!--</VBox>-->
-  <!--</items>-->
-  <!--</SplitPane>-->
-  <!--<HBox alignment="CENTER" prefWidth="200.0">-->
-  <!--<children>-->
-  <!--<Button mnemonicParsing="false" onAction="#cancel" text="Abbrechen">-->
-  <!--<HBox.margin>-->
-  <!--<Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />-->
-  <!--</HBox.margin>-->
-  <!--</Button>-->
-  <!--<Button mnemonicParsing="false" onAction="#create" text="Erstellen">-->
-  <!--<HBox.margin>-->
-  <!--<Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />-->
-  <!--</HBox.margin>-->
-  <!--</Button>-->
-  <!--</children></HBox>-->
-  <!--</children>-->
-  <!--</VBox>-->
-- 
cgit v1.2.3-70-g09d2