UI Rework

2 files changed, 72 insertions, 29 deletions

diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index 1bdbe4d..7f3d391 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -3,27 +3,17 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.canvas.Canvas?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.control.ComboBox?>
-<?import java.lang.String?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.Pane?>
-<GridPane stylesheets="@/styles/main.css" styleClass="bg-gray-orange">
+<?import javafx.scene.layout.VBox?>
+<GridPane fx:id="root" stylesheets="@/styles/main.css" styleClass="bg-gray-orange" 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">
   <rowConstraints>
     <RowConstraints/> <!--"Neue Anmeldung", "von x bis x", Buttons-->
     <RowConstraints/> <!--"Fahrzeug", "Personen"-->
@@ -35,7 +25,7 @@
   <columnConstraints>
     <ColumnConstraints/>
     <ColumnConstraints prefWidth="20"/> <!--The gap between the colums-->
-    <ColumnConstraints/>
+    <ColumnConstraints prefWidth="360"/> <!--EmployeeListItem: 360-->
   </columnConstraints>
   <padding>
     <Insets topRightBottomLeft="12"/>
@@ -48,17 +38,16 @@
   </AnchorPane>
   <VBox spacing="3"> <!--"Neue Anmeldung", "von bis"-->
     <Label text="Neue Anmeldung" styleClass="text-big, text-white, text-bold"/>
-    <HBox spacing="6" alignment="CENTER">
+    <HBox spacing="6" alignment="CENTER_LEFT">
       <Label text="von" styleClass="text-medium, text-white"/>
-      <ComboBox value="8:00" style="-fx-background-color: transparent"
-        styleClass="text-medium, text-white, text-bold"/>
+      <ChoiceBox fx:id="cbStart" value="8:00" styleClass="text-medium, text-bold"/>
       <Label text="bis" styleClass="text-medium, text-white"/>
-      <ComboBox value="16:00"/>
+      <ChoiceBox fx:id="cbEnd" value="16:00" styleClass="text-medium, text-bold"/>
     </HBox>
   </VBox>
   <VBox GridPane.columnIndex="2" GridPane.halignment="RIGHT" alignment="TOP_RIGHT">
-    <Hyperlink text="schließen" styleClass="text-small, text-white"/>
-    <Button text="ERSTELLEN" styleClass="button-main, text-medium"/>
+    <Hyperlink text="schließen" onMouseClicked="#cancel" styleClass="text-small, text-white"/>
+    <Button text="ERSTELLEN" onMouseClicked="#create" styleClass="button-main, text-medium, shadowed"/>
   </VBox>
   <Label text="Fahrzeug" GridPane.rowIndex="1" styleClass="text-big, text-white, text-bold">
     <GridPane.margin>
@@ -71,27 +60,40 @@
       <Insets top="12"/>
     </GridPane.margin>
   </Label>
-  <Label text="ZZZ-40821" GridPane.valignment="TOP" alignment="TOP_LEFT" GridPane.rowIndex="2"
+  <Label fx:id="lVehicles" text="ZZZ-40821" GridPane.valignment="TOP" alignment="TOP_LEFT" GridPane.rowIndex="2"
     styleClass="text-medium, text-white"/>
-  <Label wrapText="true" alignment="TOP_LEFT" prefWidth="200"
+  <Label fx:id="lEmployees" wrapText="true" alignment="TOP_LEFT" prefHeight="20"
     text="Ein seeeeeee eeeeeeeeeee eeeeeeeeeeee eeeeeeeehr langer Text" GridPane.rowIndex="2"
     GridPane.columnIndex="2" styleClass="text-medium, text-white"/>
 
-  <Button GridPane.rowIndex="5" prefHeight="500" text="LISTENPLATZHALTER"/>
-  <Button GridPane.rowIndex="5" prefHeight="500" GridPane.columnIndex="2" text="LISTENPLATZHALTER"/>
+  <ScrollPane GridPane.rowIndex="5">
+    <GridPane.margin>
+      <Insets left="-6" right="-6"/>
+    </GridPane.margin>
+    <VBox fx:id="vbVehicles" spacing="6">
+      <padding>
+        <Insets top="6" left="6" right="6"/>
+      </padding>
+    </VBox>
+  </ScrollPane>
+  <ScrollPane fx:id="listEmployee" hbarPolicy="NEVER" GridPane.rowIndex="5" GridPane.columnIndex="2">
+    <GridPane.margin>
+      <Insets left="-7" right="-20"/>
+    </GridPane.margin>
+  </ScrollPane>
   <VBox GridPane.rowIndex="4" spacing="6" styleClass="bg-white, shadowed">
     <padding>
       <Insets topRightBottomLeft="6"/>
     </padding>
     <Label text="Fahrzeugsuche" styleClass="text-medium"/>
-    <TextField styleClass="text-big, text-bold"/>
+    <TextField fx:id="tfVehicleSearch" onKeyTyped="#tfVehicleSearch_TextChanged" styleClass="text-big, text-bold"/>
   </VBox>
   <VBox GridPane.rowIndex="4" spacing="6" GridPane.columnIndex="2" styleClass="bg-white, shadowed">
     <padding>
       <Insets topRightBottomLeft="6"/>
     </padding>
     <Label text="Personensuche" styleClass="text-medium"/>
-    <TextField styleClass="text-big, text-bold"/>
+    <TextField fx:id="tfEmployeeSearch" onKeyTyped="#tfEmployeeSearch_TextChanged" styleClass="text-big, text-bold"/>
   </VBox>
 </GridPane>
 
diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css
index fe4a87a..b567666 100644
--- a/src/main/resources/styles/main.css
+++ b/src/main/resources/styles/main.css
@@ -102,3 +102,44 @@
   -fx-font-weight: bold;
 }
 
+/* === text field === */
+.text-field {
+    /*-fx-text-box-border: transparent black black black;*/
+    -fx-background-color: -fx-control-inner-background;
+    /*-fx-background-insets: 0;*/
+    -fx-padding: 1 3 1 3;
+    -fx-border-color: transparent transparent black transparent;
+
+}
+
+.text-field:focused {
+    -fx-focus-color: transparent;
+    -fx-faint-focus-color: transparent;
+}
+
+/* === scroll pane === */
+.scroll-pane {
+  -fx-background-color:transparent;
+}
+
+.scroll-pane .scroll-bar:vertical {
+    -fx-opacity: 0;
+}
+
+/* === choice box ===
+.choice-box {
+  -fx-background-color: transparent;
+  -fx-padding: 2 2 2 2;
+}
+
+.choice-box .label {
+  -fx-text-fill: white;
+}
+
+.choice-box .arrow, .choice-box .arrow-button{
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+    -fx-padding: 0;
+}*/
+