From 6f3f64297be1f694e73db616ff000dfede211965 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 26 May 2018 16:00:10 +0200
Subject: Included fxml-Files

Included fxml-Files "ArchiveOperation", "createCar", "listEmployees" and "RegistrationWindow" in "CreateOperationController". Therefore these windows are not standalone windows anymore but part of the main window. Additionally, methods were added to their respective controllers in order to show and hide the windows
---
 src/main/resources/fxml/ArchiveOperation.fxml          | 7 +++----
 src/main/resources/fxml/CreateOperationController.fxml | 5 ++++-
 src/main/resources/fxml/RegistrationWindow.fxml        | 2 +-
 src/main/resources/fxml/createCar.fxml                 | 4 ++--
 src/main/resources/fxml/listEmployees.fxml             | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 88b5b39..7eace12 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -7,15 +7,14 @@
 <?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" style="-fx-background-color: BLACK;" 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.ArchiveOperationController">
+<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" 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.ArchiveOperationController">
   <children>
-    <AnchorPane prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" AnchorPane.leftAnchor="200.0" />
-      <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.0">
+      <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
          <content>
           <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" />
          </content>
       </ScrollPane>
-      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="201.0" AnchorPane.topAnchor="0.0">
+      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <AnchorPane prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 0a09611..ba27f53 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -66,7 +66,6 @@
     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">
@@ -85,4 +84,8 @@
     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"/>
+  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="listEmployees" source="/fxml/listEmployees.fxml"/>
+  <fx:include AnchorPane.leftAnchor="300" AnchorPane.topAnchor="135.4" source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/>
+  <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/>
+  <fx:include AnchorPane.leftAnchor="200.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/>
 </AnchorPane>
diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index 0394ca7..a138d02 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.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.RegistrationWindowController">
+<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>
diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index cefac82..99cd7b0 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -6,11 +6,11 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
-<AnchorPane prefHeight="400.0" prefWidth="600.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.CreateCarController">
+<AnchorPane fx:id="createCarAP" prefHeight="400.0" 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.CreateCarController">
    <children>
       <ChoiceBox fx:id="cmb_Ctyp" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
       <ChoiceBox fx:id="cmb_typ" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
-      <Button fx:id="btn_cancel" layoutX="500.0" layoutY="14.0" mnemonicParsing="false" text="abbrechen" onAction="#cancelAction"/>
+      <Button fx:id="btn_cancel" layoutX="500.0" layoutY="14.0" mnemonicParsing="false" onAction="#cancelAction" text="abbrechen" />
       <Button fx:id="btn_create" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" />
       <CheckBox fx:id="cbx_NEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" />
       <FlowPane fx:id="fp_vehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" />
diff --git a/src/main/resources/fxml/listEmployees.fxml b/src/main/resources/fxml/listEmployees.fxml
index ae815e1..6c4593b 100644
--- a/src/main/resources/fxml/listEmployees.fxml
+++ b/src/main/resources/fxml/listEmployees.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+<AnchorPane fx:id="listEmployeesAP" visible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
   prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;"
   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.ListEmployeesController">
-- 
cgit v1.2.3-70-g09d2


From 4725b91b94a915e20736ba59c5e07f1249f2bca1 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 26 May 2018 17:02:18 +0200
Subject: Added back links for extra windows to get back to main window

---
 .../controller/ArchiveOperationController.java      |  5 +++++
 .../controller/CreateCarController.java             |  4 ++--
 .../controller/ListEmployeesController.java         |  2 +-
 src/main/resources/fxml/ArchiveOperation.fxml       | 11 ++++++++++-
 src/main/resources/fxml/createCar.fxml              |  1 +
 src/main/resources/fxml/listEmployees.fxml          | 21 +++++++++++----------
 6 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index ab4982b..4f6f55f 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -131,6 +131,11 @@ public class ArchiveOperationController {
         setDetailsVisible(false);
     }
 
+    public void backToMain() {
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+
     public void setVisible(boolean b) {
         archiveOperationAP.setVisible(b);
     }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
index 74e699b..7e964cb 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
@@ -213,8 +213,8 @@ public class CreateCarController {
         createCarAP.setVisible(b);
     }
 
-    public void cancel() {
+    public void backToMain() {
         this.setVisible(false);
-        createOperationController.setVisible(false);
+        createOperationController.setVisible(true);
     }
 }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
index 4637a80..02a3e4c 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
@@ -126,7 +126,7 @@ public class ListEmployeesController {
         listEmployeesAP.setVisible(b);
     }
 
-    public void close() {
+    public void backToMain() {
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 7eace12..2f55b24 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -9,7 +9,7 @@
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" 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.ArchiveOperationController">
   <children>
-      <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
+      <ScrollPane layoutY="100.0" prefHeight="550.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
          <content>
           <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" />
          </content>
@@ -65,5 +65,14 @@
             </ScrollPane>
          </children>
       </AnchorPane>
+      <AnchorPane prefHeight="100.0" prefWidth="800.0" style="-fx-background-color: BROWN;">
+         <children>
+            <Hyperlink layoutX="713.0" layoutY="16.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
+               <font>
+                  <Font name="System Bold" size="16.0" />
+               </font>
+            </Hyperlink>
+         </children>
+      </AnchorPane>
   </children>
 </AnchorPane>
diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index 99cd7b0..a33c26e 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -14,5 +14,6 @@
       <Button fx:id="btn_create" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" />
       <CheckBox fx:id="cbx_NEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" />
       <FlowPane fx:id="fp_vehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" />
+      <Button layoutX="398.0" layoutY="14.0" mnemonicParsing="false" onAction="#backToMain" prefHeight="26.0" prefWidth="80.0" text="Zurück" />
    </children>
 </AnchorPane>
diff --git a/src/main/resources/fxml/listEmployees.fxml b/src/main/resources/fxml/listEmployees.fxml
index 6c4593b..7f9e638 100644
--- a/src/main/resources/fxml/listEmployees.fxml
+++ b/src/main/resources/fxml/listEmployees.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -8,31 +9,31 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="listEmployeesAP" visible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-  prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;"
-  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.ListEmployeesController">
+<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" 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.ListEmployeesController">
   <children>
     <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;">
       <children>
         <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
           <font>
-            <Font name="Calibri Bold" size="22.0"/>
+            <Font name="Calibri Bold" size="22.0" />
           </font>
         </Label>
+            <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE">
+               <font>
+                  <Font name="System Bold" size="16.0" />
+               </font>
+            </Hyperlink>
       </children>
     </AnchorPane>
     <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0">
       <children>
-        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0"
-          style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);"/>
+        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
         <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER">
           <VBox.margin>
-            <Insets top="20.0"/>
+            <Insets top="20.0" />
           </VBox.margin>
           <content>
-            <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0"
-              style="-fx-background-color: #EFEBE8;"/>
+            <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;" />
           </content>
         </ScrollPane>
       </children>
-- 
cgit v1.2.3-70-g09d2


From 370defca15ffcce5859ecc8f27a5a5cf1025dfbf Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 27 May 2018 09:01:03 +0200
Subject: Fixed a bug which would lead to failed tests [#27470]

---
 .../einsatzverwaltung/controller/CreateOperationController.java         | 1 +
 src/main/resources/fxml/createCar.fxml                                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index 7ceea47..7ee1f37 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -105,6 +105,7 @@ public class CreateOperationController {
                         openDetailsWindow(lvActiveOperations.getSelectionModel().getSelectedItem());
                     }
                 });
+        createCarController.setVisible(false);
     }
 
     public void updateList() {
diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index a33c26e..5c7d284 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
-<AnchorPane fx:id="createCarAP" prefHeight="400.0" 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.CreateCarController">
+<AnchorPane fx:id="createCarAP" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
    <children>
       <ChoiceBox fx:id="cmb_Ctyp" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
       <ChoiceBox fx:id="cmb_typ" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
-- 
cgit v1.2.3-70-g09d2


From 14916aeff9a6452bc857b0825d27f82300adaf76 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 27 May 2018 09:10:31 +0200
Subject: Fixed a bug where wrong header would be shown in archive-details
 [#27470]

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java     | 5 ++++-
 src/main/resources/fxml/ArchiveOperation.fxml                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 4f6f55f..0b7ec40 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -25,7 +25,8 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ArchiveOperationController {
 
-    public AnchorPane archiveOperationAP;
+    @FXML private AnchorPane archiveOperationAP;
+    @FXML private AnchorPane apHeader;
     @FXML private AnchorPane apDetails;
     @FXML private Label lblCodeHeader;
     @FXML private Hyperlink hypBack;
@@ -79,6 +80,7 @@ public class ArchiveOperationController {
             }
         }
         detailOperation = list.get(index);
+        apHeader.setVisible(false);
         setOperation();
         setDetailsVisible(true);
     }
@@ -129,6 +131,7 @@ public class ArchiveOperationController {
     public void backClicked() {
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
+        apHeader.setVisible(true);
     }
 
     public void backToMain() {
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 2f55b24..8598350 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -65,7 +65,7 @@
             </ScrollPane>
          </children>
       </AnchorPane>
-      <AnchorPane prefHeight="100.0" prefWidth="800.0" style="-fx-background-color: BROWN;">
+      <AnchorPane fx:id="apHeader" prefHeight="100.0" prefWidth="800.0" style="-fx-background-color: BROWN;">
          <children>
             <Hyperlink layoutX="713.0" layoutY="16.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
-- 
cgit v1.2.3-70-g09d2


From 2ce4e7f6a0194c8428882216ad30821eb9e8eb8b Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 09:24:48 +0200
Subject: Added fxml and controller for archived operations [#27299]

Created fxml-file for archived operations. Additionally, a controller was created to fill the pane with information about an archived Operation. Furthermore, the already existing controller archiveOperationController was adjusted to created these panes according to the existing archived operations.
---
 .../controller/ArchiveOperationController.java     | 55 +++++++++++++++---
 .../controller/OperationInArchiveController.java   | 65 ++++++++++++++++++++++
 src/main/resources/fxml/ArchiveOperation.fxml      |  8 +--
 src/main/resources/fxml/OperationInArchive.fxml    | 60 ++++++++++++++++++++
 4 files changed, 176 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
 create mode 100644 src/main/resources/fxml/OperationInArchive.fxml

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 0b7ec40..9c372fe 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -5,12 +5,14 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.S
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Collection;
 import java.util.EnumSet;
-import java.util.LinkedList;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
@@ -25,8 +27,9 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ArchiveOperationController {
 
+    @FXML private AnchorPane backApMain;
+    @FXML private AnchorPane backApDetails;
     @FXML private AnchorPane archiveOperationAP;
-    @FXML private AnchorPane apHeader;
     @FXML private AnchorPane apDetails;
     @FXML private Label lblCodeHeader;
     @FXML private Hyperlink hypBack;
@@ -38,7 +41,7 @@ public class ArchiveOperationController {
     private final OperationService operationService;
     @FXML private FlowPane archiveOperationFlowPane;
     private final CreateOperationController createOperationController;
-    private LinkedList<Operation> list = new LinkedList<>();
+    private Set<Operation> list = new HashSet<>();
 
     public ArchiveOperationController(
             OperationService operationService,
@@ -58,19 +61,50 @@ public class ArchiveOperationController {
             alert.setContentText("Die Einsätze konnten nicht geladen werden!");
             alert.showAndWait();
         }
-        for (Operation operation : list) {
+        setFlowPane();
+
+        /*for (Operation operation : list) {
             Button b = new Button();
             b.setPrefHeight(200);
             b.setPrefWidth(750 / 2);
             b.setText(operation.opCode());
             b.setOnAction(event -> buttonClicked(b));
             archiveOperationFlowPane.getChildren().add(b);
+        }*/
+    }
+
+    private void setFlowPane() {
+        try {
+            archiveOperationFlowPane.getChildren().clear();
+            Set<Operation> operations = list;
+            for (Operation operation : operations) {
+                OperationInArchiveController opInAController =
+                        OperationInArchiveController.create();
+                opInAController.set(operation);
+                opInAController
+                        .getRoot()
+                        .setOnMouseClicked(
+                                event -> {
+                                    detailOperation = operation;
+                                    backApMain.setVisible(false);
+                                    backApDetails.setVisible(true);
+                                    setOperation();
+                                    setDetailsVisible(true);
+                                });
+                archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
+            }
+        } catch (IOException e) {
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText("Das Element konnte nicht geladen werden!");
+            alert.showAndWait();
         }
     }
 
     private Operation detailOperation;
 
-    private void buttonClicked(Button button) {
+    /*private void buttonClicked(Button button) {
         int size = archiveOperationFlowPane.getChildren().size();
         int index = 0;
         for (int i = 0; i < size; i++) {
@@ -80,10 +114,12 @@ public class ArchiveOperationController {
             }
         }
         detailOperation = list.get(index);
-        apHeader.setVisible(false);
+        backApMain.setVisible(false);
+        backApDetails.setVisible(true);
+        //apHeader.setVisible(false);
         setOperation();
         setDetailsVisible(true);
-    }
+    }*/
 
     private void setOperation() {
         lblCodeHeader.setText(detailOperation.opCode());
@@ -131,7 +167,9 @@ public class ArchiveOperationController {
     public void backClicked() {
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
-        apHeader.setVisible(true);
+        // apHeader.setVisible(true);
+        backApDetails.setVisible(false);
+        backApMain.setVisible(true);
     }
 
     public void backToMain() {
@@ -141,5 +179,6 @@ public class ArchiveOperationController {
 
     public void setVisible(boolean b) {
         archiveOperationAP.setVisible(b);
+        backApMain.setVisible(b);
     }
 }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
new file mode 100644
index 0000000..935b2fe
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
@@ -0,0 +1,65 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.text.Text;
+
+public class OperationInArchiveController {
+
+    @FXML private Text txtAddress;
+    @FXML private Text txtVehicles;
+    @FXML private Text txtDate;
+    @FXML private Text txtOpCode;
+
+    public static OperationInArchiveController create() throws IOException {
+        FXMLLoader fxmlLoader =
+                new FXMLLoader(
+                        OperationInArchiveController.class.getResource(
+                                "/fxml/OperationInArchive.fxml"));
+        Node root = fxmlLoader.load();
+        OperationInArchiveController result = fxmlLoader.getController();
+        result.rootElement = root;
+
+        return result;
+    }
+
+    public Node getRoot() {
+        return rootElement;
+    }
+
+    private Node rootElement;
+
+    public void set(Operation operation) {
+        txtAddress.setText(operation.destination());
+        String date = "am ";
+        if (operation.created() != null) {
+            LocalDateTime myDateTime =
+                    LocalDateTime.ofInstant(
+                            Objects.requireNonNull(operation.created()), ZoneOffset.UTC);
+            date +=
+                    myDateTime.getDayOfMonth()
+                            + "."
+                            + myDateTime.getMonth().getValue()
+                            + "."
+                            + myDateTime.getYear();
+            txtDate.setText(date);
+        } else {
+            txtDate.setText("---");
+        }
+        txtOpCode.setText(operation.opCode());
+        Collection<String> elements =
+                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
+        String result = String.join(", ", elements);
+
+        txtVehicles.setText(result);
+    }
+}
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 8598350..21662fd 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -9,14 +9,14 @@
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" 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.ArchiveOperationController">
   <children>
-      <ScrollPane layoutY="100.0" prefHeight="550.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
+      <ScrollPane layoutY="169.0" prefHeight="481.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
          <content>
           <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" />
          </content>
       </ScrollPane>
       <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <AnchorPane prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);">
+            <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
                   <Label layoutX="81.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
                      <font>
@@ -65,9 +65,9 @@
             </ScrollPane>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="apHeader" prefHeight="100.0" prefWidth="800.0" style="-fx-background-color: BROWN;">
+      <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Hyperlink layoutX="713.0" layoutY="16.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
+            <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
                   <Font name="System Bold" size="16.0" />
                </font>
diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml
new file mode 100644
index 0000000..43ac14b
--- /dev/null
+++ b/src/main/resources/fxml/OperationInArchive.fxml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<GridPane hgap="6.0" maxHeight="100.0" maxWidth="400.0" prefHeight="100.0" prefWidth="400.0" styleClass="bg-white, shadowed" stylesheets="@/styles/main.css" 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.OperationInArchiveController">
+   <columnConstraints>
+      <ColumnConstraints />
+      <ColumnConstraints />
+      <ColumnConstraints />
+      <ColumnConstraints />
+      <ColumnConstraints />
+   </columnConstraints>
+   <rowConstraints>
+      <RowConstraints />
+      <RowConstraints />
+      <RowConstraints />
+   </rowConstraints>
+   <padding>
+      <Insets bottom="6.0" left="12.0" right="12.0" top="6.0" />
+   </padding>
+   <children>
+      <Text fx:id="txtAddress" text="Text" GridPane.rowIndex="1">
+         <font>
+            <Font size="20.0" />
+         </font>
+      </Text>
+      <HBox prefHeight="102.0" prefWidth="200.0" GridPane.rowIndex="2">
+         <children>
+            <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
+               <image>
+                  <Image url="@../images/Vehicle.png" />
+               </image>
+            </ImageView>
+            <Text fx:id="txtVehicles" strokeType="OUTSIDE" strokeWidth="0.0" text="Text">
+               <font>
+                  <Font size="20.0" />
+               </font>
+            </Text>
+         </children>
+      </HBox>
+      <Text fx:id="txtDate" nodeOrientation="RIGHT_TO_LEFT" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" wrappingWidth="187.73674726486206" GridPane.columnIndex="1">
+         <font>
+            <Font name="System Bold" size="20.0" />
+         </font>
+      </Text>
+      <Text fx:id="txtOpCode" strokeType="OUTSIDE" strokeWidth="0.0" text="Text">
+         <font>
+            <Font name="System Bold" size="20.0" />
+         </font>
+      </Text>
+   </children>
+</GridPane>
-- 
cgit v1.2.3-70-g09d2


From 31478202a4a4c371f861d9d8613429e124b72e9a Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 16:43:22 +0200
Subject: Added padding for panes [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml   | 2 +-
 src/main/resources/fxml/OperationInArchive.fxml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 21662fd..f185545 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -11,7 +11,7 @@
   <children>
       <ScrollPane layoutY="169.0" prefHeight="481.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
          <content>
-          <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" />
+            <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" hgap="12" vgap="12"/>
          </content>
       </ScrollPane>
       <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml
index 43ac14b..1f04fc0 100644
--- a/src/main/resources/fxml/OperationInArchive.fxml
+++ b/src/main/resources/fxml/OperationInArchive.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<GridPane hgap="6.0" maxHeight="100.0" maxWidth="400.0" prefHeight="100.0" prefWidth="400.0" styleClass="bg-white, shadowed" stylesheets="@/styles/main.css" 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.OperationInArchiveController">
+<GridPane hgap="12.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController">
    <columnConstraints>
       <ColumnConstraints />
       <ColumnConstraints />
@@ -32,7 +32,7 @@
             <Font size="20.0" />
          </font>
       </Text>
-      <HBox prefHeight="102.0" prefWidth="200.0" GridPane.rowIndex="2">
+      <HBox prefHeight="0.0" prefWidth="200.0" GridPane.rowIndex="2">
          <children>
             <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-- 
cgit v1.2.3-70-g09d2


From cd1d4f95b1f7b7aeefd20d0b545d6856ff0b9b70 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 17:24:07 +0200
Subject: Added elements to Archive-Window, adjusted already existing elements
 [#27299]

---
 .../controller/ArchiveOperationController.java     |  5 ++++
 src/main/resources/fxml/ArchiveOperation.fxml      | 27 +++++++++++++---------
 .../resources/fxml/CreateOperationController.fxml  |  2 +-
 src/main/resources/fxml/OperationInArchive.fxml    | 20 ++++++++--------
 4 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 9c372fe..4377dcb 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ArchiveOperationController {
 
+    public AnchorPane apMainDetails;
     @FXML private AnchorPane backApMain;
     @FXML private AnchorPane backApDetails;
     @FXML private AnchorPane archiveOperationAP;
@@ -87,6 +88,7 @@ public class ArchiveOperationController {
                                 event -> {
                                     detailOperation = operation;
                                     backApMain.setVisible(false);
+                                    apMainDetails.setVisible(false);
                                     backApDetails.setVisible(true);
                                     setOperation();
                                     setDetailsVisible(true);
@@ -157,6 +159,7 @@ public class ArchiveOperationController {
     }
 
     public void setListVisible(boolean b) {
+        apMainDetails.setVisible(b);
         archiveOperationFlowPane.setVisible(b);
     }
 
@@ -169,6 +172,7 @@ public class ArchiveOperationController {
         setDetailsVisible(false);
         // apHeader.setVisible(true);
         backApDetails.setVisible(false);
+        apMainDetails.setVisible(true);
         backApMain.setVisible(true);
     }
 
@@ -180,5 +184,6 @@ public class ArchiveOperationController {
     public void setVisible(boolean b) {
         archiveOperationAP.setVisible(b);
         backApMain.setVisible(b);
+        apMainDetails.setVisible(b);
     }
 }
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index f185545..b5daa5b 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
@@ -7,16 +8,19 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" 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.ArchiveOperationController">
+<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.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.ArchiveOperationController">
   <children>
-      <ScrollPane layoutY="169.0" prefHeight="481.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
+      <ScrollPane layoutY="202.0" prefHeight="449.0" prefWidth="900.0" AnchorPane.leftAnchor="50.0">
          <content>
-            <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" hgap="12" vgap="12"/>
+            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" vgap="12">
+               <padding>
+                  <Insets top="20.0" />
+               </padding></FlowPane>
          </content>
       </ScrollPane>
-      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);">
+            <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
                   <Label layoutX="81.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
                      <font>
@@ -28,13 +32,13 @@
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Label>
-                  <Hyperlink fx:id="hypBack" layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE">
+                  <Hyperlink fx:id="hypBack" layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Hyperlink>
                </children></AnchorPane>
-            <AnchorPane layoutX="82.0" layoutY="60.0" prefHeight="150.0" prefWidth="636.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
+            <AnchorPane layoutX="82.0" layoutY="60.0" prefHeight="150.0" prefWidth="836.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
                <children>
                   <Label fx:id="lblOpCode" layoutX="25.0" layoutY="22.0" prefHeight="26.0" prefWidth="116.0" text="Label">
                      <font>
@@ -51,21 +55,21 @@
                         <Font size="15.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblDate" alignment="CENTER_RIGHT" layoutX="482.0" layoutY="22.0" prefHeight="27.0" prefWidth="140.0" text="Label">
+                  <Label fx:id="lblDate" alignment="CENTER_RIGHT" layoutX="482.0" layoutY="22.0" prefHeight="27.0" prefWidth="140.0" text="Label" AnchorPane.rightAnchor="50.0">
                      <font>
                         <Font name="System Bold" size="18.0" />
                      </font>
                   </Label>
                </children>
             </AnchorPane>
-            <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="640.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0">
+            <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0">
                <content>
-                  <FlowPane fx:id="fpVehicles" prefHeight="410.0" prefWidth="640.0" />
+                  <FlowPane fx:id="fpVehicles" prefHeight="410.0" prefWidth="840.0" />
                </content>
             </ScrollPane>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
@@ -74,5 +78,6 @@
             </Hyperlink>
          </children>
       </AnchorPane>
+      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false" />
   </children>
 </AnchorPane>
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index ba27f53..79c0a51 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -87,5 +87,5 @@
   <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="listEmployees" source="/fxml/listEmployees.fxml"/>
   <fx:include AnchorPane.leftAnchor="300" AnchorPane.topAnchor="135.4" source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/>
   <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/>
-  <fx:include AnchorPane.leftAnchor="200.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/>
+  <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/>
 </AnchorPane>
diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml
index 1f04fc0..f079f42 100644
--- a/src/main/resources/fxml/OperationInArchive.fxml
+++ b/src/main/resources/fxml/OperationInArchive.fxml
@@ -10,10 +10,10 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<GridPane hgap="12.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController">
+<GridPane hgap="12.0" prefHeight="106.0" prefWidth="374.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController">
    <columnConstraints>
-      <ColumnConstraints />
-      <ColumnConstraints />
+      <ColumnConstraints maxWidth="249.6000518798828" minWidth="205.60003662109375" prefWidth="249.6000518798828" />
+      <ColumnConstraints maxWidth="182.39996337890625" minWidth="138.3999481201172" prefWidth="138.3999481201172" />
       <ColumnConstraints />
       <ColumnConstraints />
       <ColumnConstraints />
@@ -24,15 +24,15 @@
       <RowConstraints />
    </rowConstraints>
    <padding>
-      <Insets bottom="6.0" left="12.0" right="12.0" top="6.0" />
+      <Insets bottom="6.0" left="12.0" top="6.0" />
    </padding>
    <children>
       <Text fx:id="txtAddress" text="Text" GridPane.rowIndex="1">
          <font>
-            <Font size="20.0" />
+            <Font size="17.0" />
          </font>
       </Text>
-      <HBox prefHeight="0.0" prefWidth="200.0" GridPane.rowIndex="2">
+      <HBox prefHeight="23.0" prefWidth="139.0" GridPane.rowIndex="2">
          <children>
             <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
@@ -41,19 +41,19 @@
             </ImageView>
             <Text fx:id="txtVehicles" strokeType="OUTSIDE" strokeWidth="0.0" text="Text">
                <font>
-                  <Font size="20.0" />
+                  <Font size="17.0" />
                </font>
             </Text>
          </children>
       </HBox>
-      <Text fx:id="txtDate" nodeOrientation="RIGHT_TO_LEFT" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" wrappingWidth="187.73674726486206" GridPane.columnIndex="1">
+      <Text fx:id="txtDate" nodeOrientation="RIGHT_TO_LEFT" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" wrappingWidth="132.53673648834229" GridPane.columnIndex="1">
          <font>
-            <Font name="System Bold" size="20.0" />
+            <Font name="System Bold" size="17.0" />
          </font>
       </Text>
       <Text fx:id="txtOpCode" strokeType="OUTSIDE" strokeWidth="0.0" text="Text">
          <font>
-            <Font name="System Bold" size="20.0" />
+            <Font name="System Bold" size="17.0" />
          </font>
       </Text>
    </children>
-- 
cgit v1.2.3-70-g09d2


From 6be4aefaf0618e14df1028b5610c2b41a7800403 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 17:37:06 +0200
Subject: Added pane with information to main archive window [#27299]

---
 .../controller/ArchiveOperationController.java     |  5 ++-
 src/main/resources/fxml/ArchiveOperation.fxml      | 40 ++++++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 4377dcb..d6b6de8 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -27,7 +27,10 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ArchiveOperationController {
 
-    public AnchorPane apMainDetails;
+    @FXML private AnchorPane apMainDetails;
+    @FXML private Label lblOperations;
+    @FXML private Label lblClosed;
+    @FXML private Label lblCancelled;
     @FXML private AnchorPane backApMain;
     @FXML private AnchorPane backApDetails;
     @FXML private AnchorPane archiveOperationAP;
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index b5daa5b..41c6a03 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -5,7 +5,10 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.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.ArchiveOperationController">
@@ -69,7 +72,7 @@
             </ScrollPane>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
@@ -78,6 +81,39 @@
             </Hyperlink>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false" />
+      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false">
+         <children>
+            <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <Label fx:id="lblOperations" text="Einsätze:">
+                     <font>
+                        <Font name="System Bold" size="20.0" />
+                     </font>
+                  </Label>
+                  <Label fx:id="lblClosed" text="abgeschlossen:" GridPane.rowIndex="1">
+                     <font>
+                        <Font size="15.0" />
+                     </font>
+                  </Label>
+                  <Label fx:id="lblCancelled" text="storniert:" GridPane.rowIndex="2">
+                     <font>
+                        <Font size="15.0" />
+                     </font>
+                  </Label>
+               </children>
+               <padding>
+                  <Insets left="20.0" />
+               </padding>
+            </GridPane>
+         </children>
+      </AnchorPane>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 99df0868cbe3e215c1e494f89accae0deb0434d8 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 20:45:25 +0200
Subject: Adjusted design for main archive operation [#27299]

Removed scrollbars, added padding for better look, etc.
---
 .../controller/ArchiveOperationController.java     | 27 ----------------------
 src/main/resources/fxml/ArchiveOperation.fxml      | 17 +++++++++-----
 src/main/resources/fxml/OperationInArchive.fxml    |  2 +-
 3 files changed, 12 insertions(+), 34 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index d6b6de8..107ed2f 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -66,15 +66,6 @@ public class ArchiveOperationController {
             alert.showAndWait();
         }
         setFlowPane();
-
-        /*for (Operation operation : list) {
-            Button b = new Button();
-            b.setPrefHeight(200);
-            b.setPrefWidth(750 / 2);
-            b.setText(operation.opCode());
-            b.setOnAction(event -> buttonClicked(b));
-            archiveOperationFlowPane.getChildren().add(b);
-        }*/
     }
 
     private void setFlowPane() {
@@ -109,23 +100,6 @@ public class ArchiveOperationController {
 
     private Operation detailOperation;
 
-    /*private void buttonClicked(Button button) {
-        int size = archiveOperationFlowPane.getChildren().size();
-        int index = 0;
-        for (int i = 0; i < size; i++) {
-            if (archiveOperationFlowPane.getChildren().get(i) == button) {
-                index = i;
-                break;
-            }
-        }
-        detailOperation = list.get(index);
-        backApMain.setVisible(false);
-        backApDetails.setVisible(true);
-        //apHeader.setVisible(false);
-        setOperation();
-        setDetailsVisible(true);
-    }*/
-
     private void setOperation() {
         lblCodeHeader.setText(detailOperation.opCode());
         String date = "am ";
@@ -173,7 +147,6 @@ public class ArchiveOperationController {
     public void backClicked() {
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
-        // apHeader.setVisible(true);
         backApDetails.setVisible(false);
         apMainDetails.setVisible(true);
         backApMain.setVisible(true);
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 41c6a03..90cbe74 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -13,11 +13,11 @@
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.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.ArchiveOperationController">
   <children>
-      <ScrollPane layoutY="202.0" prefHeight="449.0" prefWidth="900.0" AnchorPane.leftAnchor="50.0">
+      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
          <content>
-            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" vgap="12">
+            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="12">
                <padding>
-                  <Insets top="20.0" />
+                  <Insets left="40.0" top="20.0" />
                </padding></FlowPane>
          </content>
       </ScrollPane>
@@ -74,14 +74,19 @@
       </AnchorPane>
       <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
+            <Hyperlink layoutX="871.0" layoutY="35.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
-                  <Font name="System Bold" size="16.0" />
+                  <Font name="System Bold" size="20.0" />
                </font>
             </Hyperlink>
+            <Label layoutX="62.0" layoutY="40.0" prefHeight="30.0" prefWidth="100.0" text="Archiv" textFill="WHITE">
+               <font>
+                  <Font name="System Bold" size="20.0" />
+               </font>
+            </Label>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false">
+      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" styleClass="bg-white, shadowed">
          <children>
             <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0">
               <columnConstraints>
diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml
index f079f42..9da1d9b 100644
--- a/src/main/resources/fxml/OperationInArchive.fxml
+++ b/src/main/resources/fxml/OperationInArchive.fxml
@@ -32,7 +32,7 @@
             <Font size="17.0" />
          </font>
       </Text>
-      <HBox prefHeight="23.0" prefWidth="139.0" GridPane.rowIndex="2">
+      <HBox prefHeight="23.0" prefWidth="139.0" spacing="7.0" GridPane.rowIndex="2">
          <children>
             <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true">
                <image>
-- 
cgit v1.2.3-70-g09d2


From 356d892d5bcfa865832f695c9b46c61fbceebf54 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Fri, 1 Jun 2018 09:05:52 +0200
Subject: Adjusted some colours [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 90cbe74..ddcb0b4 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -13,9 +13,9 @@
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.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.ArchiveOperationController">
   <children>
-      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
+      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
          <content>
-            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="12">
+            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vgap="12">
                <padding>
                   <Insets left="40.0" top="20.0" />
                </padding></FlowPane>
@@ -86,7 +86,7 @@
             </Label>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" styleClass="bg-white, shadowed">
+      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="821.0" styleClass="bg-white, shadowed" AnchorPane.leftAnchor="90.0">
          <children>
             <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0">
               <columnConstraints>
-- 
cgit v1.2.3-70-g09d2


From bf2a7ba5b9da2c4ee3deef275a36e9118f45f683 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Fri, 1 Jun 2018 09:45:31 +0200
Subject: Operations in archive are now sorted [#27299]

---
 .../controller/ArchiveOperationController.java     | 39 ++++++++++++++++------
 src/main/resources/fxml/ArchiveOperation.fxml      |  2 +-
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 107ed2f..04f1dde 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -8,9 +8,11 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -18,7 +20,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
-import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
@@ -36,7 +37,6 @@ public class ArchiveOperationController {
     @FXML private AnchorPane archiveOperationAP;
     @FXML private AnchorPane apDetails;
     @FXML private Label lblCodeHeader;
-    @FXML private Hyperlink hypBack;
     @FXML private Label lblOpCode;
     @FXML private Label lblVehicles;
     @FXML private Label lblDate;
@@ -71,8 +71,7 @@ public class ArchiveOperationController {
     private void setFlowPane() {
         try {
             archiveOperationFlowPane.getChildren().clear();
-            Set<Operation> operations = list;
-            for (Operation operation : operations) {
+            for (Operation operation : sortSet(list)) {
                 OperationInArchiveController opInAController =
                         OperationInArchiveController.create();
                 opInAController.set(operation);
@@ -93,26 +92,46 @@ public class ArchiveOperationController {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-            alert.setContentText("Das Element konnte nicht geladen werden!");
+            alert.setContentText("Die Element konnte nicht geladen werden!");
             alert.showAndWait();
         }
     }
 
+    private List<Operation> sortSet(Set<Operation> operationsSet) {
+        Operation[] array = operationsSet.toArray(new Operation[operationsSet.size()]);
+        for (int i = array.length - 1; i > 0; i--) {
+            for (int j = 0; j < i; j++) {
+                LocalDateTime first =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j].created()), ZoneOffset.UTC);
+                LocalDateTime second =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC);
+                if (second.isBefore(first)) {
+                    Operation help = array[j];
+                    array[j] = array[j + 1];
+                    array[j + 1] = help;
+                }
+            }
+        }
+        return Arrays.asList(array);
+    }
+
     private Operation detailOperation;
 
     private void setOperation() {
         lblCodeHeader.setText(detailOperation.opCode());
         String date = "am ";
         if (detailOperation.created() != null) {
-            LocalDateTime myDateTime =
+            LocalDateTime dateTime =
                     LocalDateTime.ofInstant(
                             Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
             date +=
-                    myDateTime.getDayOfMonth()
+                    dateTime.getDayOfMonth()
                             + "."
-                            + myDateTime.getMonth().getValue()
+                            + dateTime.getMonth().getValue()
                             + "."
-                            + myDateTime.getYear();
+                            + dateTime.getYear();
             lblDate.setText(date);
         } else {
             lblDate.setText("---");
@@ -157,7 +176,7 @@ public class ArchiveOperationController {
         createOperationController.setVisible(true);
     }
 
-    public void setVisible(boolean b) {
+    void setVisible(boolean b) {
         archiveOperationAP.setVisible(b);
         backApMain.setVisible(b);
         apMainDetails.setVisible(b);
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index ddcb0b4..0e4e3d7 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -35,7 +35,7 @@
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Label>
-                  <Hyperlink fx:id="hypBack" layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
+                  <Hyperlink layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>
-- 
cgit v1.2.3-70-g09d2


From 85db4d7807323b284c7af72e2b8dfbdafd1a6b4e Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Wed, 30 May 2018 10:22:17 +0200
Subject: Some changes to VehiclePane.

---
 src/main/resources/fxml/vehiclePane.fxml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 784febc..7932a9f 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -41,7 +41,7 @@
   <ImageView fx:id="ivNEF" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="1">
     <Image url="@../images/NotNEF.png" />
   </ImageView>
-  <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.rowIndex="1">
+  <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1">
     <font>
       <Font size="14.0" />
     </font>
@@ -49,7 +49,7 @@
   <ImageView fx:id="ivQualification" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="2">
     <Image url="@../images/Qualification.png" />
   </ImageView>
-  <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.rowIndex="2">
+  <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
     <font>
       <Font size="14.0" />
     </font>
@@ -62,4 +62,5 @@
       <Font size="14.0" />
     </font>
   </Text>
+  <Text fx:id="txtStatus" text="FREI_STATUS" GridPane.valignment="TOP" GridPane.columnIndex="3" GridPane.rowIndex="0" styleClass="text-medium"/>
 </GridPane>
-- 
cgit v1.2.3-70-g09d2


From 6a8dc5df10bb7f478187a97fe0b31fb5dd2efc87 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Wed, 30 May 2018 11:29:31 +0200
Subject: Implemented Status display.

---
 .../controller/VehiclePaneController.java          | 10 +++
 src/main/resources/fxml/vehiclePane.fxml           | 87 +++++++++++++++-------
 2 files changed, 69 insertions(+), 28 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
index 6c0932b..35a4b4a 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
@@ -3,6 +3,7 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.List;
@@ -10,6 +11,7 @@ import java.util.Optional;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
+import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
@@ -30,6 +32,7 @@ public class VehiclePaneController {
         return result;
     }
 
+    @FXML private Label txtStatus;
     @FXML private Text txtType;
     @FXML private Text txtNumber;
     @FXML private ImageView ivNEF;
@@ -96,6 +99,13 @@ public class VehiclePaneController {
             ivQualification.setManaged(false);
         }
 
+        txtStatus.setText(vehicle.status().name());
+        if (vehicle.status() == Status.FREI_FUNK || vehicle.status() == Status.FREI_WACHE) {
+            txtStatus.getStyleClass().add("bg-status-green");
+        } else {
+            txtStatus.getStyleClass().add("bg-status-orange");
+        }
+
         this.data = vehicle;
     }
 
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 7932a9f..1cedb7c 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -10,57 +10,88 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 
-<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="bg-white, shadowed" 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.VehiclePaneController">
+<?import javafx.scene.control.Label?>
+<GridPane stylesheets="@/styles/main.css" minWidth="-Infinity" styleClass="bg-white, shadowed"
+  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.VehiclePaneController">
   <columnConstraints>
-    <ColumnConstraints />
-    <ColumnConstraints />
-    <ColumnConstraints />
-    <ColumnConstraints />
+    <ColumnConstraints/>
+    <ColumnConstraints/>
+    <ColumnConstraints prefWidth="60"/>
+    <ColumnConstraints/>
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints />
-    <RowConstraints />
-    <RowConstraints />
-    <RowConstraints />
+    <RowConstraints/>
+    <RowConstraints/>
+    <RowConstraints/>
+    <RowConstraints/>
   </rowConstraints>
   <padding>
-    <Insets bottom="6.0" left="12.0" right="12.0" top="6.0" />
+    <Insets bottom="6.0" left="12.0" right="12.0" top="6.0"/>
   </padding>
-  <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0">
-    <Text fx:id="txtType" text="RTW">
+  <!--<Text fx:id="txtType" text="NAH" GridPane.columnIndex="0" GridPane.columnSpan="2">-->
+    <!--<font>-->
+      <!--<Font name="System Bold" size="18.0"/>-->
+    <!--</font>-->
+  <!--</Text>-->
+  <!--<Text fx:id="txtNumber" text="-10003" GridPane.halignment="LEFT" GridPane.columnIndex="2">-->
+    <!--<font>-->
+      <!--<Font size="16.0"/>-->
+    <!--</font>-->
+  <!--</Text>-->
+  <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="3" prefWidth="120">
+    <Text fx:id="txtType" text="RTWSDLK" >
       <font>
-        <Font name="System Bold" size="18.0" />
+        <Font name="System Bold" size="18.0"/>
       </font>
     </Text>
-    <Text fx:id="txtNumber" text="-10003">
+    <Text fx:id="txtNumber" text="-1">
       <font>
-        <Font size="16.0" />
+        <Font size="16.0"/>
       </font>
     </Text>
   </TextFlow>
-  <ImageView fx:id="ivNEF" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="1">
-    <Image url="@../images/NotNEF.png" />
+  <ImageView fx:id="ivNEF" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"
+    GridPane.columnIndex="0" GridPane.rowIndex="1">
+    <Image url="@../images/NotNEF.png"/>
   </ImageView>
-  <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1">
+  <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.columnSpan="3"
+    GridPane.rowIndex="1">
     <font>
-      <Font size="14.0" />
+      <Font size="14.0"/>
     </font>
   </Text>
-  <ImageView fx:id="ivQualification" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="2">
-    <Image url="@../images/Qualification.png" />
+  <ImageView fx:id="ivQualification" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true"
+    preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="2">
+    <Image url="@../images/Qualification.png"/>
   </ImageView>
-  <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
+  <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.columnSpan="3"
+    GridPane.rowIndex="2">
     <font>
-      <Font size="14.0" />
+      <Font size="14.0"/>
     </font>
   </Text>
-  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="3">
-    <Image url="@../images/Vehicle.png" />
+  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"
+    GridPane.columnIndex="0" GridPane.rowIndex="3">
+    <Image url="@../images/Vehicle.png"/>
+    <GridPane.margin>
+      <Insets right="6"/>
+    </GridPane.margin>
   </ImageView>
-  <Text fx:id="txtRooftype" text="Hochdach" GridPane.columnIndex="1" GridPane.rowIndex="3">
+  <Text fx:id="txtRooftype" text="Mittelhochdach" GridPane.columnIndex="1" GridPane.columnSpan="3"
+    GridPane.rowIndex="3">
     <font>
-      <Font size="14.0" />
+      <Font size="14.0"/>
     </font>
   </Text>
-  <Text fx:id="txtStatus" text="FREI_STATUS" GridPane.valignment="TOP" GridPane.columnIndex="3" GridPane.rowIndex="0" styleClass="text-medium"/>
+  <Label fx:id="txtStatus" text="ZUM_BERUFUNGSORT" prefWidth="100" alignment="CENTER"
+    GridPane.valignment="CENTER" GridPane.columnIndex="3"
+    GridPane.rowIndex="0" styleClass="text-medium, button">
+    <GridPane.margin>
+      <Insets left="12"/>
+    </GridPane.margin>
+    <padding>
+      <Insets topRightBottomLeft="3"/>
+    </padding>
+  </Label>
 </GridPane>
-- 
cgit v1.2.3-70-g09d2


From 812f94aa2979d3199ebfd361d2a5b366bd44547e Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 21:09:58 +0200
Subject: Enable hiding edit-button in EmployeeListItemController [#25963]

---
 .../controller/EmployeeListItemController.java                 | 10 ++++++++++
 src/main/resources/fxml/employeeListItem.fxml                  |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
index 47fbe80..4526278 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.util.function.Consumer;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -24,6 +25,7 @@ public class EmployeeListItemController extends CustomListItemController {
     @FXML private ImageView imgPilot;
     @FXML private ImageView imgDriver;
     @FXML private ImageView imgQualification;
+    @FXML private Button btnEdit;
 
     private Employee employee;
 
@@ -37,6 +39,10 @@ public class EmployeeListItemController extends CustomListItemController {
     }
 
     private void setData(Employee employee) {
+        setData(employee, true);
+    }
+
+    private void setData(Employee employee, boolean isEditButtonVisible) {
         this.employee = employee;
         lblName.setText(employee.name());
         lblQualification.setText(employee.educationLevel().name());
@@ -49,6 +55,10 @@ public class EmployeeListItemController extends CustomListItemController {
         String imgSrcDriver =
                 String.format("/images/%s", employee.isDriver() ? "Driver.png" : "NotDriver.png");
         imgDriver.setImage(new Image(imgSrcDriver));
+
+        if (!isEditButtonVisible) {
+            btnEdit.setVisible(false);
+        }
     }
 
     public static EmployeeListItemController createEmployeeListItemController(
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index 05354fc..bec2e1e 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -18,7 +18,8 @@
         <Font name="System Bold" size="18.0"/>
       </font>
     </Label>
-    <Button layoutX="298.0" layoutY="5.0" mnemonicParsing="false" onAction="#onEditEmployeeClicked"
+    <Button fx:id="btnEdit" layoutX="298.0" layoutY="5.0" mnemonicParsing="false"
+      onAction="#onEditEmployeeClicked"
       text="bearbeiten" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0"/>
     <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0">
-- 
cgit v1.2.3-70-g09d2


From 5ce2c8943e7c47be60659662bdf4f73e8b606206 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:05:38 +0200
Subject: Rename ListEmployeesController to ManageEmployeesController [#25963]

because later, a new Controller EmployeeListController will be created, which just lists employees and the current ListEmployeesController actually not only lists employees but also allows them to edit, create => manage
---
 .../controller/CreateOperationController.java      |   4 +-
 .../controller/ListEmployeesController.java        | 133 ---------------------
 .../controller/ManageEmployeesController.java      | 131 ++++++++++++++++++++
 .../resources/fxml/CreateOperationController.fxml  |   2 +-
 src/main/resources/fxml/listEmployees.fxml         |  42 -------
 src/main/resources/fxml/manageEmployees.fxml       |  40 +++++++
 6 files changed, 174 insertions(+), 178 deletions(-)
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
 delete mode 100644 src/main/resources/fxml/listEmployees.fxml
 create mode 100644 src/main/resources/fxml/manageEmployees.fxml

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index d2657b6..57d9611 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -58,7 +58,7 @@ public class CreateOperationController {
     @FXML private Label lblChosenVehicles;
     @FXML private AnchorPane apInvisible;
     @FXML private OperationDetailsController operationDetailsController;
-    @FXML private ListEmployeesController listEmployeesController;
+    @FXML private ManageEmployeesController manageEmployeesController;
     @FXML private CreateCarController createCarController;
     @FXML private RegistrationWindowController registrationWindowController;
     @FXML private ArchiveOperationController archiveOperationController;
@@ -367,7 +367,7 @@ public class CreateOperationController {
 
     private void openCreateNewEmployeeWindow() {
         this.setVisible(false);
-        listEmployeesController.setVisible(true);
+        manageEmployeesController.setVisible(true);
     }
 
     private void openCreateCarWindow() {
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
deleted file mode 100644
index 02a3e4c..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class ListEmployeesController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-    @FXML private AnchorPane listEmployeesAP;
-
-    @FXML private AnchorPane containerHeader;
-    @FXML private FlowPane flowPaneEmployeeList;
-
-    private final EmployeeService employeeService;
-    private final SpringFXMLLoader fxmlLoader;
-
-    private final CreateOperationController createOperationController;
-
-    public ListEmployeesController(
-            EmployeeService employeeService,
-            SpringFXMLLoader fxmlLoader,
-            CreateOperationController createOperationController) {
-        this.employeeService = employeeService;
-        this.fxmlLoader = fxmlLoader;
-        this.createOperationController = createOperationController;
-    }
-
-    @FXML
-    private void initialize() {
-        openFilter();
-    }
-
-    private void openFilter() {
-        try {
-            FilterEmployeesController filterEmployeesController =
-                    FilterEmployeesController.createFilterEmployeesController(fxmlLoader);
-            containerHeader.getChildren().clear();
-            containerHeader.getChildren().add(filterEmployeesController.getRootElement());
-            filterEmployeesController.setOnFilterTextChangedListener(this::updateEmployeeList);
-            filterEmployeesController.setOnAddEmployeeClickedListener(this::openAddEmployee);
-
-            updateEmployeeList();
-
-        } catch (IOException e) {
-            LOG.error("Could not initialize controller: {}", e);
-        }
-    }
-
-    private void openAddEmployee() {
-        openEmployee(null);
-    }
-
-    private void openEditEmployee(Employee employee) {
-        openEmployee(employee);
-    }
-
-    private void openEmployee(Employee employee) {
-        try {
-            CreateNewEmployeeController createNewEmployeeController =
-                    employee == null
-                            ? CreateNewEmployeeController.createCreateNewEmployeeController(
-                                    fxmlLoader)
-                            : CreateNewEmployeeController.createCreateNewEmployeeController(
-                                    fxmlLoader, employee);
-            containerHeader.getChildren().clear();
-            containerHeader.getChildren().add(createNewEmployeeController.getRootElement());
-            createNewEmployeeController.setConsumerCancelClicked(this::openFilter);
-            createNewEmployeeController.setConsumerCreateClicked(this::openFilter);
-        } catch (IOException e) {
-            LOG.error("Could not prepare UI for adding employee: {}", e);
-        }
-    }
-
-    private void updateEmployeeList() {
-        updateEmployeeList("");
-    }
-
-    private void updateEmployeeList(String searchString) {
-        try {
-            flowPaneEmployeeList.getChildren().clear();
-            employeeService
-                    .list()
-                    .stream()
-                    .filter(
-                            employee ->
-                                    searchString.trim().isEmpty()
-                                            || employee.name()
-                                                    .toLowerCase()
-                                                    .contains(searchString.toLowerCase()))
-                    .forEach(this::addEmployeeToFlowPane);
-        } catch (ServiceException e) {
-            LOG.error("Could not fetch employee list: {}", e);
-        }
-    }
-
-    private void addEmployeeToFlowPane(Employee employee) {
-        Insets listItemMargins = new Insets(0, 5, 10, 5);
-
-        try {
-            EmployeeListItemController controller =
-                    EmployeeListItemController.createEmployeeListItemController(
-                            fxmlLoader, employee);
-            Node rootElement = controller.getRootElement();
-            flowPaneEmployeeList.getChildren().add(rootElement);
-            FlowPane.setMargin(rootElement, listItemMargins);
-            controller.setConsumerEditEmployeeClicked(this::openEditEmployee);
-        } catch (IOException e) {
-            LOG.error("Could not create a new EmployeeListItem: {}", e);
-        }
-    }
-
-    public void setVisible(boolean b) {
-        listEmployeesAP.setVisible(b);
-    }
-
-    public void backToMain() {
-        this.setVisible(false);
-        createOperationController.setVisible(true);
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
new file mode 100644
index 0000000..a126cc7
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
@@ -0,0 +1,131 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.stream.Collectors;
+import javafx.fxml.FXML;
+import javafx.scene.layout.AnchorPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class ManageEmployeesController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    @FXML private AnchorPane listEmployeesAP;
+
+    @FXML private AnchorPane containerHeader;
+    @FXML private FlowPane flowPaneEmployeeList;
+
+    private final EmployeeService employeeService;
+    private final SpringFXMLLoader fxmlLoader;
+
+    private final CreateOperationController createOperationController;
+
+    public ManageEmployeesController(
+            EmployeeService employeeService,
+            SpringFXMLLoader fxmlLoader,
+            CreateOperationController createOperationController) {
+        this.employeeService = employeeService;
+        this.fxmlLoader = fxmlLoader;
+        this.createOperationController = createOperationController;
+    }
+
+    @FXML
+    private void initialize() {
+        openFilter();
+    }
+
+    private void openFilter() {
+        try {
+            FilterEmployeesController filterEmployeesController =
+                    FilterEmployeesController.createFilterEmployeesController(fxmlLoader);
+            containerHeader.getChildren().clear();
+            containerHeader.getChildren().add(filterEmployeesController.getRootElement());
+            filterEmployeesController.setOnFilterTextChangedListener(this::updateEmployeeList);
+            filterEmployeesController.setOnAddEmployeeClickedListener(this::openAddEmployee);
+
+            updateEmployeeList();
+
+        } catch (IOException e) {
+            LOG.error("Could not initialize controller: {}", e);
+        }
+    }
+
+    private void openAddEmployee() {
+        openEmployee(null);
+    }
+
+    private void openEditEmployee(Employee employee) {
+        openEmployee(employee);
+    }
+
+    private void openEmployee(Employee employee) {
+        try {
+            CreateNewEmployeeController createNewEmployeeController =
+                    employee == null
+                            ? CreateNewEmployeeController.createCreateNewEmployeeController(
+                                    fxmlLoader)
+                            : CreateNewEmployeeController.createCreateNewEmployeeController(
+                                    fxmlLoader, employee);
+            containerHeader.getChildren().clear();
+            containerHeader.getChildren().add(createNewEmployeeController.getRootElement());
+            createNewEmployeeController.setConsumerCancelClicked(this::openFilter);
+            createNewEmployeeController.setConsumerCreateClicked(this::openFilter);
+        } catch (IOException e) {
+            LOG.error("Could not prepare UI for adding employee: {}", e);
+        }
+    }
+
+    private void updateEmployeeList() {
+        updateEmployeeList("");
+    }
+
+    private void updateEmployeeList(String searchString) {
+        try {
+            flowPaneEmployeeList.getChildren().clear();
+            employeeService
+                    .list()
+                    .stream()
+                    .filter(
+                            employee ->
+                                    searchString.trim().isEmpty()
+                                            || employee.name()
+                                                    .toLowerCase()
+                                                    .contains(searchString.toLowerCase()))
+                    .forEach(this::addEmployeeToFlowPane);
+        } catch (ServiceException e) {
+            LOG.error("Could not fetch employee list: {}", e);
+        }
+    }
+
+    private void addEmployeeToFlowPane(Employee employee) {
+        Insets listItemMargins = new Insets(0, 5, 10, 5);
+
+        try {
+            EmployeeListItemController controller =
+                    EmployeeListItemController.createEmployeeListItemController(
+                            fxmlLoader, employee);
+            Node rootElement = controller.getRootElement();
+            flowPaneEmployeeList.getChildren().add(rootElement);
+            FlowPane.setMargin(rootElement, listItemMargins);
+            controller.setConsumerEditEmployeeClicked(this::openEditEmployee);
+        } catch (IOException e) {
+            LOG.error("Could not create a new EmployeeListItem: {}", e);
+        }
+    }
+
+    public void setVisible(boolean b) {
+        listEmployeesAP.setVisible(b);
+    }
+
+    public void backToMain() {
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+}
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 79c0a51..d22dc45 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -84,7 +84,7 @@
     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"/>
-  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="listEmployees" source="/fxml/listEmployees.fxml"/>
+  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees" source="/fxml/manageEmployees.fxml"/>
   <fx:include AnchorPane.leftAnchor="300" AnchorPane.topAnchor="135.4" source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/>
   <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/>
   <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/>
diff --git a/src/main/resources/fxml/listEmployees.fxml b/src/main/resources/fxml/listEmployees.fxml
deleted file mode 100644
index 7f9e638..0000000
--- a/src/main/resources/fxml/listEmployees.fxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.FlowPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" 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.ListEmployeesController">
-  <children>
-    <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;">
-      <children>
-        <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
-          <font>
-            <Font name="Calibri Bold" size="22.0" />
-          </font>
-        </Label>
-            <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE">
-               <font>
-                  <Font name="System Bold" size="16.0" />
-               </font>
-            </Hyperlink>
-      </children>
-    </AnchorPane>
-    <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0">
-      <children>
-        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
-        <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER">
-          <VBox.margin>
-            <Insets top="20.0" />
-          </VBox.margin>
-          <content>
-            <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;" />
-          </content>
-        </ScrollPane>
-      </children>
-    </VBox>
-  </children>
-</AnchorPane>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
new file mode 100644
index 0000000..e6efb89
--- /dev/null
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" 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.ManageEmployeesController">
+  <children>
+    <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;">
+      <children>
+        <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
+          <font>
+            <Font name="Calibri Bold" size="22.0" />
+          </font>
+        </Label>
+            <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE">
+               <font>
+                  <Font name="System Bold" size="16.0" />
+               </font>
+            </Hyperlink>
+      </children>
+    </AnchorPane>
+    <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0">
+      <children>
+        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
+        <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER">
+          <VBox.margin>
+            <Insets top="20.0" />
+          </VBox.margin>
+          <content>
+            <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;" />
+          </content>
+        </ScrollPane>
+      </children>
+    </VBox>
+  </children>
+</AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From a8c39fd4f07ffb46f109e22a4adc2548b04030bc Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:07:04 +0200
Subject: Provide callback for clicking on an employee list item [#25963]

---
 .../controller/EmployeeListItemController.java             | 14 +++++++++++++-
 src/main/resources/fxml/employeeListItem.fxml              |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
index 4526278..151dcae 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
@@ -30,14 +30,22 @@ public class EmployeeListItemController extends CustomListItemController {
     private Employee employee;
 
     private Consumer<Employee> consumerEditEmployeeClicked;
+    private Consumer<Employee> consumerEmployeeClicked;
 
     @FXML
-    public void onEditEmployeeClicked() {
+    private void onEditEmployeeClicked() {
         if (consumerEditEmployeeClicked != null) {
             consumerEditEmployeeClicked.accept(employee);
         }
     }
 
+    @FXML
+    private void onEmployeeClicked() {
+        if (consumerEmployeeClicked != null) {
+            consumerEmployeeClicked.accept(employee);
+        }
+    }
+
     private void setData(Employee employee) {
         setData(employee, true);
     }
@@ -85,4 +93,8 @@ public class EmployeeListItemController extends CustomListItemController {
     public void setConsumerEditEmployeeClicked(Consumer<Employee> consumerEditEmployeeClicked) {
         this.consumerEditEmployeeClicked = consumerEditEmployeeClicked;
     }
+
+    public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) {
+        this.consumerEmployeeClicked = consumerEmployeeClicked;
+    }
 }
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index bec2e1e..6e95c0c 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -10,7 +10,8 @@
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
   prefHeight="96.0" prefWidth="360.0" style="-fx-background-color: white;"
   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.EmployeeListItemController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListItemController"
+  onMouseClicked="#onEmployeeClicked">
   <children>
     <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" text="Peter Mustermann"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
-- 
cgit v1.2.3-70-g09d2


From 6fbc8a6a1c307b5e13ce3970c4dc9d8e54fff873 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:09:27 +0200
Subject: Create dedicated EmployeeListController [#25963]

This controller is (only) responsible for displaying a list of employees, and not for adding/editing employees. Done for being able to reuse the list-code later on
---
 .../controller/EmployeeListController.java         | 80 ++++++++++++++++++++++
 src/main/resources/fxml/employeeList.fxml          |  9 +++
 2 files changed, 89 insertions(+)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
 create mode 100644 src/main/resources/fxml/employeeList.fxml

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
new file mode 100644
index 0000000..993735e
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
@@ -0,0 +1,80 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.function.Consumer;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.layout.FlowPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class EmployeeListController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    @FXML private FlowPane flowPaneEmployeeList;
+
+    private final SpringFXMLLoader fxmlLoader;
+    private Node rootElement;
+
+    public EmployeeListController(SpringFXMLLoader fxmlLoader) {
+        this.fxmlLoader = fxmlLoader;
+    }
+
+    public void setData(
+            List<Employee> employeeList,
+            Consumer<Employee> onEditEmployeeClicked,
+            Consumer<Employee> onEmployeeClicked) {
+
+        flowPaneEmployeeList.getChildren().clear();
+        employeeList.forEach(
+                employee ->
+                        addEmployeeToFlowPane(employee, onEditEmployeeClicked, onEmployeeClicked));
+    }
+
+    private void addEmployeeToFlowPane(
+            Employee employee,
+            Consumer<Employee> onEditEmployeeClicked,
+            Consumer<Employee> onEmployeeClicked) {
+        Insets listItemMargins = new Insets(0, 5, 10, 5);
+
+        try {
+            EmployeeListItemController controller =
+                    EmployeeListItemController.createEmployeeListItemController(
+                            fxmlLoader, employee);
+            Node rootElement = controller.getRootElement();
+            flowPaneEmployeeList.getChildren().add(rootElement);
+            FlowPane.setMargin(rootElement, listItemMargins);
+            if (onEditEmployeeClicked != null) {
+                controller.setConsumerEditEmployeeClicked(onEditEmployeeClicked);
+            }
+            if (onEmployeeClicked != null) {
+                controller.setConsumerEmployeeClicked(onEmployeeClicked);
+            }
+        } catch (IOException e) {
+            LOG.error("Could not create a new EmployeeListItem: {}", e);
+        }
+    }
+
+    public static EmployeeListController createEmployeeListController(SpringFXMLLoader loader)
+            throws IOException {
+        FXMLWrapper<Object, EmployeeListController> wrapper =
+                loader.loadAndWrap("/fxml/employeeList.fxml", EmployeeListController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        EmployeeListController controller = wrapper.getController();
+        controller.rootElement = root;
+        return controller;
+    }
+
+    public Node getRootElement() {
+        return rootElement;
+    }
+}
diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
new file mode 100644
index 0000000..52c502a
--- /dev/null
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.FlowPane?>
+<FlowPane xmlns="http://javafx.com/javafx"
+  xmlns:fx="http://javafx.com/fxml"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListController"
+  fx:id="flowPaneEmployeeList"
+  prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;">
+</FlowPane>
-- 
cgit v1.2.3-70-g09d2


From d721ab5480c025c0a998d23ffe462f430fd40bf6 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:10:22 +0200
Subject: Refactor ManageEmployeesCtrl to make use of EmployeeListCtrl [#25963]

---
 .../controller/ManageEmployeesController.java      | 45 ++++++++--------------
 src/main/resources/fxml/manageEmployees.fxml       |  2 +-
 2 files changed, 17 insertions(+), 30 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
index a126cc7..655c7da 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
@@ -18,9 +18,8 @@ public class ManageEmployeesController {
 
     private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     @FXML private AnchorPane listEmployeesAP;
-
     @FXML private AnchorPane containerHeader;
-    @FXML private FlowPane flowPaneEmployeeList;
+    @FXML private EmployeeListController employeeListController;
 
     private final EmployeeService employeeService;
     private final SpringFXMLLoader fxmlLoader;
@@ -87,39 +86,27 @@ public class ManageEmployeesController {
     }
 
     private void updateEmployeeList(String searchString) {
+
         try {
-            flowPaneEmployeeList.getChildren().clear();
-            employeeService
-                    .list()
-                    .stream()
-                    .filter(
-                            employee ->
-                                    searchString.trim().isEmpty()
-                                            || employee.name()
-                                                    .toLowerCase()
-                                                    .contains(searchString.toLowerCase()))
-                    .forEach(this::addEmployeeToFlowPane);
+            employeeListController.setData(
+                    employeeService
+                            .list()
+                            .stream()
+                            .filter(
+                                    employee ->
+                                            searchString.trim().isEmpty()
+                                                    || employee.name()
+                                                            .toLowerCase()
+                                                            .contains(searchString.toLowerCase()))
+                            .collect(Collectors.toList()),
+                    this::openEditEmployee,
+                    null);
+
         } catch (ServiceException e) {
             LOG.error("Could not fetch employee list: {}", e);
         }
     }
 
-    private void addEmployeeToFlowPane(Employee employee) {
-        Insets listItemMargins = new Insets(0, 5, 10, 5);
-
-        try {
-            EmployeeListItemController controller =
-                    EmployeeListItemController.createEmployeeListItemController(
-                            fxmlLoader, employee);
-            Node rootElement = controller.getRootElement();
-            flowPaneEmployeeList.getChildren().add(rootElement);
-            FlowPane.setMargin(rootElement, listItemMargins);
-            controller.setConsumerEditEmployeeClicked(this::openEditEmployee);
-        } catch (IOException e) {
-            LOG.error("Could not create a new EmployeeListItem: {}", e);
-        }
-    }
-
     public void setVisible(boolean b) {
         listEmployeesAP.setVisible(b);
     }
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index e6efb89..c007c88 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -31,7 +31,7 @@
             <Insets top="20.0" />
           </VBox.margin>
           <content>
-            <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;" />
+            <fx:include fx:id="employeeList" source="employeeList.fxml"/>
           </content>
         </ScrollPane>
       </children>
-- 
cgit v1.2.3-70-g09d2


From 593ecaaa0c40eef06dee2be018a312fd195fcedd Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:50:15 +0200
Subject: Remove edit-button and add two callbacks [#25963]

callbacks for only getting the employee and callback for getting the employeeListItemController in order to access the underlying controller
---
 .../controller/EmployeeListItemController.java     | 25 ++++++++++------------
 src/main/resources/fxml/employeeListItem.fxml      |  5 -----
 2 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
index ff5bf59..6fd0824 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
@@ -29,20 +29,16 @@ public class EmployeeListItemController extends CustomListItemController {
 
     private Employee employee;
 
-    private Consumer<Employee> consumerEditEmployeeClicked;
-    private Consumer<EmployeeListItemController> consumerEmployeeClicked;
-
-    @FXML
-    private void onEditEmployeeClicked() {
-        if (consumerEditEmployeeClicked != null) {
-            consumerEditEmployeeClicked.accept(employee);
-        }
-    }
+    private Consumer<Employee> consumerEmployeeClicked;
+    private Consumer<EmployeeListItemController> consumerEmployeeListItemClicked;
 
     @FXML
     private void onEmployeeClicked() {
         if (consumerEmployeeClicked != null) {
-            consumerEmployeeClicked.accept(this);
+            consumerEmployeeClicked.accept(employee);
+        }
+        if (consumerEmployeeListItemClicked != null) {
+            consumerEmployeeListItemClicked.accept(this);
         }
     }
 
@@ -90,11 +86,12 @@ public class EmployeeListItemController extends CustomListItemController {
         return employee;
     }
 
-    public void setConsumerEditEmployeeClicked(Consumer<Employee> consumerEditEmployeeClicked) {
-        this.consumerEditEmployeeClicked = consumerEditEmployeeClicked;
+    public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) {
+        this.consumerEmployeeClicked = consumerEmployeeClicked;
     }
 
-    public void setConsumerEmployeeClicked(Consumer<EmployeeListItemController> consumerEmployeeClicked) {
-        this.consumerEmployeeClicked = consumerEmployeeClicked;
+    public void setConsumerListItemEmployeeClicked(
+            Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) {
+        this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked;
     }
 }
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index 6e95c0c..8e446cb 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
-
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
   prefHeight="96.0" prefWidth="360.0" style="-fx-background-color: white;"
   xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
@@ -19,9 +17,6 @@
         <Font name="System Bold" size="18.0"/>
       </font>
     </Label>
-    <Button fx:id="btnEdit" layoutX="298.0" layoutY="5.0" mnemonicParsing="false"
-      onAction="#onEditEmployeeClicked"
-      text="bearbeiten" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0"/>
     <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0">
       <children>
-- 
cgit v1.2.3-70-g09d2


From 36338e196bf73831b99e19f3e820a8c9c69ede1d Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:23:12 +0200
Subject: Remove inline-style and replace with style classes [#25963]

---
 src/main/resources/fxml/employeeListItem.fxml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index 8e446cb..eb5c95c 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-  prefHeight="96.0" prefWidth="360.0" style="-fx-background-color: white;"
+  prefHeight="96.0" prefWidth="360.0" styleClass="bg-white, shadowed"
   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.EmployeeListItemController"
   onMouseClicked="#onEmployeeClicked">
@@ -20,8 +20,9 @@
     <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0">
       <children>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0" style="-fx-background-color: white;">
+        <AnchorPane prefHeight="42.0" prefWidth="112.0">
           <children>
+            <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgQualification" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
               layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
               AnchorPane.topAnchor="10.0"/>
@@ -29,8 +30,9 @@
               AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0" style="-fx-background-color: white;">
+        <AnchorPane prefHeight="42.0" prefWidth="112.0">
           <children>
+            <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgPilot" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
               layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
               AnchorPane.topAnchor="10.0"/>
@@ -38,8 +40,9 @@
               AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0" style="-fx-background-color: white;">
+        <AnchorPane prefHeight="42.0" prefWidth="112.0">
           <children>
+            <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgDriver" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
               layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
               AnchorPane.topAnchor="10.0"/>
-- 
cgit v1.2.3-70-g09d2


From 508353d4f9d0d6716cabc70f5e9c6c2712264a9b Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 2 Jun 2018 20:18:32 +0200
Subject: Added fxml and controller for archive window [#27299]

Added fxml-File, which contains a small window for the detail view in the archive window. It contains two vboxes, in which vehicle and staff are stored
---
 .../controller/ArchiveOperationController.java     |  33 ++++++-
 .../DetailArchiveOperationController.java          | 106 +++++++++++++++++++++
 src/main/resources/fxml/ArchiveOperation.fxml      |   2 +
 .../resources/fxml/DetailArchiveOperation.fxml     |  17 ++++
 4 files changed, 154 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
 create mode 100644 src/main/resources/fxml/DetailArchiveOperation.fxml

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 86a14f9..a233d21 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -5,6 +5,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.S
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -19,8 +20,9 @@ import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
 import org.springframework.stereotype.Controller;
@@ -28,6 +30,7 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ArchiveOperationController {
 
+    @FXML private ImageView imvVehicleDetail;
     @FXML private AnchorPane apMainDetails;
     @FXML private Label lblOperations;
     @FXML private Label lblClosed;
@@ -46,12 +49,15 @@ public class ArchiveOperationController {
     @FXML private FlowPane archiveOperationFlowPane;
     private final CreateOperationController createOperationController;
     private Set<Operation> list = new HashSet<>();
+    private final SpringFXMLLoader fxmlLoader;
 
     public ArchiveOperationController(
             OperationService operationService,
-            CreateOperationController createOperationController) {
+            CreateOperationController createOperationController,
+            SpringFXMLLoader fxmlLoader) {
         this.operationService = operationService;
         this.createOperationController = createOperationController;
+        this.fxmlLoader = fxmlLoader;
     }
 
     @FXML
@@ -91,6 +97,7 @@ public class ArchiveOperationController {
                                     backApDetails.setVisible(true);
                                     setOperation();
                                     setDetailsVisible(true);
+                                    imvVehicleDetail.setImage(new Image(("/images/Vehicle.png")));
                                 });
                 archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
             }
@@ -151,13 +158,31 @@ public class ArchiveOperationController {
         lblVehicles.setText(result);
         lblAddress.setText(detailOperation.destination());
 
-        for (Vehicle vehicle : detailOperation.vehicles()) {
+        fpVehicles.getChildren().clear();
+        try {
+            for (Vehicle vehicle : detailOperation.vehicles()) {
+                DetailArchiveOperationController controller = null;
+
+                controller = DetailArchiveOperationController.create(fxmlLoader);
+
+                controller.set(vehicle);
+                fpVehicles.getChildren().add(controller.getRoot());
+            }
+        } catch (IOException e) {
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText("Die Element konnte nicht geladen werden!");
+            alert.showAndWait();
+        }
+
+        /*for (Vehicle vehicle : detailOperation.vehicles()) {
             Button b = new Button();
             b.setPrefHeight(200);
             b.setPrefWidth(600 / 2);
             b.setText(vehicle.name());
             fpVehicles.getChildren().add(b);
-        }
+        }*/
     }
 
     public void setListVisible(boolean b) {
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
new file mode 100644
index 0000000..3c50c65
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
@@ -0,0 +1,106 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.layout.VBox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class DetailArchiveOperationController {
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    @FXML private VBox vBoxVehicle;
+    @FXML private VBox vBoxPeople;
+    private final SpringFXMLLoader fxmlLoader;
+
+    public DetailArchiveOperationController(SpringFXMLLoader fxmlLoader) {
+        this.fxmlLoader = fxmlLoader;
+    }
+
+    public static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader)
+            throws IOException {
+        FXMLWrapper<Object, DetailArchiveOperationController> wrapper =
+                fxmlLoader.loadAndWrap(
+                        "/fxml/DetailArchiveOperation.fxml",
+                        DetailArchiveOperationController.class);
+
+        Node root = (Node) wrapper.getLoadedObject();
+        DetailArchiveOperationController result = wrapper.getController();
+        result.rootElement = root;
+
+        return result;
+    }
+
+    public Node getRoot() {
+        return rootElement;
+    }
+
+    private Node rootElement;
+
+    public void set(Vehicle vehicle) {
+        VehiclePaneController controller = null;
+        try {
+            controller = VehiclePaneController.createVehiclePane();
+            controller.setData(vehicle, false);
+            vBoxVehicle.getChildren().add(controller.getRootElement());
+        } catch (IOException e) {
+            LOG.error("Error while updating list.", e);
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText(e.getMessage());
+            alert.showAndWait();
+        }
+        try {
+            for (int i = 0; i < vehicle.registrations().size(); i++) {
+                Employee employee = vehicle.registrations().get(i).employee();
+
+                EmployeeListItemController employeeListItemController =
+                        EmployeeListItemController.createEmployeeListItemController(
+                                fxmlLoader, employee);
+                vBoxPeople.getChildren().add(employeeListItemController.getRootElement());
+            }
+        } catch (IOException e) {
+            LOG.error("Error while updating list.", e);
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText(e.getMessage());
+            alert.showAndWait();
+        }
+    }
+
+    /* public void set(Operation operation) {
+        txtAddress.setText(operation.destination());
+        String date = "am ";
+        if (operation.created() != null) {
+            LocalDateTime myDateTime =
+                    LocalDateTime.ofInstant(
+                            Objects.requireNonNull(operation.created()), ZoneOffset.UTC);
+            date +=
+                    myDateTime.getDayOfMonth()
+                            + "."
+                            + myDateTime.getMonth().getValue()
+                            + "."
+                            + myDateTime.getYear();
+            txtDate.setText(date);
+        } else {
+            txtDate.setText("---");
+        }
+        txtOpCode.setText(operation.opCode());
+        Collection<String> elements =
+                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
+        String result = String.join(", ", elements);
+
+        txtVehicles.setText(result);
+    }*/
+}
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 0e4e3d7..13dbd12 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.FlowPane?>
@@ -63,6 +64,7 @@
                         <Font name="System Bold" size="18.0" />
                      </font>
                   </Label>
+                  <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="14.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" />
                </children>
             </AnchorPane>
             <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0">
diff --git a/src/main/resources/fxml/DetailArchiveOperation.fxml b/src/main/resources/fxml/DetailArchiveOperation.fxml
new file mode 100644
index 0000000..29bdeb7
--- /dev/null
+++ b/src/main/resources/fxml/DetailArchiveOperation.fxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.DetailArchiveOperationController" minWidth="-Infinity" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <HBox prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <VBox fx:id="vBoxVehicle" prefHeight="200.0" prefWidth="100.0" />
+            <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" />
+         </children>
+      </HBox>
+   </children>
+</AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 5bffab6dad44c3fd48a3af767a3eb9e497597773 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 2 Jun 2018 20:32:27 +0200
Subject: Made some adjustments [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml       | 5 ++++-
 src/main/resources/fxml/DetailArchiveOperation.fxml | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 13dbd12..42f583c 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -69,8 +69,11 @@
             </AnchorPane>
             <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0">
                <content>
-                  <FlowPane fx:id="fpVehicles" prefHeight="410.0" prefWidth="840.0" />
+                  <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="410.0" prefWidth="840.0" />
                </content>
+               <padding>
+                  <Insets left="40.0" right="40.0" top="20.0" />
+               </padding>
             </ScrollPane>
          </children>
       </AnchorPane>
diff --git a/src/main/resources/fxml/DetailArchiveOperation.fxml b/src/main/resources/fxml/DetailArchiveOperation.fxml
index 29bdeb7..616818e 100644
--- a/src/main/resources/fxml/DetailArchiveOperation.fxml
+++ b/src/main/resources/fxml/DetailArchiveOperation.fxml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.DetailArchiveOperationController" minWidth="-Infinity" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" 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.DetailArchiveOperationController">
    <children>
-      <HBox prefHeight="100.0" prefWidth="200.0">
+      <HBox prefHeight="100.0" prefWidth="200.0" spacing="40.0">
          <children>
             <VBox fx:id="vBoxVehicle" prefHeight="200.0" prefWidth="100.0" />
             <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" />
          </children>
+         <padding>
+            <Insets right="10.0" />
+         </padding>
       </HBox>
    </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 04b9248e78d9969fa880133f37d932cf50a5b73c Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 2 Jun 2018 21:08:09 +0200
Subject: Small design adjustments, reversed order for archived operations
 [#27299]

---
 .../controller/ArchiveOperationController.java     |  2 +-
 src/main/resources/fxml/ArchiveOperation.fxml      | 25 +++++++++++-----------
 .../resources/fxml/DetailArchiveOperation.fxml     |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index a233d21..d66ad40 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -120,7 +120,7 @@ public class ArchiveOperationController {
                 LocalDateTime second =
                         LocalDateTime.ofInstant(
                                 Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC);
-                if (second.isBefore(first)) {
+                if (first.isBefore(second)) {
                     Operation help = array[j];
                     array[j] = array[j + 1];
                     array[j + 1] = help;
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 42f583c..8db231e 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -12,11 +12,11 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.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.ArchiveOperationController">
+<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" 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.ArchiveOperationController">
   <children>
-      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
+      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="435.0" prefWidth="900.0" style="-fx-background-color:  rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
          <content>
-            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vgap="12">
+            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color:  rgba(239,235,232,1);" vgap="12">
                <padding>
                   <Insets left="40.0" top="20.0" />
                </padding></FlowPane>
@@ -24,6 +24,15 @@
       </ScrollPane>
       <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
+            <ScrollPane fitToWidth="true" hbarPolicy="NEVER" layoutY="211.0" prefHeight="424.0" prefWidth="840.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="211.0">
+               <content>
+                  <FlowPane fx:id="fpVehicles" hgap="50" prefHeight="419.0" prefWidth="830.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="20">
+                     <padding>
+                        <Insets left="40.0" right="40.0" top="20.0" />
+                     </padding>
+                  </FlowPane>
+               </content>
+            </ScrollPane>
             <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
                   <Label layoutX="81.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
@@ -42,7 +51,7 @@
                      </font>
                   </Hyperlink>
                </children></AnchorPane>
-            <AnchorPane layoutX="82.0" layoutY="60.0" prefHeight="150.0" prefWidth="836.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
+            <AnchorPane layoutX="82.0" layoutY="81.0" prefHeight="99.0" prefWidth="822.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
                <children>
                   <Label fx:id="lblOpCode" layoutX="25.0" layoutY="22.0" prefHeight="26.0" prefWidth="116.0" text="Label">
                      <font>
@@ -67,14 +76,6 @@
                   <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="14.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" />
                </children>
             </AnchorPane>
-            <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0">
-               <content>
-                  <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="410.0" prefWidth="840.0" />
-               </content>
-               <padding>
-                  <Insets left="40.0" right="40.0" top="20.0" />
-               </padding>
-            </ScrollPane>
          </children>
       </AnchorPane>
       <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/fxml/DetailArchiveOperation.fxml b/src/main/resources/fxml/DetailArchiveOperation.fxml
index 616818e..82c23ed 100644
--- a/src/main/resources/fxml/DetailArchiveOperation.fxml
+++ b/src/main/resources/fxml/DetailArchiveOperation.fxml
@@ -7,10 +7,10 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" 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.DetailArchiveOperationController">
    <children>
-      <HBox prefHeight="100.0" prefWidth="200.0" spacing="40.0">
+      <HBox prefHeight="100.0" prefWidth="200.0" spacing="100.0">
          <children>
             <VBox fx:id="vBoxVehicle" prefHeight="200.0" prefWidth="100.0" />
-            <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" />
+            <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" spacing="10.0" />
          </children>
          <padding>
             <Insets right="10.0" />
-- 
cgit v1.2.3-70-g09d2


From 6fc7c0033e7e48c4e1f717d21db70552460676c1 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 3 Jun 2018 12:48:46 +0200
Subject: Added label for status of archived operation, added statistics
 {#27299]

---
 .../controller/ArchiveOperationController.java     | 41 ++++++++++++----------
 src/main/resources/fxml/ArchiveOperation.fxml      |  9 +++--
 2 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index d66ad40..5e89b66 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -31,9 +31,10 @@ import org.springframework.stereotype.Controller;
 public class ArchiveOperationController {
 
     @FXML private ImageView imvVehicleDetail;
+    @FXML private Label lblStatus;
     @FXML private AnchorPane apMainDetails;
     @FXML private Label lblOperations;
-    @FXML private Label lblClosed;
+    @FXML private Label lblCompleted;
     @FXML private Label lblCancelled;
     @FXML private AnchorPane backApMain;
     @FXML private AnchorPane backApDetails;
@@ -70,6 +71,15 @@ public class ArchiveOperationController {
         list.clear();
         try {
             list.addAll(operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED)));
+            long cancelledAmount = 0;
+            long completedAmount = 0;
+            for (Operation operation : list) {
+                if (operation.status() == Status.CANCELLED) cancelledAmount++;
+                else completedAmount++;
+            }
+            lblCancelled.setText("storniert: " + cancelledAmount);
+            lblCompleted.setText("abgeschlossen: " + completedAmount);
+            lblOperations.setText("Einsätze: " + list.size());
         } catch (ServiceException e) {
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
@@ -97,7 +107,7 @@ public class ArchiveOperationController {
                                     backApDetails.setVisible(true);
                                     setOperation();
                                     setDetailsVisible(true);
-                                    imvVehicleDetail.setImage(new Image(("/images/Vehicle.png")));
+                                    imvVehicleDetail.setImage(new Image("/images/Vehicle.png"));
                                 });
                 archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
             }
@@ -110,6 +120,8 @@ public class ArchiveOperationController {
         }
     }
 
+    private Operation detailOperation;
+
     private List<Operation> sortSet(Set<Operation> operationsSet) {
         Operation[] array = operationsSet.toArray(new Operation[operationsSet.size()]);
         for (int i = array.length - 1; i > 0; i--) {
@@ -130,26 +142,27 @@ public class ArchiveOperationController {
         return Arrays.asList(array);
     }
 
-    private Operation detailOperation;
-
     private void setOperation() {
         lblCodeHeader.setText(detailOperation.opCode());
-        String date = "am ";
         if (detailOperation.created() != null) {
             LocalDateTime dateTime =
                     LocalDateTime.ofInstant(
                             Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
-            date +=
-                    dateTime.getDayOfMonth()
+            lblDate.setText(
+                    "am "
+                            + dateTime.getDayOfMonth()
                             + "."
                             + dateTime.getMonth().getValue()
                             + "."
-                            + dateTime.getYear();
-            lblDate.setText(date);
+                            + dateTime.getYear());
         } else {
             lblDate.setText("---");
         }
-
+        lblStatus.setText(
+                "Status: "
+                        + (detailOperation.status() == Status.CANCELLED
+                                ? "storniert"
+                                : "abgeschlossen"));
         lblOpCode.setText(detailOperation.opCode());
         Collection<String> elements =
                 detailOperation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
@@ -175,14 +188,6 @@ public class ArchiveOperationController {
             alert.setContentText("Die Element konnte nicht geladen werden!");
             alert.showAndWait();
         }
-
-        /*for (Vehicle vehicle : detailOperation.vehicles()) {
-            Button b = new Button();
-            b.setPrefHeight(200);
-            b.setPrefWidth(600 / 2);
-            b.setText(vehicle.name());
-            fpVehicles.getChildren().add(b);
-        }*/
     }
 
     public void setListVisible(boolean b) {
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 8db231e..c479de6 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -63,7 +63,7 @@
                         <Font size="15.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblVehicles" layoutX="58.0" layoutY="91.0" prefHeight="46.0" prefWidth="554.0" text="Label">
+                  <Label fx:id="lblVehicles" layoutX="58.0" layoutY="91.0" prefHeight="46.0" prefWidth="540.0" text="Label">
                      <font>
                         <Font size="15.0" />
                      </font>
@@ -74,6 +74,11 @@
                      </font>
                   </Label>
                   <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="14.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" />
+                  <Label fx:id="lblStatus" alignment="CENTER_RIGHT" layoutX="476.0" layoutY="91.0" prefHeight="27.0" prefWidth="322.0" text="Status: ">
+                     <font>
+                        <Font name="System Bold" size="15.0" />
+                     </font>
+                  </Label>
                </children>
             </AnchorPane>
          </children>
@@ -109,7 +114,7 @@
                         <Font name="System Bold" size="20.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblClosed" text="abgeschlossen:" GridPane.rowIndex="1">
+                  <Label fx:id="lblCompleted" text="abgeschlossen:" GridPane.rowIndex="1">
                      <font>
                         <Font size="15.0" />
                      </font>
-- 
cgit v1.2.3-70-g09d2


From 2bd345681f8d798ea288e30e12611792c55d3945 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 7 Jun 2018 17:59:52 +0200
Subject: Small design adjustments {#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index c479de6..d955953 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -26,7 +26,7 @@
          <children>
             <ScrollPane fitToWidth="true" hbarPolicy="NEVER" layoutY="211.0" prefHeight="424.0" prefWidth="840.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="211.0">
                <content>
-                  <FlowPane fx:id="fpVehicles" hgap="50" prefHeight="419.0" prefWidth="830.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="20">
+                  <FlowPane fx:id="fpVehicles" hgap="50" prefHeight="419.0" prefWidth="830.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="50">
                      <padding>
                         <Insets left="40.0" right="40.0" top="20.0" />
                      </padding>
@@ -63,7 +63,7 @@
                         <Font size="15.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblVehicles" layoutX="58.0" layoutY="91.0" prefHeight="46.0" prefWidth="540.0" text="Label">
+                  <Label fx:id="lblVehicles" layoutX="83.0" layoutY="91.0" prefHeight="46.0" prefWidth="517.0" text="Label">
                      <font>
                         <Font size="15.0" />
                      </font>
@@ -73,8 +73,8 @@
                         <Font name="System Bold" size="18.0" />
                      </font>
                   </Label>
-                  <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="14.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" />
-                  <Label fx:id="lblStatus" alignment="CENTER_RIGHT" layoutX="476.0" layoutY="91.0" prefHeight="27.0" prefWidth="322.0" text="Status: ">
+                  <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="26.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" />
+                  <Label fx:id="lblStatus" alignment="CENTER_RIGHT" layoutX="476.0" layoutY="91.0" prefHeight="27.0" prefWidth="301.0" text="Status: ">
                      <font>
                         <Font name="System Bold" size="15.0" />
                      </font>
-- 
cgit v1.2.3-70-g09d2


From a5cc1e2c7a20821161f894af0dc890a1c7811600 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Fri, 8 Jun 2018 19:05:23 +0200
Subject: Starting UI Rework.

---
 src/main/resources/fxml/RegistrationWindow.fxml | 172 +++++++++++++++---------
 src/main/resources/styles/main.css              |   9 ++
 2 files changed, 119 insertions(+), 62 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index a138d02..2e91d36 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -11,66 +11,114 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.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>
+<?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">
+  <rowConstraints>
+    <RowConstraints/> <!--"Neue Anmeldung", "von x bis x", Buttons-->
+    <RowConstraints/> <!--"Fahrzeug", "Personen"-->
+    <RowConstraints/> <!--"KTW-99", "Max Mustermann, ..."-->
+    <RowConstraints prefHeight="15"/> <!--The overflow of the orange area-->
+    <RowConstraints/> <!--Lists-->
+  </rowConstraints>
+  <columnConstraints>
+    <ColumnConstraints/>
+    <ColumnConstraints prefWidth="20"/> <!--The gap between the colums-->
+    <ColumnConstraints/>
+  </columnConstraints>
+  <padding>
+    <Insets topRightBottomLeft="12"/>
+  </padding>
+  <AnchorPane style="-fx-background-color: #2D75B6;" GridPane.columnIndex="0" GridPane.columnSpan="3" GridPane.rowIndex="0" GridPane.rowSpan="4" styleClass="bg-dark-orange">
+    <GridPane.margin>
+      <Insets topRightBottomLeft="-12"/>
+    </GridPane.margin>
+  </AnchorPane>
+  <VBox> <!--"Neue Anmeldung", "von bis"-->
+    <Text text="Neue Anmeldung" styleClass="text-big" style="-fx-fill: white;"/>
+    <HBox spacing="6" alignment="CENTER">
+      <Text text="von" style="-fx-fill: white;"/>
+      <ComboBox value="8:00"/>
+      <Text text="bis" style="-fx-fill: white;"/>
+      <ComboBox value="16:00"/>
+    </HBox>
+  </VBox>
+  <VBox GridPane.columnIndex="2">
+    <Hyperlink text="schließen" styleClass="text-big, text-white"/>
+    <Button text="ERSTELLEN" styleClass="button-main"/>
+  </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>-->
diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css
index 886e756..fe4a87a 100644
--- a/src/main/resources/styles/main.css
+++ b/src/main/resources/styles/main.css
@@ -49,6 +49,7 @@
 /* === text === */
 .text-big {
   -fx-font-size: 18px;
+
 }
 
 .text-medium {
@@ -59,6 +60,14 @@
   -fx-font-size: 14px;
 }
 
+.text-bold {
+  -fx-font-weight: bold;
+}
+
+.text-white {
+  -fx-text-fill: white;
+}
+
 /* === button === */
 .button {
   -fx-background-radius: 0em;
-- 
cgit v1.2.3-70-g09d2


From 190110e7aa414b56aad41712e2529598530bf8b5 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Fri, 8 Jun 2018 19:09:44 +0200
Subject: UI Rework. WiP.

---
 src/main/resources/fxml/RegistrationWindow.fxml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index 2e91d36..c369a70 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -44,18 +44,18 @@
       <Insets topRightBottomLeft="-12"/>
     </GridPane.margin>
   </AnchorPane>
-  <VBox> <!--"Neue Anmeldung", "von bis"-->
-    <Text text="Neue Anmeldung" styleClass="text-big" style="-fx-fill: white;"/>
+  <VBox spacing="3"> <!--"Neue Anmeldung", "von bis"-->
+    <Label text="Neue Anmeldung" styleClass="text-big, text-white, text-bold"/>
     <HBox spacing="6" alignment="CENTER">
-      <Text text="von" style="-fx-fill: white;"/>
+      <Label text="von" styleClass="text-medium, text-white"/>
       <ComboBox value="8:00"/>
-      <Text text="bis" style="-fx-fill: white;"/>
+      <Label text="bis" styleClass="text-medium, text-white"/>
       <ComboBox value="16:00"/>
     </HBox>
   </VBox>
   <VBox GridPane.columnIndex="2">
-    <Hyperlink text="schließen" styleClass="text-big, text-white"/>
-    <Button text="ERSTELLEN" styleClass="button-main"/>
+    <Hyperlink text="schließen" styleClass="text-small, text-white"/>
+    <Button text="ERSTELLEN" styleClass="button-main, text-medium"/>
   </VBox>
 </GridPane>
 
-- 
cgit v1.2.3-70-g09d2


From 191670b9cb882c401357f8d9e358d46ae52560af Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Sat, 9 Jun 2018 12:55:39 +0200
Subject: Registration Window WiP

---
 src/main/resources/fxml/RegistrationWindow.fxml | 169 ++++++++++++++----------
 1 file changed, 102 insertions(+), 67 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index c369a70..1bdbe4d 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -23,12 +23,13 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.Pane?>
-<GridPane stylesheets="@/styles/main.css">
+<GridPane stylesheets="@/styles/main.css" styleClass="bg-gray-orange">
   <rowConstraints>
     <RowConstraints/> <!--"Neue Anmeldung", "von x bis x", Buttons-->
     <RowConstraints/> <!--"Fahrzeug", "Personen"-->
     <RowConstraints/> <!--"KTW-99", "Max Mustermann, ..."-->
     <RowConstraints prefHeight="15"/> <!--The overflow of the orange area-->
+    <RowConstraints/> <!--Search-->
     <RowConstraints/> <!--Lists-->
   </rowConstraints>
   <columnConstraints>
@@ -39,7 +40,8 @@
   <padding>
     <Insets topRightBottomLeft="12"/>
   </padding>
-  <AnchorPane style="-fx-background-color: #2D75B6;" GridPane.columnIndex="0" GridPane.columnSpan="3" GridPane.rowIndex="0" GridPane.rowSpan="4" styleClass="bg-dark-orange">
+  <AnchorPane GridPane.columnIndex="0" GridPane.columnSpan="3" GridPane.rowIndex="0"
+    GridPane.rowSpan="4" styleClass="bg-dark-orange">
     <GridPane.margin>
       <Insets topRightBottomLeft="-12"/>
     </GridPane.margin>
@@ -48,77 +50,110 @@
     <Label text="Neue Anmeldung" styleClass="text-big, text-white, text-bold"/>
     <HBox spacing="6" alignment="CENTER">
       <Label text="von" styleClass="text-medium, text-white"/>
-      <ComboBox value="8:00"/>
+      <ComboBox value="8:00" style="-fx-background-color: transparent"
+        styleClass="text-medium, text-white, text-bold"/>
       <Label text="bis" styleClass="text-medium, text-white"/>
       <ComboBox value="16:00"/>
     </HBox>
   </VBox>
-  <VBox GridPane.columnIndex="2">
+  <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"/>
   </VBox>
-</GridPane>
+  <Label text="Fahrzeug" GridPane.rowIndex="1" styleClass="text-big, text-white, text-bold">
+    <GridPane.margin>
+      <Insets top="12"/>
+    </GridPane.margin>
+  </Label>
+  <Label text="Personen" GridPane.rowIndex="1" GridPane.columnIndex="2"
+    styleClass="text-big, text-white, text-bold">
+    <GridPane.margin>
+      <Insets top="12"/>
+    </GridPane.margin>
+  </Label>
+  <Label 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"
+    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"/>
+  <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"/>
+  </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"/>
+  </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>-->
+  <!--<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


From 8735141583894d14e620dae537192d12d06f9ba8 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 11 Jun 2018 10:17:52 +0200
Subject: UI Rework

---
 .../controller/EmployeeListController.java         |  13 +-
 .../controller/ManageEmployeesController.java      |   3 +-
 .../controller/RegistrationWindowController.java   | 233 ++++++++++++++-------
 src/main/resources/fxml/RegistrationWindow.fxml    |  60 +++---
 src/main/resources/styles/main.css                 |  41 ++++
 5 files changed, 236 insertions(+), 114 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
index dc808a4..843145c 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
@@ -30,22 +31,27 @@ public class EmployeeListController {
     private final SpringFXMLLoader fxmlLoader;
     private Node rootElement;
     private List<EmployeeListItemController> employeeListItemControllers;
+    private Insets listItemMargins = new Insets(0, 5, 10, 5);
 
     public EmployeeListController(SpringFXMLLoader fxmlLoader) {
         this.fxmlLoader = fxmlLoader;
         this.employeeListItemControllers = new ArrayList<>();
     }
 
-    public void setData(List<Employee> employeeList) {
+    public void setListItemMargins(Insets value) {
+        this.listItemMargins = value;
+    }
+
+    public void setData(Set<Employee> employeeList) {
         setData(employeeList, null, null);
     }
 
-    public void setData(List<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
+    public void setData(Set<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
         setData(employeeList, onEmployeeClicked, null);
     }
 
     public void setData(
-            List<Employee> employeeList,
+            Set<Employee> employeeList,
             Consumer<Employee> onEmployeeClicked,
             Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
 
@@ -61,7 +67,6 @@ public class EmployeeListController {
             Employee employee,
             Consumer<Employee> onEmployeeClicked,
             Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
-        Insets listItemMargins = new Insets(0, 5, 10, 5);
 
         try {
             EmployeeListItemController controller =
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
index ed43c13..67cf7fa 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
@@ -6,6 +6,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.util.HashSet;
 import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.layout.AnchorPane;
@@ -100,7 +101,7 @@ public class ManageEmployeesController {
                                                     || employee.name()
                                                             .toLowerCase()
                                                             .contains(searchString.toLowerCase()))
-                            .collect(Collectors.toList()),
+                            .collect(Collectors.toCollection(HashSet::new)),
                     this::openEditEmployee);
 
         } catch (ServiceException e) {
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 6768162..b8abf91 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
@@ -10,6 +10,8 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Vehicle
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -19,17 +21,21 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import javafx.beans.property.SimpleStringProperty;
+import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,117 +47,179 @@ public class RegistrationWindowController {
     private static final Logger LOG = LoggerFactory.getLogger(RegistrationWindowController.class);
 
     private final EmployeeService employeeService;
-
     private final VehicleService vehicleService;
-
+    private final RegistrationService registrationService;
     private final CreateOperationController createOperationController;
+    private final SpringFXMLLoader fxmlLoader;
 
-    private final RegistrationService registrationService;
-    @FXML private VBox registrationWindowVB;
+    @FXML private GridPane root;
+    @FXML private VBox vbVehicles;
+    @FXML private ScrollPane listEmployee;
+    @FXML private ChoiceBox<Integer> cbStart;
+    @FXML private ChoiceBox<Integer> cbEnd;
+    @FXML private Label lVehicles;
+    @FXML private Label lEmployees;
+    @FXML private TextField tfVehicleSearch;
+    @FXML private TextField tfEmployeeSearch;
+    private EmployeeListController employeeListController;
+
+    private Vehicle chosenVehicle;
+    private List<Employee> chosenEmployees = new LinkedList<>();
 
     public RegistrationWindowController(
             EmployeeService employeeService,
             VehicleService vehicleService,
             CreateOperationController createOperationController,
-            RegistrationService registrationService) {
+            RegistrationService registrationService,
+            SpringFXMLLoader fxmlLoader) {
         this.employeeService = employeeService;
         this.vehicleService = vehicleService;
         this.createOperationController = createOperationController;
         this.registrationService = registrationService;
+        this.fxmlLoader = fxmlLoader;
     }
 
-    @FXML private ChoiceBox<Integer> cbStart;
-    @FXML private ChoiceBox<Integer> cbEnd;
-    @FXML private Label lVehicles;
-    @FXML private Label lEmployees;
-    @FXML private TextField tfVehicleSearch;
-    @FXML private TextField tfEmployeeSearch;
-    @FXML private TableView<Vehicle> tvVehicles;
-    @FXML private TableView<Employee> tvEmployees;
-    @FXML private TableColumn<Vehicle, String> tcVehicles;
-    @FXML private TableColumn<Employee, String> tcEmployees;
+    @FXML
+    private void initialize() throws IOException {
+        employeeListController = EmployeeListController.createEmployeeListController(fxmlLoader);
+        employeeListController.setListItemMargins(new Insets(10, 6, 0, 6));
+        //        listEmployee. .getChildren().add(employeeListController.getRootElement());
+        Node emplList = employeeListController.getRootElement();
+        //        emplList.(360);
+        listEmployee.setContent(emplList);
 
-    private Vehicle chosenVehicle;
-    private List<Employee> chosenEmployees = new LinkedList<>();
+        ObservableList<Integer> hours =
+                FXCollections.observableArrayList(
+                        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+                        21, 22, 23);
+        cbStart.setItems(hours);
+        cbStart.setValue(0);
+        cbEnd.setItems(hours);
+        cbEnd.setValue(12);
+
+        reset();
+    }
+
+    private void updateEmplList() {
+        employeeListController.deselectAllEmployees();
 
-    @FXML
-    private void initialize() {
-        // will have to be replaced for FlowPane
         try {
-            Set<Vehicle> vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
-            tcVehicles.setCellValueFactory(x -> new SimpleStringProperty(x.getValue().name()));
-            tvVehicles.setItems(FXCollections.observableArrayList(vehicles));
+            Set<Employee> employees =
+                    employeeService
+                            .list()
+                            .stream()
+                            .filter(
+                                    e ->
+                                            e.name()
+                                                    .toLowerCase()
+                                                    .contains(
+                                                            tfEmployeeSearch
+                                                                    .getText()
+                                                                    .toLowerCase()))
+                            .collect(Collectors.toCollection(HashSet::new));
+            employeeListController.setData(
+                    employees,
+                    selection -> {
+                        if (selection == null) {
+                            return;
+                        } else if (chosenEmployees.contains(selection)) {
+                            chosenEmployees.remove(selection);
+                        } else {
+                            chosenEmployees.add(selection);
+                        }
+
+                        StringBuilder text = new StringBuilder();
+                        boolean first = true;
+                        for (Employee employee : chosenEmployees) {
+                            if (!first) {
+                                text.append(", ");
+                            }
+                            text.append(employee.name());
+                            first = false;
+                        }
+                        lEmployees.setText(text.toString());
+                    },
+                    contr -> contr.setSelected(chosenEmployees.contains(contr.getEmployee())));
+
+            employees.forEach(
+                    e -> {
+                        if (chosenEmployees.contains(e)) employeeListController.selectEmployee(e);
+                    });
         } catch (ServiceException e) {
             LOG.warn(
-                    "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
+                    "Caught ServiceException while getting employees. Showing it to user. Error message: {}",
                     e.getMessage());
             Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fahrzeuge - Fehler!");
-            alert.setHeaderText("Beim Auflisten der Fahrzeug ist ein Fehler aufgetreten.");
+            alert.setTitle("Personal - Fehler!");
+            alert.setHeaderText("Beim Auflisten des Personals ist ein Fehler aufgetreten.");
             alert.setContentText(e.getMessage());
             alert.show();
         }
+    }
+
+    private void updateVehList() {
+        vbVehicles.getChildren().clear();
+
         try {
-            Set<Employee> employees = employeeService.list();
-            tcEmployees.setCellValueFactory(x -> new SimpleStringProperty(x.getValue().name()));
-            tvEmployees.setItems(FXCollections.observableArrayList(employees));
+            Set<Vehicle> vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
+
+            for (Vehicle vehicle : vehicles) {
+                if (!vehicle.name().toLowerCase().contains(tfVehicleSearch.getText().toLowerCase()))
+                    continue;
+
+                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
+                vp.setData(vehicle, false);
+                vbVehicles.getChildren().add(vp.getRootElement());
+
+                vp.getRootElement()
+                        .setOnMouseClicked(
+                                event -> {
+                                    if (event.getButton() == MouseButton.PRIMARY) {
+                                        chosenVehicle = vehicle;
+                                        lVehicles.setText(chosenVehicle.name());
+                                        updateVehList();
+                                    }
+                                });
+                if (chosenVehicle != null && chosenVehicle.id() == vehicle.id())
+                    vp.setSelected(true);
+            }
         } catch (ServiceException e) {
             LOG.warn(
-                    "Caught ServiceException while getting employees. Showing it to user. Error message: {}",
-                    e.getMessage());
+                    "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
+                    e);
             Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Personal - Fehler!");
-            alert.setHeaderText("Beim Auflisten des Personals ist ein Fehler aufgetreten.");
+            alert.setTitle("Fahrzeuge - Fehler!");
+            alert.setHeaderText("Beim Auflisten der Fahrzeug ist ein Fehler aufgetreten.");
+            alert.setContentText(e.getMessage());
+            alert.show();
+        } catch (IOException e) {
+            LOG.error(
+                    "Caught IOException while updateVehList. Showing it to user.", e.getMessage());
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setTitle("Fehler");
             alert.setContentText(e.getMessage());
             alert.show();
         }
-        tvVehicles.setOnMousePressed(
-                mouseEvent -> {
-                    if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) {
-                        chosenVehicle = tvVehicles.getSelectionModel().getSelectedItem();
-                        if (chosenVehicle == null) {
-                            return;
-                        }
-                        lVehicles.setText(chosenVehicle.name());
-                    }
-                });
-        tvEmployees.setOnMousePressed(
-                mouseEvent -> {
-                    if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) {
-                        Employee selection = tvEmployees.getSelectionModel().getSelectedItem();
-                        if (selection == null) {
-                            return;
-                        } else if (chosenEmployees.contains(selection)) {
-                            chosenEmployees.remove(selection);
-                        } else {
-                            chosenEmployees.add(selection);
-                        }
-
-                        StringBuilder text = new StringBuilder();
-                        for (Employee employee : chosenEmployees) {
-                            text.append(employee.name()).append("\n");
-                        }
-                        lEmployees.setText(text.toString());
-                    }
-                });
-        ObservableList<Integer> hours =
-                FXCollections.observableArrayList(
-                        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-                        21, 22, 23);
-        cbStart.setItems(hours);
-        cbStart.setValue(0);
-        cbEnd.setItems(hours);
-        cbEnd.setValue(12);
     }
 
     public void cancel() {
         LOG.debug("Cancel Button clicked");
-        chosenEmployees.clear();
-        // ((Stage) lVehicles.getScene().getWindow()).close();
+        reset();
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
 
+    private void reset() {
+        chosenEmployees.clear();
+        chosenVehicle = null;
+        tfEmployeeSearch.setText("");
+        tfVehicleSearch.setText("");
+        lEmployees.setText("-");
+        lVehicles.setText("-");
+        updateVehList();
+        updateEmplList();
+    }
+
     public void create() {
         LOG.debug("Create Button clicked");
 
@@ -183,8 +251,8 @@ public class RegistrationWindowController {
             // ((Stage) lVehicles.getScene().getWindow()).close();
             this.setVisible(false);
             createOperationController.setVisible(true);
+            reset();
         } catch (InvalidVehicleException e) {
-            // NOT THROWN ANYWHERE RIGHT NOW
             LOG.info(
                     "Caught InvalidVehicleException. Showing it to user. Error message: {}",
                     e.getClass().toString(),
@@ -194,7 +262,6 @@ public class RegistrationWindowController {
             alert.setHeaderText("Das spezifizierte Fahrzeug ist nicht gültig.");
             alert.setContentText(e.getMessage());
             alert.show();
-            chosenEmployees.clear();
         } catch (ServiceException e) {
             LOG.warn(
                     "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
@@ -204,7 +271,6 @@ public class RegistrationWindowController {
             alert.setHeaderText("Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
             alert.setContentText(e.getMessage());
             alert.show();
-            chosenEmployees.clear();
         } catch (InvalidRegistrationException e) {
             LOG.info(
                     "Caught InvalidRegistrationException. Showing it to user. Error message: {}",
@@ -215,11 +281,18 @@ public class RegistrationWindowController {
                     "Die gewählte Kombination von Fahrzeug und Personal ist nicht gültig!");
             alert.setContentText(e.getMessage());
             alert.show();
-            chosenEmployees.clear();
         }
     }
 
     public void setVisible(boolean b) {
-        this.registrationWindowVB.setVisible(b);
+        root.setVisible(b);
+    }
+
+    public void tfVehicleSearch_TextChanged(KeyEvent keyEvent) {
+        updateVehList();
+    }
+
+    public void tfEmployeeSearch_TextChanged(KeyEvent keyEvent) {
+        updateEmplList();
     }
 }
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;
+}*/
+
-- 
cgit v1.2.3-70-g09d2


From a045b4779714eabfc1a9473c40c84d8eb3f3cf98 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 11 Jun 2018 17:33:14 +0200
Subject: [#27381] CreateOperstionController changes to properly align the
 half-transparent pane & the registration-pane.

---
 .../controller/CreateOperationController.java        |  3 +++
 .../resources/fxml/CreateOperationController.fxml    | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index 9648d8a..e791205 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -81,6 +81,7 @@ public class CreateOperationController {
 
     @FXML
     private void initialize() {
+
         lblChosenVehicles.setText("keine ausgewählt");
         lvActiveOperations.setCellFactory(
                 param ->
@@ -105,7 +106,9 @@ public class CreateOperationController {
                         openDetailsWindow(lvActiveOperations.getSelectionModel().getSelectedItem());
                     }
                 });
+
         createCarController.setVisible(false);
+        registrationWindowController.setVisible(false);
     }
 
     public void updateList() {
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index d22dc45..9a6462d 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -8,6 +8,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?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"
@@ -66,7 +67,7 @@
     styleClass="text-small"
     textFill="WHITE">
   </Hyperlink>
-  <AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0"
+  <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"
@@ -80,12 +81,19 @@
   <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"
+  <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"/>
   <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml"
     AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
-  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees" source="/fxml/manageEmployees.fxml"/>
-  <fx:include AnchorPane.leftAnchor="300" AnchorPane.topAnchor="135.4" source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/>
-  <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/>
-  <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/>
+  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
+    source="/fxml/manageEmployees.fxml"/>
+  <GridPane 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:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0"
+    source="/fxml/createCar.fxml" fx:id="createCar"/>
+  <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml"
+    fx:id="archiveOperation"/>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 68f25b88054f7dcbc3a4485f305c4da34b3a1027 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 11 Jun 2018 17:39:30 +0200
Subject: [#27381] Fixing bug caused by previous commit (nothing clickable)

---
 .../einsatzverwaltung/controller/CreateOperationController.java       | 4 ++++
 src/main/resources/fxml/CreateOperationController.fxml                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index e791205..3977629 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -38,6 +38,7 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,6 +50,7 @@ public class CreateOperationController {
     private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
     public AnchorPane apCreateOperation;
+    @FXML private GridPane grdWindowContainer;
     @FXML private TextField txtCode;
     @FXML private TextField txtAddress;
     @FXML private TextField txtNote;
@@ -363,6 +365,8 @@ public class CreateOperationController {
 
     void setVisible(boolean b) {
         apInvisible.setVisible(!b);
+        grdWindowContainer.setVisible(!b);
+
         updateList();
     }
 
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 9a6462d..8f1e3c3 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -88,7 +88,7 @@
     AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
   <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
     source="/fxml/manageEmployees.fxml"/>
-  <GridPane AnchorPane.topAnchor="0" AnchorPane.leftAnchor="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>
-- 
cgit v1.2.3-70-g09d2


From a461b9e807686fb34cdc98a2bbed6ab3923df823 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 11 Jun 2018 20:52:34 +0200
Subject: [#27381] UI Changes

---
 .../controller/RegistrationWindowController.java              | 11 +++++++++++
 src/main/resources/fxml/RegistrationWindow.fxml               |  6 +++---
 src/main/resources/styles/main.css                            |  4 ++++
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/main/resources/fxml')

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 b8abf91..1a4a4e9 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
@@ -163,10 +163,14 @@ public class RegistrationWindowController {
         try {
             Set<Vehicle> vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
 
+            boolean anyMatch = false;
+
             for (Vehicle vehicle : vehicles) {
                 if (!vehicle.name().toLowerCase().contains(tfVehicleSearch.getText().toLowerCase()))
                     continue;
 
+                anyMatch = true;
+
                 VehiclePaneController vp = VehiclePaneController.createVehiclePane();
                 vp.setData(vehicle, false);
                 vbVehicles.getChildren().add(vp.getRootElement());
@@ -183,6 +187,13 @@ public class RegistrationWindowController {
                 if (chosenVehicle != null && chosenVehicle.id() == vehicle.id())
                     vp.setSelected(true);
             }
+
+            if (!anyMatch) {
+                // Kind of ugly, but best way to get the size of a VehiclePane
+                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
+                vp.getRootElement().setVisible(false);
+                vbVehicles.getChildren().add(vp.getRootElement());
+            }
         } catch (ServiceException e) {
             LOG.warn(
                     "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index 7f3d391..1524462 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -68,7 +68,7 @@
 
   <ScrollPane GridPane.rowIndex="5">
     <GridPane.margin>
-      <Insets left="-6" right="-6"/>
+      <Insets left="-6" right="-6" bottom="-12"/>
     </GridPane.margin>
     <VBox fx:id="vbVehicles" spacing="6">
       <padding>
@@ -78,7 +78,7 @@
   </ScrollPane>
   <ScrollPane fx:id="listEmployee" hbarPolicy="NEVER" GridPane.rowIndex="5" GridPane.columnIndex="2">
     <GridPane.margin>
-      <Insets left="-7" right="-20"/>
+      <Insets left="-7" right="-20" bottom="-12"/>
     </GridPane.margin>
   </ScrollPane>
   <VBox GridPane.rowIndex="4" spacing="6" styleClass="bg-white, shadowed">
@@ -86,7 +86,7 @@
       <Insets topRightBottomLeft="6"/>
     </padding>
     <Label text="Fahrzeugsuche" styleClass="text-medium"/>
-    <TextField fx:id="tfVehicleSearch" onKeyTyped="#tfVehicleSearch_TextChanged" styleClass="text-big, text-bold"/>
+    <TextField fx:id="tfVehicleSearch" prefWidth="0" onKeyTyped="#tfVehicleSearch_TextChanged" styleClass="text-big, text-bold"/>
   </VBox>
   <VBox GridPane.rowIndex="4" spacing="6" GridPane.columnIndex="2" styleClass="bg-white, shadowed">
     <padding>
diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css
index b567666..db8076a 100644
--- a/src/main/resources/styles/main.css
+++ b/src/main/resources/styles/main.css
@@ -122,6 +122,10 @@
   -fx-background-color:transparent;
 }
 
+.scroll-pane .viewport {
+    -fx-background-color: transparent;
+}
+
 .scroll-pane .scroll-bar:vertical {
     -fx-opacity: 0;
 }
-- 
cgit v1.2.3-70-g09d2


From 42aa5bca8984c4a6438fef69bdcea80955f993e1 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Thu, 14 Jun 2018 12:00:09 +0200
Subject: Hotfix: Nothing was clickable before closing a subwindow.

---
 .../einsatzverwaltung/controller/CreateOperationController.java  | 1 +
 src/main/resources/fxml/CreateOperationController.fxml           | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index 3977629..edc56e7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -109,6 +109,7 @@ public class CreateOperationController {
                     }
                 });
 
+        setVisible(true);
         createCarController.setVisible(false);
         registrationWindowController.setVisible(false);
     }
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 8f1e3c3..05b06bc 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -84,14 +84,15 @@
   <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"/>
-  <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml"
-    AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
-  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
-    source="/fxml/manageEmployees.fxml"/>
+
   <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:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml"
+    AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
+  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
+    source="/fxml/manageEmployees.fxml"/>
   <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0"
     source="/fxml/createCar.fxml" fx:id="createCar"/>
   <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml"
-- 
cgit v1.2.3-70-g09d2


From ccf8e2391ab6579a70bc4eae209ff2a0c670965d Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Tue, 5 Jun 2018 12:27:30 +0200
Subject: delete cancel Button #27301

---
 src/main/resources/fxml/createCar.fxml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index 5c7d284..ffe9308 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -6,14 +6,14 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
-<AnchorPane fx:id="createCarAP" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
+<AnchorPane fx:id="createCarAP" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
    <children>
-      <ChoiceBox fx:id="cmb_Ctyp" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
-      <ChoiceBox fx:id="cmb_typ" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
-      <Button fx:id="btn_cancel" layoutX="500.0" layoutY="14.0" mnemonicParsing="false" onAction="#cancelAction" text="abbrechen" />
-      <Button fx:id="btn_create" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" />
-      <CheckBox fx:id="cbx_NEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" />
-      <FlowPane fx:id="fp_vehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" />
-      <Button layoutX="398.0" layoutY="14.0" mnemonicParsing="false" onAction="#backToMain" prefHeight="26.0" prefWidth="80.0" text="Zurück" />
+      <ChoiceBox fx:id="cmbCtype" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
+      <ChoiceBox fx:id="cmbTyp" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
+      
+      <Button fx:id="btnCreate" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" />
+      <CheckBox fx:id="cbxNEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" />
+      <FlowPane fx:id="fpVehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" />
+      <Button layoutX="498.0" layoutY="14.0" mnemonicParsing="false" onAction="#backToMain" prefHeight="26.0" prefWidth="80.0" text="Zurück" />
    </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From fd672066c24ce310eec159b59cacbb1387694bd5 Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Wed, 13 Jun 2018 18:37:45 +0200
Subject: Change Vehicle gui to designe #27301

---
 src/main/resources/fxml/createCar.fxml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index ffe9308..a3f52f7 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -3,17 +3,28 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
-<AnchorPane fx:id="createCarAP" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
+<AnchorPane fx:id="createCarAP" prefHeight="522.0" prefWidth="847.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
    <children>
-      <ChoiceBox fx:id="cmbCtype" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
-      <ChoiceBox fx:id="cmbTyp" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
-      
-      <Button fx:id="btnCreate" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" />
-      <CheckBox fx:id="cbxNEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" />
-      <FlowPane fx:id="fpVehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" />
-      <Button layoutX="498.0" layoutY="14.0" mnemonicParsing="false" onAction="#backToMain" prefHeight="26.0" prefWidth="80.0" text="Zurück" />
+      <FlowPane fx:id="fpVehicleList" layoutX="29.0" layoutY="196.0" prefHeight="312.0" prefWidth="789.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="29.0" AnchorPane.rightAnchor="29.0" />
+      <AnchorPane prefHeight="87.0" prefWidth="847.0" styleClass="bg-light-orange">
+         <children>
+            <Label layoutX="45.0" layoutY="26.0" styleClass="text-big" text="Fahrzeuge" textFill="WHITE" />
+            <Hyperlink fx:id="lBack" layoutX="749.0" layoutY="15.0" onAction="#backToMain" styleClass="text-big" text="zurück" textFill="WHITE" />
+         </children>
+      </AnchorPane>
+      <AnchorPane layoutX="29.0" layoutY="63.0" prefHeight="100.0" prefWidth="789.0" styleClass="bg-white, shadowed">
+         <children>
+            <ChoiceBox fx:id="cmbCtype" layoutX="14.0" layoutY="26.0" prefWidth="150.0" styleClass="text-medium" />
+            <ChoiceBox fx:id="cmbTyp" layoutX="170.0" layoutY="26.0" prefWidth="150.0" styleClass="text-medium" />
+            
+            <Button fx:id="btnCreate" layoutX="697.0" layoutY="54.0" mnemonicParsing="false" onAction="#createCar" prefHeight="31.0" prefWidth="78.0" styleClass="button-main,text-meium" text="Erstellen" />
+            <CheckBox fx:id="cbxNEF" layoutX="14.0" layoutY="69.0" mnemonicParsing="false" styleClass="text-medium" text="NEF - Halterung" />
+         </children>
+      </AnchorPane>
    </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From c0e7ede13e32173a793e5456b10a3835f6aef409 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 14 Jun 2018 11:54:45 +0200
Subject: Small adjustments [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index d955953..b322db6 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -35,17 +35,17 @@
             </ScrollPane>
             <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
-                  <Label layoutX="81.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
+                  <Label layoutX="81.0" layoutY="31.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblCodeHeader" layoutX="203.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" textFill="WHITE">
+                  <Label fx:id="lblCodeHeader" layoutX="200.0" layoutY="31.0" prefHeight="34.0" prefWidth="116.0" textFill="WHITE">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Label>
-                  <Hyperlink layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
+                  <Hyperlink layoutX="843.0" layoutY="31.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="94.60000000000002">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>
@@ -85,12 +85,12 @@
       </AnchorPane>
       <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Hyperlink layoutX="871.0" layoutY="35.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
+            <Hyperlink layoutX="836.0" layoutY="35.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
                   <Font name="System Bold" size="20.0" />
                </font>
             </Hyperlink>
-            <Label layoutX="62.0" layoutY="40.0" prefHeight="30.0" prefWidth="100.0" text="Archiv" textFill="WHITE">
+            <Label layoutX="89.0" layoutY="40.0" prefHeight="30.0" prefWidth="100.0" text="Archiv" textFill="WHITE">
                <font>
                   <Font name="System Bold" size="20.0" />
                </font>
-- 
cgit v1.2.3-70-g09d2


From 603883a95d47d7debaaacc9669e88d73c8aad2e2 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 14 Jun 2018 12:20:15 +0200
Subject: Adjusted shadow of AnchorPane [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index b322db6..0676d1a 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -51,7 +51,7 @@
                      </font>
                   </Hyperlink>
                </children></AnchorPane>
-            <AnchorPane layoutX="82.0" layoutY="81.0" prefHeight="99.0" prefWidth="822.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);">
+            <AnchorPane layoutX="82.0" layoutY="81.0" prefHeight="99.0" prefWidth="822.0" style="-fx-background-color: white;" styleClass="shadowed">
                <children>
                   <Label fx:id="lblOpCode" layoutX="25.0" layoutY="22.0" prefHeight="26.0" prefWidth="116.0" text="Label">
                      <font>
-- 
cgit v1.2.3-70-g09d2


From 1c4959e4be30cddf9f4c565c718aa3e2feedfd0e Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 14 Jun 2018 15:32:08 +0200
Subject: Adjusted size of anchor pane [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 0676d1a..8286a94 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -14,9 +14,9 @@
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" 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.ArchiveOperationController">
   <children>
-      <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="435.0" prefWidth="900.0" style="-fx-background-color:  rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0">
+      <ScrollPane hbarPolicy="NEVER" layoutX="43.0" layoutY="202.0" prefHeight="435.0" prefWidth="906.0" style="-fx-background-color:  rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="43.0">
          <content>
-            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color:  rgba(239,235,232,1);" vgap="12">
+            <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="906.0" style="-fx-background-color:  rgba(239,235,232,1);" vgap="12">
                <padding>
                   <Insets left="40.0" top="20.0" />
                </padding></FlowPane>
@@ -97,9 +97,9 @@
             </Label>
          </children>
       </AnchorPane>
-      <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="821.0" styleClass="bg-white, shadowed" AnchorPane.leftAnchor="90.0">
+      <AnchorPane fx:id="apMainDetails" layoutX="82.0" layoutY="80.0" prefHeight="138.0" prefWidth="822.0" style="-fx-background-color: white;" styleClass="shadowed">
          <children>
-            <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0">
+            <GridPane layoutY="14.0" prefHeight="113.0" prefWidth="451.0">
               <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
               </columnConstraints>
-- 
cgit v1.2.3-70-g09d2


From c804334ae46cd5e3d49d4a4f71c04d03180691cb Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 12:32:45 +0200
Subject: Hotfix: RegistrationWindow was overflowing to the right when the
 employeeList became to short.

---
 src/main/resources/fxml/RegistrationWindow.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index 1524462..a1638f4 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -76,7 +76,7 @@
       </padding>
     </VBox>
   </ScrollPane>
-  <ScrollPane fx:id="listEmployee" hbarPolicy="NEVER" GridPane.rowIndex="5" GridPane.columnIndex="2">
+  <ScrollPane fx:id="listEmployee" hbarPolicy="NEVER" vbarPolicy="ALWAYS" GridPane.rowIndex="5" GridPane.columnIndex="2">
     <GridPane.margin>
       <Insets left="-7" right="-20" bottom="-12"/>
     </GridPane.margin>
-- 
cgit v1.2.3-70-g09d2


From f2ab50c7fdec81d9b963c7bea18473627752113d Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Fri, 15 Jun 2018 10:16:48 +0200
Subject: Small adjustments [#27299]

---
 src/main/resources/fxml/ArchiveOperation.fxml | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 8286a94..0150d81 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 
 <AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" 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.ArchiveOperationController">
-  <children>
+   <children>
       <ScrollPane hbarPolicy="NEVER" layoutX="43.0" layoutY="202.0" prefHeight="435.0" prefWidth="906.0" style="-fx-background-color:  rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="43.0">
          <content>
             <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="906.0" style="-fx-background-color:  rgba(239,235,232,1);" vgap="12">
@@ -35,21 +35,21 @@
             </ScrollPane>
             <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
-                  <Label layoutX="81.0" layoutY="31.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE">
+                  <Hyperlink layoutX="827.0" layoutY="33.0" onAction="#backClicked" text="Zurück" textFill="WHITE">
                      <font>
-                        <Font name="System Bold" size="16.0" />
+                        <Font name="System Bold" size="20.0" />
                      </font>
-                  </Label>
-                  <Label fx:id="lblCodeHeader" layoutX="200.0" layoutY="31.0" prefHeight="34.0" prefWidth="116.0" textFill="WHITE">
+                  </Hyperlink>
+                  <Label layoutX="80.0" layoutY="36.0" prefHeight="34.0" prefWidth="150.0" text="Archiv-Eintrag:" textFill="WHITE">
                      <font>
-                        <Font name="System Bold" size="16.0" />
+                        <Font name="System Bold" size="20.0" />
                      </font>
                   </Label>
-                  <Hyperlink layoutX="843.0" layoutY="31.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="94.60000000000002">
+                  <Label fx:id="lblCodeHeader" layoutX="230.0" layoutY="36.0" prefHeight="34.0" prefWidth="116.0" textFill="WHITE">
                      <font>
-                        <Font name="System Bold" size="16.0" />
+                        <Font name="System Bold" size="20.0" />
                      </font>
-                  </Hyperlink>
+                  </Label>
                </children></AnchorPane>
             <AnchorPane layoutX="82.0" layoutY="81.0" prefHeight="99.0" prefWidth="822.0" style="-fx-background-color: white;" styleClass="shadowed">
                <children>
@@ -85,12 +85,12 @@
       </AnchorPane>
       <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Hyperlink layoutX="836.0" layoutY="35.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
+            <Hyperlink layoutX="827.0" layoutY="33.0" onAction="#backToMain" text="Zurück" textFill="WHITE">
                <font>
                   <Font name="System Bold" size="20.0" />
                </font>
             </Hyperlink>
-            <Label layoutX="89.0" layoutY="40.0" prefHeight="30.0" prefWidth="100.0" text="Archiv" textFill="WHITE">
+            <Label layoutX="80.0" layoutY="36.0" prefHeight="34.0" prefWidth="150.0" text="Archiv" textFill="WHITE">
                <font>
                   <Font name="System Bold" size="20.0" />
                </font>
@@ -100,14 +100,14 @@
       <AnchorPane fx:id="apMainDetails" layoutX="82.0" layoutY="80.0" prefHeight="138.0" prefWidth="822.0" style="-fx-background-color: white;" styleClass="shadowed">
          <children>
             <GridPane layoutY="14.0" prefHeight="113.0" prefWidth="451.0">
-              <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-              </columnConstraints>
-              <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-              </rowConstraints>
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
                <children>
                   <Label fx:id="lblOperations" text="Einsätze:">
                      <font>
@@ -131,5 +131,5 @@
             </GridPane>
          </children>
       </AnchorPane>
-  </children>
+   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 8851b888bcdb5d8006bac6d64094484a39be74f9 Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Thu, 14 Jun 2018 22:09:54 +0200
Subject: add scrollPane to FlowPane #27301

---
 .../einsatzverwaltung/controller/CreateCarController.java          | 2 ++
 src/main/resources/fxml/createCar.fxml                             | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
index 5c55a95..9272050 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
@@ -57,6 +57,8 @@ public class CreateCarController {
     @FXML
     private void initialize() {
         fpVehicleList.setHgap(5);
+        fpVehicleList.setVgap(5);
+
         cmbCtype.setItems(
                 FXCollections.observableArrayList(
                         Stream.of(
diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index a3f52f7..5c1bafc 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -5,12 +5,17 @@
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
 <AnchorPane fx:id="createCarAP" prefHeight="522.0" prefWidth="847.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
    <children>
-      <FlowPane fx:id="fpVehicleList" layoutX="29.0" layoutY="196.0" prefHeight="312.0" prefWidth="789.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="29.0" AnchorPane.rightAnchor="29.0" />
+      <ScrollPane layoutX="29.0" layoutY="194.0" prefHeight="314.0" prefWidth="803.0">
+         <content>
+            <FlowPane fx:id="fpVehicleList" prefHeight="312.0" prefWidth="787.0" />
+         </content>
+      </ScrollPane>
       <AnchorPane prefHeight="87.0" prefWidth="847.0" styleClass="bg-light-orange">
          <children>
             <Label layoutX="45.0" layoutY="26.0" styleClass="text-big" text="Fahrzeuge" textFill="WHITE" />
-- 
cgit v1.2.3-70-g09d2


From e78309c1fa40daaace4eeb79841a0d5d41516a63 Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 17:40:17 +0200
Subject: set gui in the middle #27301

---
 src/main/resources/fxml/CreateOperationController.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 05b06bc..0bc6bff 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -93,7 +93,7 @@
     AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
   <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
     source="/fxml/manageEmployees.fxml"/>
-  <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0"
+  <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"/>
-- 
cgit v1.2.3-70-g09d2


From 1ec6ae678c834592b5d731171a936161147c0707 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 11:34:14 +0200
Subject: Adjust employee list item to be more compact, adjust sizes [#28618]

---
 src/main/resources/fxml/employeeList.fxml          |  5 +-
 src/main/resources/fxml/employeeListItem.fxml      | 55 ++++++++++++----------
 .../resources/fxml/filterEmployeesControl.fxml     |  2 +-
 src/main/resources/fxml/manageEmployees.fxml       | 42 ++++++++++-------
 4 files changed, 60 insertions(+), 44 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
index 52c502a..4131125 100644
--- a/src/main/resources/fxml/employeeList.fxml
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -5,5 +5,8 @@
   xmlns:fx="http://javafx.com/fxml"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListController"
   fx:id="flowPaneEmployeeList"
-  prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;">
+  stylesheets="@/styles/main.css"
+  prefWidth="${flowPaneEmployeeList.parent.width}"
+  prefHeight="${flowPaneEmployeeList.parent.height}"
+  style="-fx-background-color: #EFEBE8;">
 </FlowPane>
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index eb5c95c..3c020eb 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -4,50 +4,53 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.text.Font?>
+
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-  prefHeight="96.0" prefWidth="360.0" styleClass="bg-white, shadowed"
+  onMouseClicked="#onEmployeeClicked" prefHeight="80.0" prefWidth="320.0"
+  styleClass="bg-white, shadowed" stylesheets="@/styles/main.css"
   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.EmployeeListItemController"
-  onMouseClicked="#onEmployeeClicked">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListItemController">
   <children>
-    <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" text="Peter Mustermann"
-      AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
-      <font>
-        <Font name="System Bold" size="18.0"/>
-      </font>
+    <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" styleClass="text-big, text-bold"
+      text="Peter Mustermann" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
     </Label>
-    <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0"
+    <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="300.0"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0">
       <children>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
-            <ImageView fx:id="imgQualification" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblQualification" layoutX="45.0" layoutY="14.0" text="Notarzt"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+            <ImageView fx:id="imgQualification" fitHeight="25.0" fitWidth="25.0" layoutX="2.0"
+              pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblQualification" layoutX="45.0" layoutY="14.0" styleClass="text-small"
+              text="Notarzt" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgPilot" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblPilot" layoutX="53.0" layoutY="14.0" text="nicht Pilot"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblPilot" layoutX="53.0" layoutY="14.0" styleClass="text-small"
+              text="nicht Pilot" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgDriver" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblDriver" layoutX="54.0" layoutY="14.0" text="ist Fahrer"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblDriver" layoutX="54.0" layoutY="14.0" styleClass="text-small"
+              text="ist Fahrer" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
       </children>
diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 68a6f3e..01ec7b6 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white;"
+<AnchorPane prefHeight="86.0" prefWidth="640.0" style="-fx-background-color: white;"
   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.FilterEmployeesController">
   <children>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index c007c88..8607396 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -5,36 +5,46 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" 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.ManageEmployeesController">
+<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+  minWidth="-Infinity" prefHeight="536.0" prefWidth="720.0" style="-fx-background-color: #EFEBE8;"
+  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.ManageEmployeesController">
   <children>
-    <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;">
+    <AnchorPane prefHeight="118.0" prefWidth="720.0" style="-fx-background-color: #C55A11;"
+      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
       <children>
         <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
           <font>
-            <Font name="Calibri Bold" size="22.0" />
+            <Font name="Calibri Bold" size="22.0"/>
           </font>
         </Label>
-            <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE">
-               <font>
-                  <Font name="System Bold" size="16.0" />
-               </font>
-            </Hyperlink>
+        <Hyperlink layoutX="702.0" layoutY="15.0" onAction="#backToMain" prefHeight="42.0"
+          prefWidth="86.0" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="0.0">
+          <font>
+            <Font name="System Bold" size="16.0"/>
+          </font>
+        </Hyperlink>
       </children>
+      <padding>
+        <Insets right="10.0"/>
+      </padding>
     </AnchorPane>
-    <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0">
+    <AnchorPane layoutX="37.0" layoutY="60.0" maxHeight="-Infinity" maxWidth="-Infinity"
+      minHeight="-Infinity" minWidth="-Infinity" prefHeight="460.0" prefWidth="662.0">
       <children>
-        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
-        <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER">
-          <VBox.margin>
-            <Insets top="20.0" />
-          </VBox.margin>
+        <ScrollPane hbarPolicy="NEVER" layoutY="92.0" maxHeight="-Infinity" maxWidth="-Infinity"
+          minHeight="-Infinity" minWidth="-Infinity" prefHeight="366.0" prefWidth="662.0"
+          vbarPolicy="NEVER" AnchorPane.topAnchor="86.0">
           <content>
             <fx:include fx:id="employeeList" source="employeeList.fxml"/>
           </content>
         </ScrollPane>
+        <AnchorPane fx:id="containerHeader" maxHeight="-Infinity" maxWidth="-Infinity"
+          minHeight="-Infinity" minWidth="-Infinity" prefHeight="86.0" prefWidth="652.0"
+          style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);"
+          AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
       </children>
-    </VBox>
+    </AnchorPane>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 2b2363f8f89058a1532f885a6cdd45c00434990b Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 12:47:10 +0200
Subject: Set width to parent-width, format code [#28618]

---
 src/main/resources/fxml/createNewEmployee.fxml | 35 +++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/createNewEmployee.fxml b/src/main/resources/fxml/createNewEmployee.fxml
index 4848c09..3043952 100644
--- a/src/main/resources/fxml/createNewEmployee.fxml
+++ b/src/main/resources/fxml/createNewEmployee.fxml
@@ -8,16 +8,27 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="96.0" prefWidth="740.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.CreateNewEmployeeController">
-   <children>
-      <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" text="Neue Person erstellen" />
-      <Label layoutX="14.0" layoutY="38.0" text="Name" />
-      <Label layoutX="206.0" layoutY="38.0" text="Qualifikation" />
-      <CheckBox fx:id="inputIsDriver" layoutX="343.0" layoutY="37.0" mnemonicParsing="false" text="Fahrer" />
-      <CheckBox fx:id="inputIsPilot" layoutX="343.0" layoutY="62.0" mnemonicParsing="false" text="Pilot" />
-      <Hyperlink fx:id="btnCancel" layoutX="441.0" layoutY="31.0" onAction="#onCancelClicked" text="abbrechen" />
-      <Button fx:id="btnCreate" layoutX="441.0" layoutY="55.0" mnemonicParsing="false" onAction="#onCreateClicked" text="Erstellen" />
-      <TextField fx:id="inputName" layoutX="14.0" layoutY="57.0" prefHeight="25.0" prefWidth="179.0" />
-      <ChoiceBox fx:id="inputQualification" layoutX="199.0" layoutY="57.0" prefHeight="25.0" prefWidth="128.0" />
-   </children>
+<AnchorPane xmlns="http://javafx.com/javafx/9.0.1"
+  xmlns:fx="http://javafx.com/fxml/1"
+  styleClass="bg-white"
+  fx:id="apCreateNewEmployee"
+  prefWidth="${apCreateNewEmployee.parent.width}"
+  prefHeight="120"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateNewEmployeeController">
+  <children>
+    <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" text="Neue Person erstellen"/>
+    <Label layoutX="14.0" layoutY="38.0" text="Name"/>
+    <Label layoutX="206.0" layoutY="38.0" text="Qualifikation"/>
+    <CheckBox fx:id="inputIsDriver" layoutX="343.0" layoutY="37.0" mnemonicParsing="false"
+      text="Fahrer"/>
+    <CheckBox fx:id="inputIsPilot" layoutX="343.0" layoutY="62.0" mnemonicParsing="false"
+      text="Pilot"/>
+    <Hyperlink fx:id="btnCancel" layoutX="441.0" layoutY="31.0" onAction="#onCancelClicked"
+      text="abbrechen"/>
+    <Button fx:id="btnCreate" layoutX="441.0" layoutY="55.0" mnemonicParsing="false"
+      onAction="#onCreateClicked" text="Erstellen"/>
+    <TextField fx:id="inputName" layoutX="14.0" layoutY="57.0" prefHeight="25.0" prefWidth="179.0"/>
+    <ChoiceBox fx:id="inputQualification" layoutX="199.0" layoutY="57.0" prefHeight="25.0"
+      prefWidth="128.0"/>
+  </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 5e35ae3262a733df1f5a9b05fb2356db6aaa94fd Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 12:47:37 +0200
Subject: Set width to parent-width in filterEmployeesControl [#28618]

---
 src/main/resources/fxml/filterEmployeesControl.fxml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 01ec7b6..8f24a74 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -5,8 +5,11 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="86.0" prefWidth="640.0" style="-fx-background-color: white;"
+<AnchorPane style="-fx-background-color: white;"
   xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
+  fx:id="apFilterEmployees"
+  prefWidth="${apFilterEmployees.parent.width}"
+  prefHeight="80"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.FilterEmployeesController">
   <children>
     <Label layoutX="14.0" layoutY="14.0" text="Filtern nach Name"/>
-- 
cgit v1.2.3-70-g09d2


From 11be31fa250a8c77510afe45dcac75d03d8fd904 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 12:48:46 +0200
Subject: Refactor absolute to relative positioning, remove inline styles
 [#28618]

---
 src/main/resources/fxml/manageEmployees.fxml | 44 ++++++++++++----------------
 1 file changed, 18 insertions(+), 26 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index 8607396..4a7312f 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -1,49 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
 <AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
-  minWidth="-Infinity" prefHeight="536.0" prefWidth="720.0" style="-fx-background-color: #EFEBE8;"
+  minWidth="-Infinity" prefHeight="536.0" prefWidth="702.0" style="-fx-background-color: #EFEBE8;"
   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.ManageEmployeesController">
   <children>
-    <AnchorPane prefHeight="118.0" prefWidth="720.0" style="-fx-background-color: #C55A11;"
-      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+    <AnchorPane prefHeight="120.0"
+      styleClass="bg-dark-orange"
+      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
       <children>
-        <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
-          <font>
-            <Font name="Calibri Bold" size="22.0"/>
-          </font>
+        <Label text="Personen" textFill="WHITE"
+          AnchorPane.leftAnchor="25.0" AnchorPane.topAnchor="20.0"
+          styleClass="text-bold, text-big">
         </Label>
-        <Hyperlink layoutX="702.0" layoutY="15.0" onAction="#backToMain" prefHeight="42.0"
-          prefWidth="86.0" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="0.0">
-          <font>
-            <Font name="System Bold" size="16.0"/>
-          </font>
+        <Hyperlink onAction="#backToMain" text="Zurück"
+          textFill="WHITE" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
+          styleClass="text-big, text-bold">
         </Hyperlink>
       </children>
-      <padding>
-        <Insets right="10.0"/>
-      </padding>
     </AnchorPane>
-    <AnchorPane layoutX="37.0" layoutY="60.0" maxHeight="-Infinity" maxWidth="-Infinity"
-      minHeight="-Infinity" minWidth="-Infinity" prefHeight="460.0" prefWidth="662.0">
+    <AnchorPane AnchorPane.bottomAnchor="0.0"
+      AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="60.0">
       <children>
-        <ScrollPane hbarPolicy="NEVER" layoutY="92.0" maxHeight="-Infinity" maxWidth="-Infinity"
-          minHeight="-Infinity" minWidth="-Infinity" prefHeight="366.0" prefWidth="662.0"
-          vbarPolicy="NEVER" AnchorPane.topAnchor="86.0">
+        <ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="NEVER"
+          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+          AnchorPane.topAnchor="86.0">
           <content>
             <fx:include fx:id="employeeList" source="employeeList.fxml"/>
           </content>
         </ScrollPane>
-        <AnchorPane fx:id="containerHeader" maxHeight="-Infinity" maxWidth="-Infinity"
-          minHeight="-Infinity" minWidth="-Infinity" prefHeight="86.0" prefWidth="652.0"
-          style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);"
-          AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
+        <AnchorPane fx:id="containerHeader"
+          minHeight="80.0" styleClass="shadowed" AnchorPane.leftAnchor="5.0"
+          AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
       </children>
     </AnchorPane>
   </children>
-- 
cgit v1.2.3-70-g09d2


From 39868a2866b8974a408e6adbdbd7231da4305f90 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 15:46:37 +0200
Subject: Change scrollbar-top-padding, use styles from main.css, format
 [#28618]

---
 .../controller/EmployeeListController.java         |  2 +-
 src/main/resources/fxml/employeeList.fxml          | 11 +++-
 src/main/resources/fxml/manageEmployees.fxml       | 68 +++++++++++++++-------
 3 files changed, 57 insertions(+), 24 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
index 843145c..f7496c7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
@@ -31,7 +31,7 @@ public class EmployeeListController {
     private final SpringFXMLLoader fxmlLoader;
     private Node rootElement;
     private List<EmployeeListItemController> employeeListItemControllers;
-    private Insets listItemMargins = new Insets(0, 5, 10, 5);
+    private Insets listItemMargins = new Insets(10, 5, 0, 5);
 
     public EmployeeListController(SpringFXMLLoader fxmlLoader) {
         this.fxmlLoader = fxmlLoader;
diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
index 4131125..5bcce1c 100644
--- a/src/main/resources/fxml/employeeList.fxml
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.FlowPane?>
-<FlowPane xmlns="http://javafx.com/javafx"
-  xmlns:fx="http://javafx.com/fxml"
+<FlowPane
+  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.EmployeeListController"
   fx:id="flowPaneEmployeeList"
   stylesheets="@/styles/main.css"
   prefWidth="${flowPaneEmployeeList.parent.width}"
   prefHeight="${flowPaneEmployeeList.parent.height}"
-  style="-fx-background-color: #EFEBE8;">
+  styleClass="bg-gray-orange">
+  <padding>
+    <Insets bottom="10.0"/>
+  </padding>
 </FlowPane>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index 4a7312f..05e729d 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -4,38 +4,66 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
-  minWidth="-Infinity" prefHeight="536.0" prefWidth="702.0" style="-fx-background-color: #EFEBE8;"
-  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.ManageEmployeesController">
+<AnchorPane
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController"
+  fx:id="listEmployeesAP"
+  prefHeight="536.0"
+  prefWidth="702.0"
+  stylesheets="@/styles/main.css"
+  visible="false"
+  styleClass="bg-gray-orange"
+  xmlns="http://javafx.com/javafx/9.0.1"
+  xmlns:fx="http://javafx.com/fxml/1">
   <children>
     <AnchorPane prefHeight="120.0"
       styleClass="bg-dark-orange"
-      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      AnchorPane.leftAnchor="0.0"
+      AnchorPane.rightAnchor="0.0"
+      AnchorPane.topAnchor="0.0">
       <children>
-        <Label text="Personen" textFill="WHITE"
-          AnchorPane.leftAnchor="25.0" AnchorPane.topAnchor="20.0"
-          styleClass="text-bold, text-big">
+        <Label
+          text="Personen"
+          AnchorPane.leftAnchor="25.0"
+          AnchorPane.topAnchor="20.0"
+          styleClass="text-bold, text-big, text-white">
         </Label>
-        <Hyperlink onAction="#backToMain" text="Zurück"
-          textFill="WHITE" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
-          styleClass="text-big, text-bold">
+        <Hyperlink
+          onAction="#backToMain"
+          text="Zurück"
+          AnchorPane.rightAnchor="25.0"
+          AnchorPane.topAnchor="30.0"
+          styleClass="text-medium, text-white">
         </Hyperlink>
       </children>
     </AnchorPane>
-    <AnchorPane AnchorPane.bottomAnchor="0.0"
-      AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="60.0">
+    <AnchorPane
+      AnchorPane.bottomAnchor="0.0"
+      AnchorPane.leftAnchor="20.0"
+      AnchorPane.rightAnchor="20.0"
+      AnchorPane.topAnchor="60.0">
       <children>
-        <ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="NEVER"
-          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-          AnchorPane.topAnchor="86.0">
+        <ScrollPane
+          fitToHeight="true"
+          fitToWidth="true"
+          hbarPolicy="NEVER"
+          vbarPolicy="NEVER"
+          AnchorPane.bottomAnchor="0.0"
+          AnchorPane.leftAnchor="0.0"
+          AnchorPane.rightAnchor="0.0"
+          AnchorPane.topAnchor="80.0">
           <content>
-            <fx:include fx:id="employeeList" source="employeeList.fxml"/>
+            <fx:include
+              fx:id="employeeList"
+              source="employeeList.fxml"/>
           </content>
         </ScrollPane>
-        <AnchorPane fx:id="containerHeader"
-          minHeight="80.0" styleClass="shadowed" AnchorPane.leftAnchor="5.0"
-          AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
+        <AnchorPane
+          fx:id="containerHeader"
+          minHeight="80.0"
+          styleClass="shadowed"
+          AnchorPane.leftAnchor="5.0"
+          AnchorPane.rightAnchor="5.0"
+          AnchorPane.topAnchor="0.0"/>
       </children>
     </AnchorPane>
   </children>
-- 
cgit v1.2.3-70-g09d2


From fe584f9f36370363f7fb2b793580b6dd438e0038 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 20:28:55 +0200
Subject: Move employee list down if header height increases [#28618]

---
 src/main/resources/fxml/createNewEmployee.fxml | 10 ++--
 src/main/resources/fxml/manageEmployees.fxml   | 72 ++++++++------------------
 2 files changed, 24 insertions(+), 58 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/createNewEmployee.fxml b/src/main/resources/fxml/createNewEmployee.fxml
index 3043952..47e8b63 100644
--- a/src/main/resources/fxml/createNewEmployee.fxml
+++ b/src/main/resources/fxml/createNewEmployee.fxml
@@ -7,13 +7,9 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
-
-<AnchorPane xmlns="http://javafx.com/javafx/9.0.1"
-  xmlns:fx="http://javafx.com/fxml/1"
-  styleClass="bg-white"
-  fx:id="apCreateNewEmployee"
-  prefWidth="${apCreateNewEmployee.parent.width}"
-  prefHeight="120"
+<AnchorPane fx:id="apCreateNewEmployee" prefHeight="120"
+  prefWidth="${apCreateNewEmployee.parent.width}" styleClass="bg-white"
+  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.CreateNewEmployeeController">
   <children>
     <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" text="Neue Person erstellen"/>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index 05e729d..68851e2 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -4,67 +4,37 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<AnchorPane
-  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController"
-  fx:id="listEmployeesAP"
-  prefHeight="536.0"
-  prefWidth="702.0"
-  stylesheets="@/styles/main.css"
-  visible="false"
-  styleClass="bg-gray-orange"
-  xmlns="http://javafx.com/javafx/9.0.1"
-  xmlns:fx="http://javafx.com/fxml/1">
+<?import javafx.scene.layout.VBox?>
+
+<AnchorPane fx:id="listEmployeesAP" prefHeight="536.0" prefWidth="702.0" styleClass="bg-gray-orange"
+  stylesheets="@/styles/main.css" 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.ManageEmployeesController">
   <children>
-    <AnchorPane prefHeight="120.0"
-      styleClass="bg-dark-orange"
-      AnchorPane.leftAnchor="0.0"
-      AnchorPane.rightAnchor="0.0"
-      AnchorPane.topAnchor="0.0">
+    <AnchorPane prefHeight="120.0" styleClass="bg-dark-orange" AnchorPane.leftAnchor="0.0"
+      AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
       <children>
-        <Label
-          text="Personen"
-          AnchorPane.leftAnchor="25.0"
-          AnchorPane.topAnchor="20.0"
-          styleClass="text-bold, text-big, text-white">
+        <Label styleClass="text-bold, text-big, text-white" text="Personen"
+          AnchorPane.leftAnchor="25.0" AnchorPane.topAnchor="20.0">
         </Label>
-        <Hyperlink
-          onAction="#backToMain"
-          text="Zurück"
-          AnchorPane.rightAnchor="25.0"
-          AnchorPane.topAnchor="30.0"
-          styleClass="text-medium, text-white">
+        <Hyperlink onAction="#backToMain" styleClass="text-medium, text-white" text="Zurück"
+          AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="30.0">
         </Hyperlink>
       </children>
     </AnchorPane>
-    <AnchorPane
-      AnchorPane.bottomAnchor="0.0"
-      AnchorPane.leftAnchor="20.0"
-      AnchorPane.rightAnchor="20.0"
-      AnchorPane.topAnchor="60.0">
+    <VBox fx:id="containerVbox" alignment="BOTTOM_LEFT" rotate="180" AnchorPane.bottomAnchor="0.0"
+      AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="60.0">
       <children>
-        <ScrollPane
-          fitToHeight="true"
-          fitToWidth="true"
-          hbarPolicy="NEVER"
-          vbarPolicy="NEVER"
-          AnchorPane.bottomAnchor="0.0"
-          AnchorPane.leftAnchor="0.0"
-          AnchorPane.rightAnchor="0.0"
-          AnchorPane.topAnchor="80.0">
+        <ScrollPane fx:id="employeeScrollPane" fitToHeight="true" fitToWidth="true"
+          hbarPolicy="NEVER" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="336.0"
+          prefWidth="662.0" rotate="180" vbarPolicy="NEVER">
           <content>
-            <fx:include
-              fx:id="employeeList"
-              source="employeeList.fxml"/>
+            <fx:include fx:id="employeeList" source="employeeList.fxml"/>
           </content>
         </ScrollPane>
-        <AnchorPane
-          fx:id="containerHeader"
-          minHeight="80.0"
-          styleClass="shadowed"
-          AnchorPane.leftAnchor="5.0"
-          AnchorPane.rightAnchor="5.0"
-          AnchorPane.topAnchor="0.0"/>
+        <AnchorPane fx:id="containerHeader" minHeight="80.0" rotate="180" styleClass="shadowed"
+          AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
       </children>
-    </AnchorPane>
+    </VBox>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 06f8d1e973da89270e653dc4c0441891965d2d5b Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 21:51:56 +0200
Subject: Adjust design of employee edit/create fxml [#28618]

---
 src/main/resources/fxml/createNewEmployee.fxml | 34 +++++++++++++++-----------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/createNewEmployee.fxml b/src/main/resources/fxml/createNewEmployee.fxml
index 47e8b63..e2f841f 100644
--- a/src/main/resources/fxml/createNewEmployee.fxml
+++ b/src/main/resources/fxml/createNewEmployee.fxml
@@ -7,24 +7,30 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
-<AnchorPane fx:id="apCreateNewEmployee" prefHeight="120"
-  prefWidth="${apCreateNewEmployee.parent.width}" styleClass="bg-white"
-  xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
+
+<AnchorPane fx:id="apCreateNewEmployee" prefHeight="100"
+  prefWidth="${apCreateNewEmployee.parent.width}" styleClass="bg-edit-area-orange"
+  stylesheets="@/styles/main.css" 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.CreateNewEmployeeController">
   <children>
-    <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" text="Neue Person erstellen"/>
-    <Label layoutX="14.0" layoutY="38.0" text="Name"/>
-    <Label layoutX="206.0" layoutY="38.0" text="Qualifikation"/>
-    <CheckBox fx:id="inputIsDriver" layoutX="343.0" layoutY="37.0" mnemonicParsing="false"
-      text="Fahrer"/>
-    <CheckBox fx:id="inputIsPilot" layoutX="343.0" layoutY="62.0" mnemonicParsing="false"
-      text="Pilot"/>
+    <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" styleClass="text-bold, text-medium"
+      text="Neue Person erstellen"/>
+    <Label layoutX="14.0" layoutY="38.0" styleClass="text-small" text="Name"/>
+    <Label layoutX="206.0" layoutY="38.0" styleClass="text-small" text="Qualifikation"/>
+    <CheckBox fx:id="inputIsDriver" layoutX="355.0" layoutY="37.0" mnemonicParsing="false"
+      styleClass="text-small" text="Fahrer"/>
+    <CheckBox fx:id="inputIsPilot" layoutX="355.0" layoutY="62.0" mnemonicParsing="false"
+      styleClass="text-small" text="Pilot"/>
     <Hyperlink fx:id="btnCancel" layoutX="441.0" layoutY="31.0" onAction="#onCancelClicked"
-      text="abbrechen"/>
+      styleClass="text-medium" text="abbrechen" textFill="black" AnchorPane.bottomAnchor="30.0"
+      AnchorPane.rightAnchor="10.0"/>
     <Button fx:id="btnCreate" layoutX="441.0" layoutY="55.0" mnemonicParsing="false"
-      onAction="#onCreateClicked" text="Erstellen"/>
-    <TextField fx:id="inputName" layoutX="14.0" layoutY="57.0" prefHeight="25.0" prefWidth="179.0"/>
-    <ChoiceBox fx:id="inputQualification" layoutX="199.0" layoutY="57.0" prefHeight="25.0"
+      onAction="#onCreateClicked" styleClass="button-main, bg-green, text-bold, text-big"
+      text="ERSTELLEN" AnchorPane.bottomAnchor="-10.0" AnchorPane.rightAnchor="10.0"/>
+    <TextField fx:id="inputName" layoutX="14.0" layoutY="57.0" prefHeight="25.0" prefWidth="179.0"
+      style="-fx-background-color: transparent" styleClass="text-bold, text-medium"/>
+    <ChoiceBox fx:id="inputQualification" layoutX="206.0" layoutY="57.0" prefHeight="25.0"
       prefWidth="128.0"/>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From 35af8bad8fd82f69c8050a4a6ea3817e7d997a76 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 10:43:43 +0200
Subject: Style add-employee button [#28618]

---
 .../resources/fxml/filterEmployeesControl.fxml     | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 8f24a74..67d9c78 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -1,22 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Rectangle2D?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
-
-<AnchorPane style="-fx-background-color: white;"
-  xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
-  fx:id="apFilterEmployees"
-  prefWidth="${apFilterEmployees.parent.width}"
-  prefHeight="80"
+<AnchorPane fx:id="apFilterEmployees" prefHeight="80" prefWidth="${apFilterEmployees.parent.width}"
+  style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/9.0.1"
+  stylesheets="/styles/main.css"
+  xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.FilterEmployeesController">
   <children>
     <Label layoutX="14.0" layoutY="14.0" text="Filtern nach Name"/>
     <TextField fx:id="inputFilterString" layoutX="22.0" layoutY="41.0"
       onKeyReleased="#onFilterTextChanged" promptText="Name eingeben"/>
     <Button layoutX="698.0" layoutY="48.0" mnemonicParsing="false" onAction="#onAddEmployeeClicked"
-      onInputMethodTextChanged="#onFilterTextChanged" text="Person hinzufügen"
-      AnchorPane.rightAnchor="10.0"/>
+      onInputMethodTextChanged="#onFilterTextChanged"
+      style="-fx-background-color: green; -fx-border-width: 1px; -fx-border-radius: 25px; -fx-background-radius: 25px; -fx-border-color: black; -fx-min-width: 50px; -fx-min-height: 50px; -fx-max-width: 50px; -fx-max-height: 50px;"
+      AnchorPane.bottomAnchor="-10.0" AnchorPane.rightAnchor="10.0">
+      <graphic>
+        <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
+          <image>
+            <Image url="/images/PlusButton.png"/>
+          </image>
+          <viewport>
+            <Rectangle2D/>
+          </viewport>
+        </ImageView>
+      </graphic>
+    </Button>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2


From e6da98587039e1fd1e4513ee14522834d77aafc5 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 10:54:58 +0200
Subject: Style label and textbox on filterEmployees fxml [#28618]

---
 src/main/resources/fxml/filterEmployeesControl.fxml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 67d9c78..55c80d8 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Rectangle2D?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
@@ -8,15 +7,17 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <AnchorPane fx:id="apFilterEmployees" prefHeight="80" prefWidth="${apFilterEmployees.parent.width}"
-  style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/9.0.1"
-  stylesheets="/styles/main.css"
-  xmlns:fx="http://javafx.com/fxml/1"
+  style="-fx-background-color: white;" stylesheets="/styles/main.css"
+  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.FilterEmployeesController">
   <children>
-    <Label layoutX="14.0" layoutY="14.0" text="Filtern nach Name"/>
-    <TextField fx:id="inputFilterString" layoutX="22.0" layoutY="41.0"
-      onKeyReleased="#onFilterTextChanged" promptText="Name eingeben"/>
-    <Button layoutX="698.0" layoutY="48.0" mnemonicParsing="false" onAction="#onAddEmployeeClicked"
+    <Label text="Filtern nach Name" AnchorPane.leftAnchor="20.0"
+      AnchorPane.topAnchor="15.0" styleClass="text-medium, text-bold"/>
+    <TextField fx:id="inputFilterString"
+      onKeyReleased="#onFilterTextChanged" promptText="Name eingeben"
+      styleClass="text-medium"
+      AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="45.0"/>
+    <Button mnemonicParsing="false" onAction="#onAddEmployeeClicked"
       onInputMethodTextChanged="#onFilterTextChanged"
       style="-fx-background-color: green; -fx-border-width: 1px; -fx-border-radius: 25px; -fx-background-radius: 25px; -fx-border-color: black; -fx-min-width: 50px; -fx-min-height: 50px; -fx-max-width: 50px; -fx-max-height: 50px;"
       AnchorPane.bottomAnchor="-10.0" AnchorPane.rightAnchor="10.0">
@@ -25,9 +26,6 @@
           <image>
             <Image url="/images/PlusButton.png"/>
           </image>
-          <viewport>
-            <Rectangle2D/>
-          </viewport>
         </ImageView>
       </graphic>
     </Button>
-- 
cgit v1.2.3-70-g09d2


From ef9ba06432f6c4ab77f09462f672ce84d9f8cfe7 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 12:23:19 +0200
Subject: Center employee and vehicle window [#28618]

---
 src/main/resources/fxml/CreateOperationController.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 0bc6bff..35180e3 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -91,7 +91,7 @@
   </GridPane>
   <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml"
     AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/>
-  <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees"
+  <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"/>
-- 
cgit v1.2.3-70-g09d2


From 093583dafc6852215f794593fa35ab2f4567f37b Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 14 Jun 2018 13:31:21 +0200
Subject: Added flowpane for Vehicles to OperationDetails Window [#27300]

---
 .../controller/OperationDetailsController.java     | 41 +++++++++++++---------
 src/main/resources/fxml/OperationDetails.fxml      | 27 +++++++-------
 2 files changed, 39 insertions(+), 29 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
index 7694b95..ffb4166 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
@@ -7,6 +7,8 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Operati
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.stream.Collectors;
@@ -19,6 +21,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -31,13 +34,14 @@ public class OperationDetailsController {
     private final OperationService operationService;
     private final VehicleService vehicleService;
     private final CreateOperationController createOperationController;
-    @FXML private ListView<Vehicle> lvVehicles;
+    @FXML private FlowPane fpVehicles;
     @FXML private ListView<Operation> lvActiveOperations;
     @FXML private Label lblChosenVehicles;
     @FXML private Button btnCloseOperation;
     @FXML private Button btnCancelOperation;
     @FXML private Label lblCode, lblAdditionalInfo, lblAddress;
     @FXML private AnchorPane operationDetailsAP;
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
     public OperationDetailsController(
             OperationService operationService,
@@ -50,20 +54,6 @@ public class OperationDetailsController {
 
     @FXML
     private void initialize() {
-        lvVehicles.setCellFactory(
-                param ->
-                        new ListCell<>() {
-                            @Override
-                            protected void updateItem(Vehicle item, boolean empty) {
-                                super.updateItem(item, empty);
-
-                                if (empty || item == null || item.name() == null) {
-                                    setText(null);
-                                } else {
-                                    setText(item.name());
-                                }
-                            }
-                        });
         lvActiveOperations.setCellFactory(
                 param ->
                         new ListCell<>() {
@@ -89,6 +79,25 @@ public class OperationDetailsController {
                 });
     }
 
+    private void updateFlowPane() {
+        try {
+            fpVehicles.getChildren().clear();
+            for (Vehicle vehicle : operation.vehicles()) {
+                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
+                controller.setData(vehicle, true);
+                fpVehicles.getChildren().add(controller.getRootElement());
+            }
+        } catch (IOException e) {
+            LOG.error("Error while updating list.", e);
+
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText(e.getMessage());
+            alert.showAndWait();
+        }
+    }
+
     void initOperation(Operation operation) {
         fillActiveList();
         this.operation = operation;
@@ -99,7 +108,7 @@ public class OperationDetailsController {
         lblChosenVehicles.setText(result.toString());
         lblAdditionalInfo.setText(operation.additionalInfo());
         lblAddress.setText(operation.destination());
-        lvVehicles.setItems(FXCollections.observableArrayList(operation.vehicles()));
+        updateFlowPane();
         operationDetailsAP.setVisible(true);
     }
 
diff --git a/src/main/resources/fxml/OperationDetails.fxml b/src/main/resources/fxml/OperationDetails.fxml
index 3ac7d93..911b030 100644
--- a/src/main/resources/fxml/OperationDetails.fxml
+++ b/src/main/resources/fxml/OperationDetails.fxml
@@ -4,22 +4,24 @@
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
 <AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" 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.OperationDetailsController">
   <children>
-    <AnchorPane prefHeight="542.0" prefWidth="1100.0" style="-fx-background-color: white;" />
+    <AnchorPane prefHeight="542.0" prefWidth="1100.0" style="-fx-background-color: rgba(239,235,232,1);" />
     <AnchorPane layoutX="10.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1000.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
       <children>
         <AnchorPane layoutX="964.0" layoutY="-66.0" prefHeight="152.0" prefWidth="1100.0" style="-fx-background-color: green;" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
           <children>
-            <Hyperlink layoutX="1023.0" layoutY="16.0" onAction="#closeWindow" text="Zurück" textFill="WHITE">
+            <Hyperlink layoutX="1023.0" layoutY="16.0" onAction="#closeWindow" styleClass="text-medium" text="Zurück" textFill="WHITE">
               <font>
                 <Font size="15.0" />
               </font>
             </Hyperlink>
-            <Label layoutX="17.0" layoutY="13.0" prefHeight="34.0" prefWidth="174.0" text="Ausgewählter Einsatz:" textFill="WHITE">
+            <Label layoutX="17.0" layoutY="13.0" prefHeight="34.0" prefWidth="174.0" styleClass="text-big" text="Ausgewählter Einsatz:" textFill="WHITE">
               <font>
                 <Font size="17.0" />
               </font>
@@ -28,20 +30,14 @@
         </AnchorPane>
         <AnchorPane fx:id="apActiveOperations" layoutX="874.0" layoutY="50.0" prefHeight="298.0" prefWidth="200.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="9.0" layoutY="55.0" prefHeight="242.0" prefWidth="182.0" style="-fx-background-color: white;" />
-            <Label layoutX="9.0" layoutY="11.0" prefHeight="46.0" prefWidth="103.0" text="Aktive Einsätze">
+            <ListView fx:id="lvActiveOperations" layoutX="9.0" layoutY="46.0" prefHeight="251.0" prefWidth="182.0" style="-fx-background-color: white;" />
+            <Label layoutX="9.0" layoutY="4.0" prefHeight="46.0"  prefWidth="103.0" text="Aktive Einsätze">
               <font>
                 <Font name="System Bold" size="14.0" />
               </font>
             </Label>
-            <Label layoutX="150.0" layoutY="24.0" text="Archiv">
-              <font>
-                <Font size="13.0" />
-              </font>
-            </Label>
           </children>
         </AnchorPane>
-        <ListView fx:id="lvVehicles" layoutX="16.0" layoutY="185.0" prefHeight="355.0" prefWidth="846.0" style="-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
         <AnchorPane fx:id="apCreateOperation" layoutX="16.0" layoutY="49.0" prefHeight="134.0" prefWidth="845.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">
@@ -69,12 +65,12 @@
                 <Font size="17.0" />
               </font>
             </Label>
-            <Button fx:id="btnCloseOperation" layoutX="709.0" layoutY="89.0" mnemonicParsing="false" onAction="#closeOperationClicked" prefHeight="39.0" prefWidth="122.0" text="Abschließen">
+            <Button fx:id="btnCloseOperation" layoutX="709.0" layoutY="89.0" mnemonicParsing="false" onAction="#closeOperationClicked" prefHeight="39.0" prefWidth="122.0" styleClass="button-main" text="Abschließen">
               <font>
                 <Font name="System Bold" size="17.0" />
               </font>
             </Button>
-            <Button fx:id="btnCancelOperation" layoutX="575.0" layoutY="90.0" mnemonicParsing="false" onAction="#cancelOperationClicked" prefHeight="38.0" prefWidth="122.0" text="Stornieren">
+            <Button fx:id="btnCancelOperation" layoutX="575.0" layoutY="90.0" mnemonicParsing="false" onAction="#cancelOperationClicked" prefHeight="38.0" prefWidth="122.0" style="-fx-background-color: rgba(82, 83, 87, 0.51); -fx-text-fill: white;" text="Stornieren">
               <font>
                 <Font name="System Bold" size="17.0" />
               </font>
@@ -96,6 +92,11 @@
             </Label>
           </children>
         </AnchorPane>
+            <ScrollPane layoutX="16.0" layoutY="195.0" prefHeight="345.0" prefWidth="846.0">
+               <content>
+                  <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="336.0" prefWidth="840.0" vgap="12" />
+               </content>
+            </ScrollPane>
       </children>
     </AnchorPane>
   </children>
-- 
cgit v1.2.3-70-g09d2


From f351d452d16766864b85a01608c1e837c95b5707 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 16 Jun 2018 15:06:02 +0200
Subject: Adjusted size of buttons [#27300]

---
 .../einsatzverwaltung/controller/OperationDetailsController.java    | 2 --
 src/main/resources/fxml/OperationDetails.fxml                       | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
index ffb4166..c3d4947 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
@@ -8,7 +8,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Vehicle
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.stream.Collectors;
@@ -41,7 +40,6 @@ public class OperationDetailsController {
     @FXML private Button btnCancelOperation;
     @FXML private Label lblCode, lblAdditionalInfo, lblAddress;
     @FXML private AnchorPane operationDetailsAP;
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
     public OperationDetailsController(
             OperationService operationService,
diff --git a/src/main/resources/fxml/OperationDetails.fxml b/src/main/resources/fxml/OperationDetails.fxml
index 911b030..4ca3a10 100644
--- a/src/main/resources/fxml/OperationDetails.fxml
+++ b/src/main/resources/fxml/OperationDetails.fxml
@@ -31,7 +31,7 @@
         <AnchorPane fx:id="apActiveOperations" layoutX="874.0" layoutY="50.0" prefHeight="298.0" prefWidth="200.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="9.0" layoutY="46.0" prefHeight="251.0" prefWidth="182.0" style="-fx-background-color: white;" />
-            <Label layoutX="9.0" layoutY="4.0" prefHeight="46.0"  prefWidth="103.0" text="Aktive Einsätze">
+            <Label layoutX="9.0" layoutY="4.0" prefHeight="46.0" prefWidth="103.0" text="Aktive Einsätze">
               <font>
                 <Font name="System Bold" size="14.0" />
               </font>
@@ -65,12 +65,12 @@
                 <Font size="17.0" />
               </font>
             </Label>
-            <Button fx:id="btnCloseOperation" layoutX="709.0" layoutY="89.0" mnemonicParsing="false" onAction="#closeOperationClicked" prefHeight="39.0" prefWidth="122.0" styleClass="button-main" text="Abschließen">
+            <Button fx:id="btnCloseOperation" layoutX="657.0" layoutY="89.0" mnemonicParsing="false" onAction="#closeOperationClicked" prefHeight="39.0" prefWidth="174.0" styleClass="button-main" text="Abschließen">
               <font>
                 <Font name="System Bold" size="17.0" />
               </font>
             </Button>
-            <Button fx:id="btnCancelOperation" layoutX="575.0" layoutY="90.0" mnemonicParsing="false" onAction="#cancelOperationClicked" prefHeight="38.0" prefWidth="122.0" style="-fx-background-color: rgba(82, 83, 87, 0.51); -fx-text-fill: white;" text="Stornieren">
+            <Button fx:id="btnCancelOperation" layoutX="465.0" layoutY="89.0" mnemonicParsing="false" onAction="#cancelOperationClicked" prefHeight="38.0" prefWidth="174.0" style="-fx-background-color: rgba(82, 83, 87, 0.51); -fx-text-fill: white;" text="Stornieren">
               <font>
                 <Font name="System Bold" size="17.0" />
               </font>
-- 
cgit v1.2.3-70-g09d2


From afcb90bbe5ad5bdf72895f3d956993872d0031a5 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Mon, 18 Jun 2018 00:24:23 +0200
Subject: Add requestVehicle button OperationDetails #24981

---
 .../controller/CreateCarController.java               |  2 +-
 .../controller/CreateOperationController.java         |  2 +-
 .../controller/DetailArchiveOperationController.java  |  2 +-
 .../controller/OperationDetailsController.java        | 19 ++++++++++++++++++-
 .../controller/RegistrationWindowController.java      |  2 +-
 .../controller/VehiclePaneController.java             | 17 ++++++++++++++++-
 src/main/resources/fxml/vehiclePane.fxml              | 15 +++++++++++++++
 7 files changed, 53 insertions(+), 6 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
index a4df90b..0734820 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
@@ -200,7 +200,7 @@ public class CreateCarController {
             for (Vehicle vehicle : vehicles) {
                 VehiclePaneController controller = VehiclePaneController.createVehiclePane();
 
-                controller.setData(vehicle, false);
+                controller.setData(vehicle, false, false);
                 controller
                         .getRootElement()
                         .setOnMouseClicked(
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index c3eb32b..19ed7bf 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -111,7 +111,7 @@ public class CreateOperationController {
             for (Vehicle vehicle : vehicles) {
                 VehiclePaneController controller = VehiclePaneController.createVehiclePane();
 
-                controller.setData(vehicle, true);
+                controller.setData(vehicle, true, false);
                 controller
                         .getRootElement()
                         .setOnMouseClicked(
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
index 256fd4b..41bd2a6 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
@@ -51,7 +51,7 @@ public class DetailArchiveOperationController {
         VehiclePaneController controller;
         try {
             controller = VehiclePaneController.createVehiclePane();
-            controller.setData(vehicle, false);
+            controller.setData(vehicle, false, false);
             vBoxVehicle.getChildren().add(controller.getRootElement());
         } catch (IOException e) {
             LOG.error("IOException in set(Vehicle). (vBoxVehicle) ", e);
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
index dc8d0fb..86c4de7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
@@ -11,10 +11,12 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.EnumSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
@@ -73,7 +75,8 @@ public class OperationDetailsController {
             fpVehicles.getChildren().clear();
             for (Vehicle vehicle : operation.vehicles()) {
                 VehiclePaneController controller = VehiclePaneController.createVehiclePane();
-                controller.setData(vehicle, true);
+                controller.setData(vehicle, true, true);
+                controller.getBtnRequest().setOnAction(e -> requestVehicleClicked(controller));
                 fpVehicles.getChildren().add(controller.getRootElement());
             }
         } catch (IOException e) {
@@ -142,6 +145,20 @@ public class OperationDetailsController {
         createOperationController.updateList();
     }
 
+    private void requestVehicleClicked(VehiclePaneController v) {
+        LOG.debug("Button \"Nachfordern\" clicked.");
+
+        try {
+            operationService.requestVehicles(operation.id(), Set.of(v.getData().id()));
+        } catch (ServiceException | InvalidOperationException | InvalidVehicleException e) {
+            LOG.error("Exception in requestVehicleClicked()", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+            return;
+        }
+        showSuccessAlertAndWait("Das Fahrzeug wurde erfolgreich angefordert");
+        createOperationController.updateList();
+    }
+
     public void closeWindow() {
         LOG.debug("Hyperlink \"Zurück\" clicked.");
         operationDetailsAP.setVisible(false);
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 dd4ff92..76f31b3 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
@@ -168,7 +168,7 @@ public class RegistrationWindowController {
                 anyMatch = true;
 
                 VehiclePaneController vp = VehiclePaneController.createVehiclePane();
-                vp.setData(vehicle, false);
+                vp.setData(vehicle, false, false);
                 vbVehicles.getChildren().add(vp.getRootElement());
 
                 vp.getRootElement()
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
index ed6e1a6..b31228d 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
@@ -11,6 +11,7 @@ import java.util.Optional;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -36,6 +37,7 @@ public class VehiclePaneController extends CustomListItemController {
     @FXML private ImageView ivQualification;
     @FXML private Text txtQualification;
     @FXML private Text txtRooftype;
+    @FXML private Button btnRequest;
 
     private Vehicle data;
 
@@ -50,7 +52,7 @@ public class VehiclePaneController extends CustomListItemController {
      * @param showStatusInfo If true, the highest qualification of the vehicle's active registration
      *     and the vehicle's status will be shown.
      */
-    public void setData(Vehicle vehicle, boolean showStatusInfo) {
+    public void setData(Vehicle vehicle, boolean showStatusInfo, boolean showRequestVehicle) {
         txtType.setText(vehicle.type().name());
         String constrType = vehicle.constructionType().name();
         txtRooftype.setText(
@@ -63,6 +65,15 @@ public class VehiclePaneController extends CustomListItemController {
             ivNEF.setImage(new Image("images/NotNEF.png"));
             txtNEF.setText("keine NEF-Halterung");
         }
+
+        if (showRequestVehicle) {
+            btnRequest.setVisible(true);
+            btnRequest.setManaged(true);
+        } else {
+            btnRequest.setVisible(false);
+            btnRequest.setManaged(false);
+        }
+
         if (showStatusInfo) {
             txtStatus.setText(vehicle.status().name());
             if (vehicle.status() == Status.FREI_FUNK || vehicle.status() == Status.FREI_WACHE) {
@@ -100,4 +111,8 @@ public class VehiclePaneController extends CustomListItemController {
 
         this.data = vehicle;
     }
+
+    public Button getBtnRequest() {
+        return btnRequest;
+    }
 }
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 1cedb7c..5a47181 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.String?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
@@ -94,4 +98,15 @@
       <Insets topRightBottomLeft="3"/>
     </padding>
   </Label>
+   <VBox alignment="CENTER_RIGHT" GridPane.columnIndex="3" GridPane.rowIndex="2">
+      <children>
+         <Button fx:id="btnRequest" alignment="CENTER" mnemonicParsing="false" prefWidth="100.0" text="Nachfordern">
+            <styleClass>
+               <String fx:value="text-medium" />
+               <String fx:value="button" />
+               <String fx:value="button-main" />
+            </styleClass>
+         </Button>
+      </children>
+   </VBox>
 </GridPane>
-- 
cgit v1.2.3-70-g09d2


From 0ccd2fe329902f3178b360deea9b4f0a67effe03 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Mon, 18 Jun 2018 18:40:08 +0200
Subject: Small adjustment for size of active Operation list [#25963]

---
 src/main/resources/fxml/CreateOperationController.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 35180e3..d9194f7 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -70,7 +70,7 @@
   <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"
+    <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">
-- 
cgit v1.2.3-70-g09d2


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(-)

(limited to 'src/main/resources/fxml')

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


From 33fa59e95b5495166112f4d8c3a9e7c4d7f758d5 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Mon, 18 Jun 2018 19:47:17 +0200
Subject: Fix list.

---
 src/main/resources/fxml/CreateOperationController.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 5fd64f5..0c82e29 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -56,7 +56,7 @@
     <Hyperlink layoutY="7.0" onAction="#onArchivLinkClicked" styleClass="text-medium" text="Archiv" AnchorPane.rightAnchor="12" />
   </AnchorPane>
   <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">
+    <FlowPane fx:id="fpVehicles" hgap="12" vgap="12" prefWidth="920.0">
       <padding>
         <Insets topRightBottomLeft="6" />
       </padding>
-- 
cgit v1.2.3-70-g09d2


From 17556e5701442e9c2a7e219c5d93734812344ebe Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Mon, 18 Jun 2018 20:13:05 +0200
Subject: Rename 'einsatzverwaltung' to 'missioncontrol' + remove TODO [#25963]

---
 .../groupphase/application/MainApplication.java    |   4 +-
 .../controller/ArchiveOperationController.java     | 213 ------------
 .../controller/CreateCarController.java            | 231 -------------
 .../controller/CreateNewEmployeeController.java    | 174 ----------
 .../controller/CreateOperationController.java      | 371 ---------------------
 .../controller/CustomListItemController.java       |  24 --
 .../DetailArchiveOperationController.java          |  77 -----
 .../controller/EmployeeListController.java         | 133 --------
 .../controller/EmployeeListItemController.java     |  87 -----
 .../controller/FilterEmployeesController.java      |  65 ----
 .../einsatzverwaltung/controller/Helper.java       |  34 --
 .../controller/ManageEmployeesController.java      | 120 -------
 .../controller/OperationDetailsController.java     | 169 ----------
 .../controller/OperationInArchiveController.java   |  65 ----
 .../controller/RegistrationWindowController.java   | 279 ----------------
 .../controller/VehiclePaneController.java          | 118 -------
 .../einsatzverwaltung/dao/EmployeeDAO.java         |  44 ---
 .../einsatzverwaltung/dao/EmployeeDatabaseDAO.java | 144 --------
 .../einsatzverwaltung/dao/OperationDAO.java        |  48 ---
 .../dao/OperationDatabaseDAO.java                  | 221 ------------
 .../einsatzverwaltung/dao/RegistrationDAO.java     |  28 --
 .../dao/RegistrationDatabaseDAO.java               | 130 --------
 .../einsatzverwaltung/dao/VehicleDAO.java          |  54 ---
 .../einsatzverwaltung/dao/VehicleDatabaseDAO.java  | 211 ------------
 .../groupphase/einsatzverwaltung/dto/Employee.java |  51 ---
 .../einsatzverwaltung/dto/EmployeeValidator.java   |  23 --
 .../einsatzverwaltung/dto/Operation.java           |  70 ----
 .../einsatzverwaltung/dto/Registration.java        |  34 --
 .../dto/RegistrationValidator.java                 | 174 ----------
 .../groupphase/einsatzverwaltung/dto/Vehicle.java  |  73 ----
 .../einsatzverwaltung/service/EmployeeService.java |  46 ---
 .../service/EmployeeServiceImpl.java               |  59 ----
 .../service/OperationService.java                  |  70 ----
 .../service/OperationServiceImpl.java              | 286 ----------------
 .../service/RegistrationService.java               |  32 --
 .../service/RegistrationServiceImpl.java           |  52 ---
 .../einsatzverwaltung/service/VehicleService.java  |  49 ---
 .../service/VehicleServiceImpl.java                | 116 -------
 .../controller/ArchiveOperationController.java     | 213 ++++++++++++
 .../controller/CreateCarController.java            | 231 +++++++++++++
 .../controller/CreateNewEmployeeController.java    | 174 ++++++++++
 .../controller/CreateOperationController.java      | 371 +++++++++++++++++++++
 .../controller/CustomListItemController.java       |  24 ++
 .../DetailArchiveOperationController.java          |  77 +++++
 .../controller/EmployeeListController.java         | 133 ++++++++
 .../controller/EmployeeListItemController.java     |  87 +++++
 .../controller/FilterEmployeesController.java      |  65 ++++
 .../missioncontrol/controller/Helper.java          |  34 ++
 .../controller/ManageEmployeesController.java      | 120 +++++++
 .../controller/OperationDetailsController.java     | 169 ++++++++++
 .../controller/OperationInArchiveController.java   |  65 ++++
 .../controller/RegistrationWindowController.java   | 279 ++++++++++++++++
 .../controller/VehiclePaneController.java          | 118 +++++++
 .../groupphase/missioncontrol/dao/EmployeeDAO.java |  44 +++
 .../missioncontrol/dao/EmployeeDatabaseDAO.java    | 144 ++++++++
 .../missioncontrol/dao/OperationDAO.java           |  48 +++
 .../missioncontrol/dao/OperationDatabaseDAO.java   | 221 ++++++++++++
 .../missioncontrol/dao/RegistrationDAO.java        |  28 ++
 .../dao/RegistrationDatabaseDAO.java               | 130 ++++++++
 .../groupphase/missioncontrol/dao/VehicleDAO.java  |  54 +++
 .../missioncontrol/dao/VehicleDatabaseDAO.java     | 211 ++++++++++++
 .../groupphase/missioncontrol/dto/Employee.java    |  51 +++
 .../missioncontrol/dto/EmployeeValidator.java      |  23 ++
 .../groupphase/missioncontrol/dto/Operation.java   |  70 ++++
 .../missioncontrol/dto/Registration.java           |  34 ++
 .../missioncontrol/dto/RegistrationValidator.java  | 174 ++++++++++
 .../groupphase/missioncontrol/dto/Vehicle.java     |  73 ++++
 .../missioncontrol/service/EmployeeService.java    |  46 +++
 .../service/EmployeeServiceImpl.java               |  59 ++++
 .../missioncontrol/service/OperationService.java   |  70 ++++
 .../service/OperationServiceImpl.java              | 286 ++++++++++++++++
 .../service/RegistrationService.java               |  32 ++
 .../service/RegistrationServiceImpl.java           |  52 +++
 .../missioncontrol/service/VehicleService.java     |  49 +++
 .../missioncontrol/service/VehicleServiceImpl.java | 116 +++++++
 src/main/resources/fxml/ArchiveOperation.fxml      |   2 +-
 .../resources/fxml/CreateOperationController.fxml  |   2 +-
 .../resources/fxml/DetailArchiveOperation.fxml     |   2 +-
 src/main/resources/fxml/OperationDetails.fxml      |   2 +-
 src/main/resources/fxml/OperationInArchive.fxml    |   2 +-
 src/main/resources/fxml/RegistrationWindow.fxml    |   2 +-
 src/main/resources/fxml/createCar.fxml             |   2 +-
 src/main/resources/fxml/createNewEmployee.fxml     |   2 +-
 src/main/resources/fxml/employeeList.fxml          |   2 +-
 src/main/resources/fxml/employeeListItem.fxml      |   2 +-
 .../resources/fxml/filterEmployeesControl.fxml     |   2 +-
 src/main/resources/fxml/manageEmployees.fxml       |   2 +-
 src/main/resources/fxml/vehiclePane.fxml           |   2 +-
 .../CreateNewEmployeeControllerTest.java           |  87 -----
 .../controller/CreateNewVehicleControllerTest.java |  81 -----
 .../controller/GuiTestApplication.java             | 101 ------
 .../controller/RegistrationControllerTest.java     |  22 --
 .../einsatzverwaltung/dao/EmployeeDAOTest.java     | 253 --------------
 .../einsatzverwaltung/dao/OperationDAOTest.java    | 197 -----------
 .../einsatzverwaltung/dao/RegistrationDAOTest.java | 115 -------
 .../einsatzverwaltung/dao/VehicleDAOTest.java      | 161 ---------
 .../service/EmployeeServiceTest.java               |  67 ----
 .../service/OperationServiceIntegrationTest.java   |  97 ------
 .../service/OperationServiceTest.java              | 205 ------------
 .../RegistrationServiceIntegrationTest.java        |  55 ---
 .../service/RegistrationServiceTest.java           | 159 ---------
 .../CreateNewEmployeeControllerTest.java           |  87 +++++
 .../controller/CreateNewVehicleControllerTest.java |  81 +++++
 .../controller/GuiTestApplication.java             | 101 ++++++
 .../controller/RegistrationControllerTest.java     |  22 ++
 .../missioncontrol/dao/EmployeeDAOTest.java        | 253 ++++++++++++++
 .../missioncontrol/dao/OperationDAOTest.java       | 197 +++++++++++
 .../missioncontrol/dao/RegistrationDAOTest.java    | 115 +++++++
 .../missioncontrol/dao/VehicleDAOTest.java         | 161 +++++++++
 .../service/EmployeeServiceTest.java               |  67 ++++
 .../service/OperationServiceIntegrationTest.java   |  97 ++++++
 .../service/OperationServiceTest.java              | 205 ++++++++++++
 .../RegistrationServiceIntegrationTest.java        |  55 +++
 .../service/RegistrationServiceTest.java           | 159 +++++++++
 114 files changed, 5789 insertions(+), 5791 deletions(-)
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Employee.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/EmployeeValidator.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Operation.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/RegistrationValidator.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java
 delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateCarController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CustomListItemController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/DetailArchiveOperationController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListItemController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/FilterEmployeesController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/Helper.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ManageEmployeesController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationInArchiveController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/VehiclePaneController.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDatabaseDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDatabaseDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDatabaseDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDatabaseDAO.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Employee.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/EmployeeValidator.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Operation.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Registration.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/RegistrationValidator.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Vehicle.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeService.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceImpl.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationService.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceImpl.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationService.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceImpl.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleService.java
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleServiceImpl.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationControllerTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceIntegrationTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceIntegrationTest.java
 delete mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeControllerTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewVehicleControllerTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/GuiTestApplication.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationControllerTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAOTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAOTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAOTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceIntegrationTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceIntegrationTest.java
 create mode 100644 src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceTest.java

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
index 87daea4..a6c0566 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
@@ -1,6 +1,6 @@
 package at.ac.tuwien.sepm.assignment.groupphase.application;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.CreateOperationController;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import javafx.application.Application;
@@ -34,8 +34,6 @@ public class MainApplication extends Application {
                     Platform.exit();
                 });
 
-        // TODO: close connection on program exit (feedback)
-
         configApplicationContext = new AnnotationConfigApplicationContext(MainApplication.class);
         final var fxmlLoader = configApplicationContext.getBean(SpringFXMLLoader.class);
         primaryStage.setScene(
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
deleted file mode 100644
index 9ac6a1a..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class ArchiveOperationController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ArchiveOperationController.class);
-
-    @FXML private ImageView imvVehicleDetail;
-    @FXML private Label lblStatus;
-    @FXML private AnchorPane apMainDetails;
-    @FXML private Label lblOperations;
-    @FXML private Label lblCompleted;
-    @FXML private Label lblCancelled;
-    @FXML private AnchorPane backApMain;
-    @FXML private AnchorPane backApDetails;
-    @FXML private AnchorPane archiveOperationAP;
-    @FXML private AnchorPane apDetails;
-    @FXML private Label lblCodeHeader;
-    @FXML private Label lblOpCode;
-    @FXML private Label lblVehicles;
-    @FXML private Label lblDate;
-    @FXML private Label lblAddress;
-    @FXML private FlowPane fpVehicles;
-    private final OperationService operationService;
-    @FXML private FlowPane archiveOperationFlowPane;
-    private final CreateOperationController createOperationController;
-    private Set<Operation> list = new HashSet<>();
-    private final SpringFXMLLoader fxmlLoader;
-
-    public ArchiveOperationController(
-            OperationService operationService,
-            CreateOperationController createOperationController,
-            SpringFXMLLoader fxmlLoader) {
-        this.operationService = operationService;
-        this.createOperationController = createOperationController;
-        this.fxmlLoader = fxmlLoader;
-    }
-
-    @FXML
-    private void initialize() {
-        update();
-    }
-
-    public void update() {
-        archiveOperationFlowPane.getChildren().clear();
-        list.clear();
-        try {
-            list.addAll(operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED)));
-            long cancelledAmount = 0;
-            long completedAmount = 0;
-            for (Operation operation : list) {
-                if (operation.status() == Status.CANCELLED) cancelledAmount++;
-                else completedAmount++;
-            }
-            lblCancelled.setText("storniert: " + cancelledAmount);
-            lblCompleted.setText("abgeschlossen: " + completedAmount);
-            lblOperations.setText("Einsätze: " + list.size());
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in update().", e);
-            showServiceExceptionAlertAndWait("Die Einsätze konnten nicht geladen werden!");
-            ;
-        }
-        setFlowPane();
-    }
-
-    private void setFlowPane() {
-        try {
-            archiveOperationFlowPane.getChildren().clear();
-            for (Operation operation : sortSet(list)) {
-                OperationInArchiveController opInAController =
-                        OperationInArchiveController.create();
-                opInAController.set(operation);
-                opInAController
-                        .getRoot()
-                        .setOnMouseClicked(
-                                event -> {
-                                    detailOperation = operation;
-                                    backApMain.setVisible(false);
-                                    apMainDetails.setVisible(false);
-                                    backApDetails.setVisible(true);
-                                    setOperation();
-                                    setDetailsVisible(true);
-                                    imvVehicleDetail.setImage(new Image("/images/Vehicle.png"));
-                                });
-                archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
-            }
-        } catch (IOException e) {
-            LOG.error("IOException in setFlowPane(). ", e);
-            showServiceExceptionAlertAndWait("Die Elemente konnten nicht geladen werden!");
-        }
-    }
-
-    private Operation detailOperation;
-
-    private List<Operation> sortSet(Set<Operation> operationsSet) {
-        Operation[] array = operationsSet.toArray(new Operation[operationsSet.size()]);
-        for (int i = array.length - 1; i > 0; i--) {
-            for (int j = 0; j < i; j++) {
-                LocalDateTime first =
-                        LocalDateTime.ofInstant(
-                                Objects.requireNonNull(array[j].created()), ZoneOffset.UTC);
-                LocalDateTime second =
-                        LocalDateTime.ofInstant(
-                                Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC);
-                if (first.isBefore(second)) {
-                    Operation help = array[j];
-                    array[j] = array[j + 1];
-                    array[j + 1] = help;
-                }
-            }
-        }
-        return Arrays.asList(array);
-    }
-
-    private void setOperation() {
-        lblCodeHeader.setText(detailOperation.opCode());
-        if (detailOperation.created() != null) {
-            LocalDateTime dateTime =
-                    LocalDateTime.ofInstant(
-                            Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
-            lblDate.setText(
-                    "am "
-                            + dateTime.getDayOfMonth()
-                            + "."
-                            + dateTime.getMonth().getValue()
-                            + "."
-                            + dateTime.getYear());
-        } else {
-            lblDate.setText("---");
-        }
-        lblStatus.setText(
-                "Status: "
-                        + (detailOperation.status() == Status.CANCELLED
-                                ? "storniert"
-                                : "abgeschlossen"));
-        lblOpCode.setText(detailOperation.opCode());
-        Collection<String> elements =
-                detailOperation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
-        String result = String.join(", ", elements);
-
-        lblVehicles.setText(result);
-        lblAddress.setText(detailOperation.destination());
-
-        fpVehicles.getChildren().clear();
-        try {
-            for (Vehicle vehicle : detailOperation.vehicles()) {
-                DetailArchiveOperationController controller = null;
-
-                controller = DetailArchiveOperationController.create(fxmlLoader);
-
-                controller.set(vehicle);
-                fpVehicles.getChildren().add(controller.getRoot());
-            }
-        } catch (IOException e) {
-            LOG.error("IOException in setOperation(). ", e);
-            showServiceExceptionAlertAndWait("Die Element konnte nicht geladen werden!");
-        }
-    }
-
-    private void setDetailsVisible(boolean b) {
-        apDetails.setVisible(b);
-    }
-
-    public void backClicked() {
-        LOG.debug("Hyperlink \"Zurück\" in archive detail view clicked.");
-        fpVehicles.getChildren().clear();
-        setDetailsVisible(false);
-        backApDetails.setVisible(false);
-        apMainDetails.setVisible(true);
-        backApMain.setVisible(true);
-    }
-
-    public void backToMain() {
-        LOG.debug("Hyperlink \"Zurück\" in archive main view clicked.");
-        this.setVisible(false);
-        createOperationController.setVisible(true);
-    }
-
-    void setVisible(boolean b) {
-        archiveOperationAP.setVisible(b);
-        backApMain.setVisible(b);
-        apMainDetails.setVisible(b);
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
deleted file mode 100644
index 0734820..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showSuccessAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showValidationErrorAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.io.IOException;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class CreateCarController {
-
-    @FXML private AnchorPane createCarAP;
-    @FXML private ChoiceBox<String> cmbCtype;
-    @FXML private ChoiceBox<String> cmbTyp;
-
-    @FXML private Button btnCreate;
-    @FXML private CheckBox cbxNEF;
-    @FXML private FlowPane fpVehicleList;
-    private final CreateOperationController createOperationController;
-
-    private static final Logger LOG = LoggerFactory.getLogger(CreateCarController.class);
-    private final VehicleService vehicleService;
-    private boolean update = false;
-    private long vid = -1;
-
-    private Vehicle chooseVehicle;
-
-    public CreateCarController(
-            CreateOperationController createOperationController, VehicleService vehicleService) {
-        this.createOperationController = createOperationController;
-        this.vehicleService = vehicleService;
-    }
-
-    @FXML
-    private void initialize() {
-        fpVehicleList.setHgap(5);
-        fpVehicleList.setVgap(5);
-
-        cmbCtype.setItems(
-                FXCollections.observableArrayList(
-                        Stream.of(
-                                        ConstructionType.NORMAL,
-                                        ConstructionType.MITTELHOCHDACH,
-                                        ConstructionType.HOCHDACH)
-                                .map(Enum::toString)
-                                .collect(Collectors.toList())));
-        cmbCtype.setValue(ConstructionType.NORMAL.toString());
-        cmbTyp.setItems(
-                FXCollections.observableArrayList(
-                        Stream.of(
-                                        VehicleType.BKTW,
-                                        VehicleType.KTW_B,
-                                        VehicleType.KTW,
-                                        VehicleType.RTW,
-                                        VehicleType.NEF,
-                                        VehicleType.NAH)
-                                .map(Enum::toString)
-                                .collect(Collectors.toList())));
-        cmbTyp.setValue(VehicleType.BKTW.toString());
-
-        updateVehiclePane();
-    }
-
-    @FXML
-    private void createCar(ActionEvent actionEvent) {
-
-        if (!update) {
-            LOG.debug("Button \"Erstellen\" clicked.");
-            Vehicle vehicle =
-                    Vehicle.builder()
-                            .constructionType(parseConstructionType())
-                            .type(parseType())
-                            .name("")
-                            .status(Status.ABGEMELDET)
-                            .hasNef(cbxNEF.isSelected())
-                            .build();
-            try {
-                vehicleService.add(vehicle);
-                setToStart();
-            } catch (InvalidVehicleException e) {
-                LOG.debug("Validation of Vehicle failed");
-                showValidationErrorAlertAndWait(e.getMessage());
-                setToStart();
-                return;
-            } catch (ServiceException e) {
-                LOG.error("ServiceException in createCar(). ", e);
-                showServiceExceptionAlertAndWait(
-                        "Ein Fehler beim Erstellen des Fahrzeuges ist aufgetreten.");
-                setToStart();
-                return;
-            }
-            showSuccessAlertAndWait("Auto wurde erfolgreich angelegt.");
-        } else {
-            LOG.debug("Button \"Speichern\" clicked.");
-            try {
-                Vehicle vehicle =
-                        Vehicle.builder()
-                                .id(vid)
-                                .constructionType(parseConstructionType())
-                                .type(parseType())
-                                .name("")
-                                .status(Status.ABGEMELDET)
-                                .hasNef(cbxNEF.isSelected())
-                                .build();
-                vehicleService.update(vehicle);
-                setToStart();
-                chooseVehicle = null;
-            } catch (InvalidVehicleException e) {
-                LOG.debug("Validation of Vehicle failed");
-                showValidationErrorAlertAndWait(e.getMessage());
-                setToStart();
-                return;
-            } catch (ServiceException e) {
-                LOG.error("ServiceException in createCar(). ", e);
-                showServiceExceptionAlertAndWait(e.getMessage());
-                setToStart();
-                return;
-            }
-            showSuccessAlertAndWait("Auto wurde erfolgreich bearbeitet.");
-        }
-
-        updateVehiclePane();
-    }
-
-    private ConstructionType parseConstructionType() {
-        if (cmbCtype.getSelectionModel().getSelectedItem() == null) {
-            return ConstructionType.NORMAL;
-        }
-        return ConstructionType.valueOf(cmbCtype.getSelectionModel().getSelectedItem());
-    }
-
-    private VehicleType parseType() {
-        if (cmbTyp.getSelectionModel().getSelectedItem() == null) {
-            return VehicleType.BKTW;
-        }
-        return VehicleType.valueOf(cmbTyp.getSelectionModel().getSelectedItem());
-    }
-
-    private void setToStart() {
-        btnCreate.setText("Erstellen");
-        cbxNEF.setSelected(false);
-        cmbTyp.setValue(VehicleType.BKTW.name());
-        cmbCtype.setValue(ConstructionType.NORMAL.name());
-        update = false;
-    }
-
-    private void updateVehicle(Vehicle vehicle) {
-
-        cmbCtype.setValue(vehicle.constructionType().name());
-        cmbTyp.setValue(vehicle.type().name());
-        cbxNEF.setSelected(vehicle.hasNef());
-        btnCreate.setText("Speichern");
-        vid = vehicle.id();
-        update = true;
-        chooseVehicle = vehicle;
-    }
-
-    public void setVisible(boolean b) {
-        createCarAP.setVisible(b);
-    }
-
-    @FXML
-    private void backToMain() {
-        LOG.debug("Hyperlink \"zurück\" clicked.");
-        this.setVisible(false);
-        createOperationController.setVisible(true);
-    }
-
-    private void updateVehiclePane() {
-        try {
-            fpVehicleList.getChildren().clear();
-
-            Set<Vehicle> vehicles;
-
-            vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
-
-            for (Vehicle vehicle : vehicles) {
-                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
-
-                controller.setData(vehicle, false, false);
-                controller
-                        .getRootElement()
-                        .setOnMouseClicked(
-                                event -> {
-                                    if (event.getButton().equals(MouseButton.PRIMARY)) {
-                                        if (chooseVehicle == null || vehicle == chooseVehicle) {
-                                            if (update == false) {
-                                                chooseVehicle = vehicle;
-                                                updateVehicle(vehicle);
-                                                controller.setSelected(true);
-                                            } else {
-                                                setToStart();
-                                                controller.setSelected(false);
-
-                                                chooseVehicle = null;
-                                            }
-                                        }
-                                    }
-                                });
-
-                fpVehicleList.getChildren().add(controller.getRootElement());
-            }
-        } catch (ServiceException | IOException e) {
-            LOG.error("Exception in updateVehiclePane(). ", e);
-            showServiceExceptionAlertAndWait(e.getMessage());
-        }
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
deleted file mode 100644
index 5f0a8b2..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showSuccessAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showValidationErrorAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@Scope("prototype")
-public class CreateNewEmployeeController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CreateNewEmployeeController.class);
-    private final EmployeeService employeeService;
-
-    @FXML private Label lblHeader;
-    @FXML private CheckBox inputIsDriver;
-    @FXML private CheckBox inputIsPilot;
-    @FXML private TextField inputName;
-    @FXML private ChoiceBox<String> inputQualification;
-    @FXML private Button btnCreate;
-
-    private Node rootElement;
-    private Employee employee;
-    private boolean isEdit;
-
-    private Runnable consumerCancelClicked;
-    private Runnable consumerCreateClicked;
-
-    public CreateNewEmployeeController(EmployeeService employeeService) {
-        this.employeeService = employeeService;
-    }
-
-    @FXML
-    private void initialize() {
-        inputQualification.setItems(
-                FXCollections.observableArrayList(
-                        Stream.of(
-                                        EducationLevel.RS,
-                                        EducationLevel.NFS,
-                                        EducationLevel.NKV,
-                                        EducationLevel.NKA,
-                                        EducationLevel.NKI,
-                                        EducationLevel.NA)
-                                .map(Enum::toString)
-                                .collect(Collectors.toList())));
-
-        inputQualification.setValue(EducationLevel.RS.toString());
-        employee =
-                Employee.builder()
-                        .name("")
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(false)
-                        .isPilot(false)
-                        .birthday(LocalDate.MIN)
-                        .build();
-    }
-
-    @FXML
-    private void onCancelClicked() {
-        LOG.debug("Hyperlink \"abbrechen\" clicked.");
-        if (consumerCancelClicked != null) {
-            consumerCancelClicked.run();
-        }
-    }
-
-    @FXML
-    private void onCreateClicked() {
-        LOG.debug("Button {} clicked.", btnCreate.getText());
-
-        employee =
-                employee.toBuilder()
-                        .name(inputName.getText())
-                        .educationLevel(parseEducationLevel())
-                        .birthday(LocalDate.MIN) // TODO: change UI to include birthday field
-                        .isDriver(inputIsDriver.isSelected())
-                        .isPilot(inputIsPilot.isSelected())
-                        .build();
-
-        try {
-            if (isEdit) {
-                employeeService.update(employee);
-            } else {
-                employeeService.add(employee);
-            }
-        } catch (InvalidEmployeeException e) {
-            LOG.debug("Validation for Employee failed");
-            showValidationErrorAlertAndWait(e.getMessage());
-            return;
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in onCreateClicked(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Der Eintrag konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.");
-            return;
-        }
-
-        showSuccessAlertAndWait(
-                "Der/die MitarbeiterIn wurde erfolgreich angelegt und gespeichert!");
-
-        if (consumerCreateClicked != null) {
-            consumerCreateClicked.run();
-        }
-    }
-
-    private EducationLevel parseEducationLevel() {
-        if (inputQualification.getSelectionModel().getSelectedItem() == null) {
-            return EducationLevel.RS;
-        }
-        return EducationLevel.valueOf(inputQualification.getSelectionModel().getSelectedItem());
-    }
-
-    private void setData(Employee employee) {
-        isEdit = true;
-        this.employee = employee;
-        inputName.setText(employee.name());
-        inputQualification.setValue(employee.educationLevel().name());
-        inputIsDriver.setSelected(employee.isDriver());
-        inputIsPilot.setSelected(employee.isPilot());
-        lblHeader.setText("Person bearbeiten");
-        btnCreate.setText("Speichern");
-    }
-
-    public static CreateNewEmployeeController createCreateNewEmployeeController(
-            SpringFXMLLoader fxmlLoader, Employee employee) throws IOException {
-        CreateNewEmployeeController controller = createCreateNewEmployeeController(fxmlLoader);
-        controller.setData(employee);
-        return controller;
-    }
-
-    public static CreateNewEmployeeController createCreateNewEmployeeController(
-            SpringFXMLLoader fxmlLoader) throws IOException {
-        FXMLWrapper<Object, CreateNewEmployeeController> wrapper =
-                fxmlLoader.loadAndWrap(
-                        "/fxml/createNewEmployee.fxml", CreateNewEmployeeController.class);
-        Node root = (Node) wrapper.getLoadedObject();
-        CreateNewEmployeeController controller = wrapper.getController();
-        controller.rootElement = root;
-        return controller;
-    }
-
-    public Node getRootElement() {
-        return rootElement;
-    }
-
-    public void setConsumerCancelClicked(Runnable consumerCancelClicked) {
-        this.consumerCancelClicked = consumerCancelClicked;
-    }
-
-    public void setConsumerCreateClicked(Runnable consumerCreateClicked) {
-        this.consumerCreateClicked = consumerCreateClicked;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
deleted file mode 100644
index 19ed7bf..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showSuccessAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showValidationErrorAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.io.IOException;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.TextField;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.GridPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class CreateOperationController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CreateOperationController.class);
-
-    public AnchorPane apCreateOperation;
-    @FXML private GridPane grdWindowContainer;
-    @FXML private TextField txtCode;
-    @FXML private TextField txtAddress;
-    @FXML private TextField txtNote;
-    @FXML private Button btnCreateOperation;
-    @FXML private ListView<Vehicle> lvVehicles;
-    @FXML private ListView<Operation> lvActiveOperations;
-    @FXML private Label lblChosenVehicles;
-    @FXML private AnchorPane apInvisible;
-    @FXML private OperationDetailsController operationDetailsController;
-    @FXML private ManageEmployeesController manageEmployeesController;
-    @FXML private CreateCarController createCarController;
-    @FXML private RegistrationWindowController registrationWindowController;
-    @FXML private ArchiveOperationController archiveOperationController;
-    @FXML private FlowPane fpVehicles;
-
-    private LinkedList<Vehicle> chosenVehicles = new LinkedList<>();
-
-    private final OperationService operationService;
-    private final VehicleService vehicleService;
-
-    public CreateOperationController(
-            OperationService operationService, VehicleService vehicleService) {
-        this.operationService = operationService;
-        this.vehicleService = vehicleService;
-    }
-
-    @FXML
-    private void initialize() {
-
-        lblChosenVehicles.setText("keine ausgewählt");
-        lvActiveOperations.setCellFactory(param -> generateOpCodeListItem());
-
-        lvActiveOperations.setOnMouseClicked(
-                event -> {
-                    if (event.getClickCount() == 2) {
-                        if (lvActiveOperations.getSelectionModel().getSelectedItem() == null) {
-                            return;
-                        }
-                        openDetailsWindow(lvActiveOperations.getSelectionModel().getSelectedItem());
-                    }
-                });
-
-        setVisible(true);
-        createCarController.setVisible(false);
-        registrationWindowController.setVisible(false);
-    }
-
-    public void updateList() {
-        try {
-            fpVehicles.getChildren().clear();
-
-            // TODO: this should probably be handled differently
-            Set<Vehicle> vehicles;
-            if (txtCode.getText().isEmpty()) {
-                vehicles =
-                        vehicleService.list(
-                                EnumSet.complementOf(EnumSet.of(Vehicle.Status.ABGEMELDET)));
-            } else {
-                vehicles = operationService.rankVehicles(txtCode.getText());
-            }
-
-            for (Vehicle vehicle : vehicles) {
-                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
-
-                controller.setData(vehicle, true, false);
-                controller
-                        .getRootElement()
-                        .setOnMouseClicked(
-                                event -> {
-                                    if (event.getButton().equals(MouseButton.SECONDARY)) {
-                                        createContextMenu(vehicle, vehicleService)
-                                                .show(
-                                                        controller.getRootElement(),
-                                                        event.getScreenX(),
-                                                        event.getScreenY());
-                                    } else {
-                                        if (chosenVehicles.contains(vehicle)) {
-                                            chosenVehicles.remove(vehicle);
-                                            controller.setSelected(false);
-                                        } else {
-                                            chosenVehicles.add(vehicle);
-                                            controller.setSelected(true);
-                                        }
-
-                                        StringBuilder result = new StringBuilder();
-                                        for (int i = 0; i < chosenVehicles.size(); i++) {
-                                            if (i == chosenVehicles.size() - 1) {
-                                                result.append(chosenVehicles.get(i).name());
-                                            } else {
-                                                result.append(chosenVehicles.get(i).name())
-                                                        .append(", ");
-                                            }
-                                        }
-                                        if (result.toString().equals("")) {
-                                            lblChosenVehicles.setText("keine ausgewählt");
-                                        } else {
-                                            lblChosenVehicles.setText(result.toString());
-                                        }
-                                    }
-                                });
-
-                if (chosenVehicles.stream().anyMatch(v -> v.id() == vehicle.id()))
-                    controller.setSelected(true);
-
-                fpVehicles.getChildren().add(controller.getRootElement());
-            }
-        } catch (ServiceException | IOException e) {
-            LOG.error("Exception in updateList(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Erstellen des Ranking ist ein Fehler aufgetreten.");
-        } catch (InvalidOperationException e) {
-            LOG.debug("Validation error in updateList(). ", e);
-            showValidationErrorAlertAndWait(e.getMessage());
-        }
-        try {
-            lvActiveOperations.setItems(
-                    FXCollections.observableArrayList(
-                            operationService.list(EnumSet.of(Status.ACTIVE))));
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in updateList(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten");
-        }
-    }
-
-    private ContextMenu createContextMenu(Vehicle data, VehicleService vehicleService) {
-        ContextMenu menu = new ContextMenu();
-
-        for (Vehicle.Status status : Vehicle.Status.values()) {
-            if (status == Vehicle.Status.ABGEMELDET) {
-                continue;
-            }
-
-            MenuItem mi = new MenuItem(status.name());
-
-            if (status == Vehicle.Status.FREI_FUNK || status == Vehicle.Status.FREI_WACHE) {
-                mi.getStyleClass().add("mi-free");
-            } else {
-                mi.getStyleClass().add("mi-other");
-            }
-
-            mi.setOnAction(
-                    event -> {
-                        try {
-                            vehicleService.update(data.toBuilder().status(status).build());
-                            this.updateList();
-                        } catch (InvalidVehicleException e) {
-                            LOG.debug(
-                                    "Validation error in createContextMenu(). (mi.setOnAction) ",
-                                    e);
-                            showValidationErrorAlertAndWait(e.getMessage());
-                        } catch (ServiceException e) {
-                            LOG.error("Exception in createContextMenu(). (mi.setOnAction) ", e);
-                            showServiceExceptionAlertAndWait(
-                                    "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
-                        }
-                    });
-
-            menu.getItems().add(mi);
-        }
-
-        MenuItem abmelden = new MenuItem("abmelden");
-
-        abmelden.setOnAction(
-                event -> {
-                    try {
-                        List<Registration> registrations = data.registrations();
-                        assert registrations
-                                != null; // Otherwise the element shouldn't be in the list.
-
-                        List<Registration> newRegistrations = new ArrayList<>();
-                        Instant now = Instant.now();
-
-                        for (Registration registration : registrations) {
-                            if (registration.start().isBefore(now)
-                                    && registration.end().isAfter(now)) {
-                                newRegistrations.add(
-                                        registration
-                                                .toBuilder()
-                                                .end(Instant.now().minus(1, ChronoUnit.SECONDS))
-                                                .build());
-                            } else newRegistrations.add(registration);
-                        }
-
-                        vehicleService.update(
-                                data.toBuilder()
-                                        .registrations(newRegistrations)
-                                        .status(Vehicle.Status.ABGEMELDET)
-                                        .build());
-
-                        this.updateList();
-                    } catch (InvalidVehicleException e) {
-                        LOG.debug(
-                                "Validation error in createContextMenu(). (abmelden.setOnAction) ",
-                                e);
-                        showValidationErrorAlertAndWait(e.getMessage());
-                    } catch (ServiceException e) {
-                        LOG.error("Exception in createContextMenu(). (abmelden.setOnAction) ", e);
-                        showServiceExceptionAlertAndWait(
-                                "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
-                    }
-                });
-
-        menu.getItems().add(abmelden);
-        return menu;
-    }
-
-    @FXML
-    protected void createOperationClicked() {
-        LOG.debug("Button \"Erstellen\" clicked.");
-        Vehicle[] vehicles = new Vehicle[chosenVehicles.size()];
-        for (int i = 0; i < chosenVehicles.size(); i++) {
-            vehicles[i] = chosenVehicles.get(i);
-        }
-        Operation operation =
-                Operation.builder()
-                        .additionalInfo(txtNote.getText())
-                        .destination(txtAddress.getText())
-                        .opCode(txtCode.getText())
-                        .status(Status.ACTIVE)
-                        .vehicles(Set.of(vehicles))
-                        .build();
-        try {
-            operationService.add(operation);
-        } catch (ServiceException e) {
-            LOG.error("Exception in createOperationClicked(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Erstellen des Einsatzes ist ein Fehler aufgetreten.");
-            return;
-        } catch (InvalidOperationException e) {
-            LOG.debug("Validation error in createOperationClicked(). ", e);
-            showValidationErrorAlertAndWait(e.getMessage());
-            return;
-        }
-        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich gespeichert.");
-        updateList();
-        lblChosenVehicles.setText("keine ausgewählt");
-        txtAddress.setText("");
-        txtCode.setText("");
-        txtNote.setText("");
-        chosenVehicles = new LinkedList<>();
-    }
-
-    @FXML
-    private void onRegistrationLinkClicked() {
-        LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
-        openRegistrationWindow();
-    }
-
-    @FXML
-    private void onEmployeeLinkClicked() {
-        LOG.debug("Hyperlink \"Personen\" clicked.");
-        openCreateNewEmployeeWindow();
-    }
-
-    @FXML
-    private void onVehicleLinkClicked() {
-        LOG.debug("Hyperlink \"Fahrzeuge\" clicked.");
-        openCreateCarWindow();
-    }
-
-    @FXML
-    private void onArchivLinkClicked() {
-        LOG.debug("Hyperlink \"Archiv\" clicked.");
-        archiveOperationController.update();
-        openArchivWindow();
-    }
-
-    private void openArchivWindow() {
-        archiveOperationController.setVisible(true);
-        this.setVisible(false);
-    }
-
-    void setVisible(boolean b) {
-        apInvisible.setVisible(!b);
-        grdWindowContainer.setVisible(!b);
-
-        updateList();
-    }
-
-    private void openDetailsWindow(Operation operation) {
-        operationDetailsController.initOperation(operation);
-        this.setVisible(false);
-    }
-
-    private void openCreateNewEmployeeWindow() {
-        this.setVisible(false);
-        manageEmployeesController.setVisible(true);
-    }
-
-    private void openCreateCarWindow() {
-        this.setVisible(false);
-        createCarController.setVisible(true);
-    }
-
-    private void openRegistrationWindow() {
-        this.setVisible(false);
-        registrationWindowController.setVisible(true);
-    }
-
-    @FXML
-    private void onOperationCodeChanged(KeyEvent keyEvent) {
-        if (keyEvent.getCode() == KeyCode.ENTER) {
-            updateList();
-        }
-    }
-
-    static ListCell<Operation> generateOpCodeListItem() {
-        return new ListCell<>() {
-            @Override
-            protected void updateItem(Operation item, boolean empty) {
-                super.updateItem(item, empty);
-
-                if (empty || item == null || item.opCode() == null) {
-                    setText(null);
-                } else {
-                    setText(item.opCode());
-                }
-            }
-        };
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java
deleted file mode 100644
index 79cf243..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import javafx.scene.Node;
-
-public abstract class CustomListItemController {
-
-    protected Node rootElement;
-
-    public Node getRootElement() {
-        return rootElement;
-    }
-
-    public void setSelected(boolean selected) {
-        rootElement.getStyleClass().clear();
-
-        if (selected) {
-            rootElement.getStyleClass().add("bg-yellow");
-            rootElement.getStyleClass().add("shadowed");
-        } else {
-            rootElement.getStyleClass().add("bg-white");
-            rootElement.getStyleClass().add("shadowed");
-        }
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
deleted file mode 100644
index 41bd2a6..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
-import java.io.IOException;
-import java.util.Objects;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.layout.VBox;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class DetailArchiveOperationController {
-    private static final Logger LOG =
-            LoggerFactory.getLogger(DetailArchiveOperationController.class);
-
-    @FXML private VBox vBoxVehicle;
-    @FXML private VBox vBoxPeople;
-    private final SpringFXMLLoader fxmlLoader;
-
-    public DetailArchiveOperationController(SpringFXMLLoader fxmlLoader) {
-        this.fxmlLoader = fxmlLoader;
-    }
-
-    static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader) throws IOException {
-        FXMLWrapper<Object, DetailArchiveOperationController> wrapper =
-                fxmlLoader.loadAndWrap(
-                        "/fxml/DetailArchiveOperation.fxml",
-                        DetailArchiveOperationController.class);
-
-        Node root = (Node) wrapper.getLoadedObject();
-        DetailArchiveOperationController result = wrapper.getController();
-        result.rootElement = root;
-
-        return result;
-    }
-
-    public Node getRoot() {
-        return rootElement;
-    }
-
-    private Node rootElement;
-
-    public void set(Vehicle vehicle) {
-        VehiclePaneController controller;
-        try {
-            controller = VehiclePaneController.createVehiclePane();
-            controller.setData(vehicle, false, false);
-            vBoxVehicle.getChildren().add(controller.getRootElement());
-        } catch (IOException e) {
-            LOG.error("IOException in set(Vehicle). (vBoxVehicle) ", e);
-            showServiceExceptionAlertAndWait(
-                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
-        }
-        try {
-            for (int i = 0; i < Objects.requireNonNull(vehicle.registrations()).size(); i++) {
-                Employee employee =
-                        Objects.requireNonNull(vehicle.registrations()).get(i).employee();
-
-                EmployeeListItemController employeeListItemController =
-                        EmployeeListItemController.createEmployeeListItemController(
-                                fxmlLoader, employee);
-                vBoxPeople.getChildren().add(employeeListItemController.getRootElement());
-            }
-        } catch (IOException e) {
-            LOG.error("IOException in set(Vehicle). (vBoxPeople) ", e);
-            showServiceExceptionAlertAndWait(
-                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
-        }
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
deleted file mode 100644
index 6e1159a..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.layout.FlowPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@Scope("prototype")
-public class EmployeeListController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(EmployeeListController.class);
-
-    @FXML private FlowPane flowPaneEmployeeList;
-
-    private Consumer<Employee> onEmployeeClicked;
-
-    private final SpringFXMLLoader fxmlLoader;
-    private Node rootElement;
-    private List<EmployeeListItemController> employeeListItemControllers;
-    private Insets listItemMargins = new Insets(10, 5, 0, 5);
-
-    public EmployeeListController(SpringFXMLLoader fxmlLoader) {
-        this.fxmlLoader = fxmlLoader;
-        this.employeeListItemControllers = new ArrayList<>();
-    }
-
-    public void setListItemMargins(Insets value) {
-        this.listItemMargins = value;
-    }
-
-    public void setData(Set<Employee> employeeList) {
-        setData(employeeList, null, null);
-    }
-
-    public void setData(Set<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
-        setData(employeeList, onEmployeeClicked, null);
-    }
-
-    public void setData(
-            Set<Employee> employeeList,
-            Consumer<Employee> onEmployeeClicked,
-            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
-
-        flowPaneEmployeeList.getChildren().clear();
-        employeeListItemControllers.clear();
-        employeeList.forEach(
-                employee ->
-                        addEmployeeToFlowPane(
-                                employee, onEmployeeClicked, onEmployeeListItemClicked));
-    }
-
-    private void addEmployeeToFlowPane(
-            Employee employee,
-            Consumer<Employee> onEmployeeClicked,
-            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
-
-        try {
-            EmployeeListItemController controller =
-                    EmployeeListItemController.createEmployeeListItemController(
-                            fxmlLoader, employee);
-            Node rootElement = controller.getRootElement();
-            flowPaneEmployeeList.getChildren().add(rootElement);
-            employeeListItemControllers.add(controller);
-            FlowPane.setMargin(rootElement, listItemMargins);
-            if (onEmployeeClicked != null) {
-                controller.setConsumerEmployeeClicked(onEmployeeClicked);
-            }
-            if (onEmployeeListItemClicked != null) {
-                controller.setConsumerEmployeeListItemClicked(
-                        employeeListItemController -> {
-                            onEmployeeListItemClicked.accept(employeeListItemController);
-                            if (this.onEmployeeClicked != null) {
-                                this.onEmployeeClicked.accept(
-                                        employeeListItemController.getEmployee());
-                            }
-                        });
-            }
-        } catch (IOException e) {
-            LOG.error("IOException in addEmployeeToFlowPane. ", e);
-        }
-    }
-
-    private void setEmployeeSelected(Employee employee, boolean selected) {
-        employeeListItemControllers
-                .stream()
-                .filter(controller -> controller.getEmployee().equals(employee))
-                .forEach(controller -> controller.setSelected(selected));
-    }
-
-    public void selectEmployee(Employee employee) {
-        setEmployeeSelected(employee, true);
-    }
-
-    public void deselectEmployee(Employee employee) {
-        setEmployeeSelected(employee, false);
-    }
-
-    public void deselectAllEmployees() {
-        employeeListItemControllers.forEach(
-                employeeListItemController -> employeeListItemController.setSelected(false));
-    }
-
-    public static EmployeeListController createEmployeeListController(SpringFXMLLoader loader)
-            throws IOException {
-        FXMLWrapper<Object, EmployeeListController> wrapper =
-                loader.loadAndWrap("/fxml/employeeList.fxml", EmployeeListController.class);
-        Node root = (Node) wrapper.getLoadedObject();
-        EmployeeListController controller = wrapper.getController();
-        controller.rootElement = root;
-        return controller;
-    }
-
-    public Node getRootElement() {
-        return rootElement;
-    }
-
-    public void setOnEmployeeClicked(Consumer<Employee> onEmployeeClicked) {
-        this.onEmployeeClicked = onEmployeeClicked;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
deleted file mode 100644
index 7b5910a..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
-import java.io.IOException;
-import java.util.function.Consumer;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@Scope("prototype")
-public class EmployeeListItemController extends CustomListItemController {
-
-    @FXML private Label lblName;
-    @FXML private Label lblQualification;
-    @FXML private Label lblPilot;
-    @FXML private Label lblDriver;
-    @FXML private ImageView imgPilot;
-    @FXML private ImageView imgDriver;
-    @FXML private ImageView imgQualification;
-
-    private Employee employee;
-
-    private Consumer<Employee> consumerEmployeeClicked;
-    private Consumer<EmployeeListItemController> consumerEmployeeListItemClicked;
-
-    @FXML
-    private void onEmployeeClicked() {
-        if (consumerEmployeeClicked != null) {
-            consumerEmployeeClicked.accept(employee);
-        }
-        if (consumerEmployeeListItemClicked != null) {
-            consumerEmployeeListItemClicked.accept(this);
-        }
-    }
-
-    private void setData(Employee employee) {
-        this.employee = employee;
-        lblName.setText(employee.name());
-        lblQualification.setText(employee.educationLevel().name());
-        lblPilot.setText(String.format("%s Pilot", employee.isPilot() ? "ist" : "nicht"));
-        lblDriver.setText(String.format("%s Fahrer", employee.isDriver() ? "ist" : "nicht"));
-        imgQualification.setImage(new Image("/images/Qualification.png"));
-        String imgSrcPilot =
-                String.format("/images/%s", employee.isPilot() ? "Pilot.png" : "NotPilot.png");
-        imgPilot.setImage(new Image(imgSrcPilot));
-        String imgSrcDriver =
-                String.format("/images/%s", employee.isDriver() ? "Driver.png" : "NotDriver.png");
-        imgDriver.setImage(new Image(imgSrcDriver));
-    }
-
-    public static EmployeeListItemController createEmployeeListItemController(
-            SpringFXMLLoader fxmlLoader, Employee employee) throws IOException {
-        EmployeeListItemController controller = createEmployeeListItemController(fxmlLoader);
-        controller.setData(employee);
-        return controller;
-    }
-
-    public static EmployeeListItemController createEmployeeListItemController(
-            SpringFXMLLoader loader) throws IOException {
-        FXMLWrapper<Object, EmployeeListItemController> wrapper =
-                loader.loadAndWrap("/fxml/employeeListItem.fxml", EmployeeListItemController.class);
-        Node root = (Node) wrapper.getLoadedObject();
-        EmployeeListItemController controller = wrapper.getController();
-        controller.rootElement = root;
-        return controller;
-    }
-
-    public Employee getEmployee() {
-        return employee;
-    }
-
-    public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) {
-        this.consumerEmployeeClicked = consumerEmployeeClicked;
-    }
-
-    public void setConsumerEmployeeListItemClicked(
-            Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) {
-        this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java
deleted file mode 100644
index a1d1f70..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
-import java.io.IOException;
-import java.util.function.Consumer;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.TextField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@Scope("prototype")
-public class FilterEmployeesController {
-    private static final Logger LOG = LoggerFactory.getLogger(FilterEmployeesController.class);
-
-    @FXML private TextField inputFilterString;
-
-    private Consumer<String> consumerFilterTextChanged;
-    private Runnable consumerAddEmployeeClicked;
-
-    private Node rootElement;
-
-    @FXML
-    private void onAddEmployeeClicked() {
-        LOG.debug("Button \"Person hinzufügen\" clicked.");
-        if (consumerAddEmployeeClicked != null) {
-            consumerAddEmployeeClicked.run();
-        }
-    }
-
-    @FXML
-    private void onFilterTextChanged() {
-        LOG.debug("Filter text changed.");
-        if (consumerFilterTextChanged != null) {
-            consumerFilterTextChanged.accept(inputFilterString.getText());
-        }
-    }
-
-    public void setOnFilterTextChangedListener(Consumer<String> callback) {
-        this.consumerFilterTextChanged = callback;
-    }
-
-    public void setOnAddEmployeeClickedListener(Runnable callback) {
-        this.consumerAddEmployeeClicked = callback;
-    }
-
-    public static FilterEmployeesController createFilterEmployeesController(
-            SpringFXMLLoader fxmlLoader) throws IOException {
-        FXMLWrapper<Object, FilterEmployeesController> wrapper =
-                fxmlLoader.loadAndWrap(
-                        "/fxml/filterEmployeesControl.fxml", FilterEmployeesController.class);
-        Node root = (Node) wrapper.getLoadedObject();
-        FilterEmployeesController controller = wrapper.getController();
-        controller.rootElement = root;
-        return controller;
-    }
-
-    public Node getRootElement() {
-        return rootElement;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
deleted file mode 100644
index 694c804..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ButtonType;
-
-public class Helper {
-
-    static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
-    static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
-    static final String ALERT_TITLE_SUCCESS = "Erfolg";
-
-    private Helper() {} // SonarLint insisted to create a private constructor to hide the public one
-
-    static void showValidationErrorAlertAndWait(String message) {
-        showAlertWithOkButtonAndWait(AlertType.ERROR, ALERT_TITLE_VALIDATION_ERROR, message);
-    }
-
-    static void showServiceExceptionAlertAndWait(String message) {
-        showAlertWithOkButtonAndWait(AlertType.ERROR, ALERT_TITLE_SERVICE_EXCEPTION, message);
-    }
-
-    static void showSuccessAlertAndWait(String message) {
-        showAlertWithOkButtonAndWait(AlertType.INFORMATION, ALERT_TITLE_SUCCESS, message);
-    }
-
-    static void showAlertWithOkButtonAndWait(
-            AlertType alertType, String headerText, String contentText) {
-        Alert alert = new Alert(alertType, contentText, ButtonType.OK);
-        alert.setTitle(headerText);
-        alert.setHeaderText(headerText);
-        alert.showAndWait();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
deleted file mode 100644
index 3aaf040..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-import javafx.fxml.FXML;
-import javafx.scene.layout.AnchorPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class ManageEmployeesController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ManageEmployeesController.class);
-    @FXML private AnchorPane listEmployeesAP;
-    @FXML private AnchorPane containerHeader;
-    @FXML private EmployeeListController employeeListController;
-
-    private final EmployeeService employeeService;
-    private final SpringFXMLLoader fxmlLoader;
-
-    private final CreateOperationController createOperationController;
-
-    public ManageEmployeesController(
-            EmployeeService employeeService,
-            SpringFXMLLoader fxmlLoader,
-            CreateOperationController createOperationController) {
-        this.employeeService = employeeService;
-        this.fxmlLoader = fxmlLoader;
-        this.createOperationController = createOperationController;
-    }
-
-    @FXML
-    private void initialize() {
-        openFilter();
-    }
-
-    private void openFilter() {
-        try {
-            FilterEmployeesController filterEmployeesController =
-                    FilterEmployeesController.createFilterEmployeesController(fxmlLoader);
-            containerHeader.getChildren().clear();
-            containerHeader.getChildren().add(filterEmployeesController.getRootElement());
-            filterEmployeesController.setOnFilterTextChangedListener(this::updateEmployeeList);
-            filterEmployeesController.setOnAddEmployeeClickedListener(this::openAddEmployee);
-            updateEmployeeList();
-
-        } catch (IOException e) {
-            LOG.error("IOException in openFilter().", e);
-        }
-    }
-
-    private void openAddEmployee() {
-        employeeListController.deselectAllEmployees();
-        openEmployee(null);
-    }
-
-    private void openEditEmployee(Employee employee) {
-        employeeListController.deselectAllEmployees();
-        employeeListController.selectEmployee(employee);
-        openEmployee(employee);
-    }
-
-    private void openEmployee(Employee employee) {
-        try {
-            CreateNewEmployeeController createNewEmployeeController =
-                    employee == null
-                            ? CreateNewEmployeeController.createCreateNewEmployeeController(
-                                    fxmlLoader)
-                            : CreateNewEmployeeController.createCreateNewEmployeeController(
-                                    fxmlLoader, employee);
-            containerHeader.getChildren().clear();
-            containerHeader.getChildren().add(createNewEmployeeController.getRootElement());
-            createNewEmployeeController.setConsumerCancelClicked(this::openFilter);
-            createNewEmployeeController.setConsumerCreateClicked(this::openFilter);
-        } catch (IOException e) {
-            LOG.error("IOException in openEmployee(). ", e);
-        }
-    }
-
-    private void updateEmployeeList() {
-        updateEmployeeList("");
-    }
-
-    private void updateEmployeeList(String searchString) {
-
-        try {
-            employeeListController.setData(
-                    employeeService
-                            .list()
-                            .stream()
-                            .filter(
-                                    employee ->
-                                            searchString.trim().isEmpty()
-                                                    || employee.name()
-                                                            .toLowerCase()
-                                                            .contains(searchString.toLowerCase()))
-                            .collect(Collectors.toCollection(HashSet::new)),
-                    this::openEditEmployee);
-
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in updateEmployeeList(). ", e);
-        }
-    }
-
-    public void setVisible(boolean b) {
-        listEmployeesAP.setVisible(b);
-    }
-
-    public void backToMain() {
-        LOG.debug("Hyperlink \"Zurück\" clicked.");
-        this.setVisible(false);
-        createOperationController.setVisible(true);
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
deleted file mode 100644
index c0c68f3..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showAlertWithOkButtonAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showSuccessAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showValidationErrorAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class OperationDetailsController {
-    private static final Logger LOG = LoggerFactory.getLogger(OperationDetailsController.class);
-
-    public Operation operation;
-    private final OperationService operationService;
-    private final VehicleService vehicleService;
-    private final CreateOperationController createOperationController;
-    @FXML private FlowPane fpVehicles;
-    @FXML private ListView<Operation> lvActiveOperations;
-    @FXML private Label lblChosenVehicles;
-    @FXML private Button btnCloseOperation;
-    @FXML private Button btnCancelOperation;
-    @FXML private Label lblCode, lblAdditionalInfo, lblAddress;
-    @FXML private AnchorPane operationDetailsAP;
-
-    public OperationDetailsController(
-            OperationService operationService,
-            VehicleService vehicleService,
-            CreateOperationController createOperationController) {
-        this.operationService = operationService;
-        this.vehicleService = vehicleService;
-        this.createOperationController = createOperationController;
-    }
-
-    @FXML
-    private void initialize() {
-        lvActiveOperations.setCellFactory(
-                param -> CreateOperationController.generateOpCodeListItem());
-        lvActiveOperations.setOnMouseClicked(
-                event -> {
-                    if (event.getClickCount() == 2) {
-                        if (lvActiveOperations.getSelectionModel().getSelectedItem() == null) {
-                            return;
-                        }
-                        initOperation(lvActiveOperations.getSelectionModel().getSelectedItem());
-                    }
-                });
-    }
-
-    private void updateFlowPane() {
-        try {
-            fpVehicles.getChildren().clear();
-            for (Vehicle vehicle : operation.vehicles()) {
-                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
-                controller.setData(vehicle, true, true);
-                controller.getBtnRequest().setOnAction(e -> requestVehicleClicked(controller));
-                fpVehicles.getChildren().add(controller.getRootElement());
-            }
-        } catch (IOException e) {
-            LOG.error("Error while updating list.", e);
-            showServiceExceptionAlertAndWait("Error while updating list.");
-        }
-    }
-
-    void initOperation(Operation operation) {
-        fillActiveList();
-        this.operation = operation;
-        lblCode.setText(operation.opCode());
-        Collection<String> vehicleNames =
-                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
-        String result = String.join(", ", vehicleNames);
-        lblChosenVehicles.setText(result.toString());
-        lblAdditionalInfo.setText(operation.additionalInfo());
-        lblAddress.setText(operation.destination());
-        updateFlowPane();
-        operationDetailsAP.setVisible(true);
-    }
-
-    private void fillActiveList() {
-        try {
-            lvActiveOperations.setItems(
-                    FXCollections.observableArrayList(
-                            operationService.list(EnumSet.of(Status.ACTIVE))));
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in fillActiveList(). ", e);
-            showServiceExceptionAlertAndWait(e.getMessage());
-        }
-    }
-
-    @FXML
-    public void closeOperationClicked() {
-        LOG.debug("Button \"Abschließen\" clicked.");
-        try {
-            operationService.complete(operation.id(), Status.COMPLETED);
-        } catch (InvalidOperationException e) {
-            LOG.debug("Validation error in closeOperationClicked(). ", e);
-            showAlertWithOkButtonAndWait(AlertType.ERROR, "Validierungsfehler", e.getMessage());
-            return;
-        } catch (ServiceException e) {
-            LOG.error("Exception in closeOperationClicked(). ", e);
-            showServiceExceptionAlertAndWait(e.getMessage());
-            return;
-        }
-        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
-        createOperationController.updateList();
-        closeWindow();
-    }
-
-    public void cancelOperationClicked() {
-        LOG.debug("Button \"Stornieren\" clicked.");
-        try {
-            operationService.complete(operation.id(), Status.CANCELLED);
-        } catch (InvalidOperationException e) {
-            LOG.debug("Validation error in cancelOperationClicked(). ", e);
-            showValidationErrorAlertAndWait(e.getMessage());
-            return;
-        } catch (ServiceException e) {
-            LOG.error("Exception in cancelOperationClicked(). ", e);
-            showServiceExceptionAlertAndWait(e.getMessage());
-            return;
-        }
-        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
-        createOperationController.updateList();
-        closeWindow();
-    }
-
-    private void requestVehicleClicked(VehiclePaneController v) {
-        LOG.debug("Button \"Nachfordern\" clicked.");
-
-        try {
-            operationService.requestVehicles(operation.id(), Set.of(v.getData().id()));
-        } catch (ServiceException | InvalidOperationException | InvalidVehicleException e) {
-            LOG.error("Exception in requestVehicleClicked()", e);
-            showServiceExceptionAlertAndWait(e.getMessage());
-            return;
-        }
-        showSuccessAlertAndWait("Das Fahrzeug wurde erfolgreich angefordert");
-        createOperationController.updateList();
-    }
-
-    public void closeWindow() {
-        LOG.debug("Hyperlink \"Zurück\" clicked.");
-        operationDetailsAP.setVisible(false);
-        this.createOperationController.setVisible(true);
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
deleted file mode 100644
index d1b325c..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.text.Text;
-
-public class OperationInArchiveController {
-
-    @FXML private Text txtAddress;
-    @FXML private Text txtVehicles;
-    @FXML private Text txtDate;
-    @FXML private Text txtOpCode;
-
-    static OperationInArchiveController create() throws IOException {
-        FXMLLoader fxmlLoader =
-                new FXMLLoader(
-                        OperationInArchiveController.class.getResource(
-                                "/fxml/OperationInArchive.fxml"));
-        Node root = fxmlLoader.load();
-        OperationInArchiveController result = fxmlLoader.getController();
-        result.rootElement = root;
-
-        return result;
-    }
-
-    public Node getRoot() {
-        return rootElement;
-    }
-
-    private Node rootElement;
-
-    public void set(Operation operation) {
-        txtAddress.setText(operation.destination());
-        String date = "am ";
-        if (operation.created() != null) {
-            LocalDateTime myDateTime =
-                    LocalDateTime.ofInstant(
-                            Objects.requireNonNull(operation.created()), ZoneOffset.UTC);
-            date +=
-                    myDateTime.getDayOfMonth()
-                            + "."
-                            + myDateTime.getMonth().getValue()
-                            + "."
-                            + myDateTime.getYear();
-            txtDate.setText(date);
-        } else {
-            txtDate.setText("---");
-        }
-        txtOpCode.setText(operation.opCode());
-        Collection<String> elements =
-                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
-        String result = String.join(", ", elements);
-
-        txtVehicles.setText(result);
-    }
-}
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
deleted file mode 100644
index ed5a12d..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showServiceExceptionAlertAndWait;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.showValidationErrorAlertAndWait;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.RegistrationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.VBox;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class RegistrationWindowController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RegistrationWindowController.class);
-
-    private final EmployeeService employeeService;
-    private final VehicleService vehicleService;
-    private final RegistrationService registrationService;
-    private final CreateOperationController createOperationController;
-    private final SpringFXMLLoader fxmlLoader;
-
-    @FXML private GridPane root;
-    @FXML private VBox vbVehicles;
-    @FXML private ScrollPane listEmployee;
-    @FXML private ChoiceBox<Integer> cbStart;
-    @FXML private ChoiceBox<Integer> cbEnd;
-    @FXML private Label lVehicles;
-    @FXML private Label lEmployees;
-    @FXML private TextField tfVehicleSearch;
-    @FXML private TextField tfEmployeeSearch;
-    private EmployeeListController employeeListController;
-
-    private Vehicle chosenVehicle;
-    private List<Employee> chosenEmployees = new LinkedList<>();
-
-    public RegistrationWindowController(
-            EmployeeService employeeService,
-            VehicleService vehicleService,
-            CreateOperationController createOperationController,
-            RegistrationService registrationService,
-            SpringFXMLLoader fxmlLoader) {
-        this.employeeService = employeeService;
-        this.vehicleService = vehicleService;
-        this.createOperationController = createOperationController;
-        this.registrationService = registrationService;
-        this.fxmlLoader = fxmlLoader;
-    }
-
-    @FXML
-    private void initialize() throws IOException {
-        employeeListController = EmployeeListController.createEmployeeListController(fxmlLoader);
-        employeeListController.setListItemMargins(new Insets(10, 6, 0, 6));
-        //        listEmployee. .getChildren().add(employeeListController.getRootElement());
-        Node emplList = employeeListController.getRootElement();
-        //        emplList.(360);
-        listEmployee.setContent(emplList);
-
-        ObservableList<Integer> hours =
-                FXCollections.observableArrayList(
-                        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-                        21, 22, 23);
-        cbStart.setItems(hours);
-        cbStart.setValue(0);
-        cbEnd.setItems(hours);
-        cbEnd.setValue(12);
-
-        reset();
-    }
-
-    private void updateEmplList() {
-        employeeListController.deselectAllEmployees();
-
-        try {
-            Set<Employee> employees =
-                    employeeService
-                            .list()
-                            .stream()
-                            .filter(
-                                    e ->
-                                            e.name()
-                                                    .toLowerCase()
-                                                    .contains(
-                                                            tfEmployeeSearch
-                                                                    .getText()
-                                                                    .toLowerCase()))
-                            .collect(Collectors.toCollection(HashSet::new));
-            employeeListController.setData(
-                    employees,
-                    selection -> {
-                        if (selection == null) {
-                            return;
-                        } else if (chosenEmployees.contains(selection)) {
-                            chosenEmployees.remove(selection);
-                        } else {
-                            chosenEmployees.add(selection);
-                        }
-
-                        StringBuilder text = new StringBuilder();
-                        boolean first = true;
-                        for (Employee employee : chosenEmployees) {
-                            if (!first) {
-                                text.append(", ");
-                            }
-                            text.append(employee.name());
-                            first = false;
-                        }
-                        lEmployees.setText(text.toString());
-                    },
-                    contr -> contr.setSelected(chosenEmployees.contains(contr.getEmployee())));
-
-            employees.forEach(
-                    e -> {
-                        if (chosenEmployees.contains(e)) employeeListController.selectEmployee(e);
-                    });
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in updateEmplList(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Auflisten des Personals ist ein Fehler aufgetreten.");
-        }
-    }
-
-    private void updateVehList() {
-        vbVehicles.getChildren().clear();
-
-        try {
-            Set<Vehicle> vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
-
-            boolean anyMatch = false;
-
-            for (Vehicle vehicle : vehicles) {
-                if (!vehicle.name().toLowerCase().contains(tfVehicleSearch.getText().toLowerCase()))
-                    continue;
-
-                anyMatch = true;
-
-                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
-                vp.setData(vehicle, false, false);
-                vbVehicles.getChildren().add(vp.getRootElement());
-
-                vp.getRootElement()
-                        .setOnMouseClicked(
-                                event -> {
-                                    if (event.getButton() == MouseButton.PRIMARY) {
-                                        chosenVehicle = vehicle;
-                                        lVehicles.setText(chosenVehicle.name());
-                                        updateVehList();
-                                    }
-                                });
-                if (chosenVehicle != null && chosenVehicle.id() == vehicle.id())
-                    vp.setSelected(true);
-            }
-
-            if (!anyMatch) {
-                // Kind of ugly, but best way to get the size of a VehiclePane
-                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
-                vp.getRootElement().setVisible(false);
-                vbVehicles.getChildren().add(vp.getRootElement());
-            }
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in updateVehList(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Auflisten der Fahrzeuge ist ein Fehler aufgetreten");
-        } catch (IOException e) {
-            LOG.error("IOException in updateVehList(). ", e);
-            showServiceExceptionAlertAndWait("Beim Laden der Fahrzeuge ist ein Fehler aufgetreten");
-        }
-    }
-
-    public void cancel() {
-        LOG.debug("Hyperlink \"schließen\" clicked");
-        reset();
-        this.setVisible(false);
-        createOperationController.setVisible(true);
-    }
-
-    private void reset() {
-        chosenEmployees.clear();
-        chosenVehicle = null;
-        tfEmployeeSearch.setText("");
-        tfVehicleSearch.setText("");
-        lEmployees.setText("-");
-        lVehicles.setText("-");
-        updateVehList();
-        updateEmplList();
-    }
-
-    public void create() {
-        LOG.debug("Button \"ERSTELLEN\" clicked");
-
-        Set<Registration> registrations = new HashSet<>();
-        try {
-            if (chosenVehicle == null) {
-                throw new InvalidVehicleException("no Vehicle");
-            }
-            for (Employee employee : chosenEmployees) {
-                registrations.add(
-                        Registration.builder()
-                                .id(chosenVehicle.id())
-                                .employee(employee)
-                                .start(
-                                        LocalDateTime.of(
-                                                        LocalDate.now(),
-                                                        LocalTime.of(cbStart.getValue(), 0))
-                                                .toInstant(OffsetDateTime.now().getOffset()))
-                                .end(
-                                        LocalDateTime.of(
-                                                        LocalDate.now(),
-                                                        LocalTime.of(cbEnd.getValue(), 0))
-                                                .toInstant(OffsetDateTime.now().getOffset()))
-                                .build());
-            }
-
-            registrationService.add(chosenVehicle.id(), registrations);
-            chosenEmployees.clear();
-            // ((Stage) lVehicles.getScene().getWindow()).close();
-            this.setVisible(false);
-            createOperationController.setVisible(true);
-            reset();
-        } catch (InvalidVehicleException e) {
-            LOG.debug("Validation of Vehicle in Registration failed.");
-            showValidationErrorAlertAndWait("Das spezifizierte Fahrzeug ist nicht gültig.");
-        } catch (ServiceException e) {
-            LOG.error("ServiceException in create(). ", e);
-            showServiceExceptionAlertAndWait(
-                    "Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
-        } catch (InvalidRegistrationException e) {
-            LOG.debug("Validation of Registration failed.");
-            showValidationErrorAlertAndWait(
-                    "Die gewählte Kombination von Fahrzeug und Personal ist nicht gültig!");
-        }
-    }
-
-    public void setVisible(boolean b) {
-        root.setVisible(b);
-        reset();
-    }
-
-    public void tfVehicleSearch_TextChanged(KeyEvent keyEvent) {
-        updateVehList();
-    }
-
-    public void tfEmployeeSearch_TextChanged(KeyEvent keyEvent) {
-        updateEmplList();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
deleted file mode 100644
index b31228d..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import java.io.IOException;
-import java.time.Instant;
-import java.util.List;
-import java.util.Optional;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.text.Text;
-
-public class VehiclePaneController extends CustomListItemController {
-
-    public static VehiclePaneController createVehiclePane() throws IOException {
-        FXMLLoader fxmlLoader =
-                new FXMLLoader(VehiclePaneController.class.getResource("/fxml/vehiclePane.fxml"));
-        Node root = fxmlLoader.load();
-        VehiclePaneController result = fxmlLoader.getController();
-        result.rootElement = root;
-
-        return result;
-    }
-
-    @FXML private Label txtStatus;
-    @FXML private Text txtType;
-    @FXML private Text txtNumber;
-    @FXML private ImageView ivNEF;
-    @FXML private Text txtNEF;
-    @FXML private ImageView ivQualification;
-    @FXML private Text txtQualification;
-    @FXML private Text txtRooftype;
-    @FXML private Button btnRequest;
-
-    private Vehicle data;
-
-    public Vehicle getData() {
-        return data;
-    }
-
-    /**
-     * * Set the displayed data of this VehiclePane.
-     *
-     * @param vehicle The data to display.
-     * @param showStatusInfo If true, the highest qualification of the vehicle's active registration
-     *     and the vehicle's status will be shown.
-     */
-    public void setData(Vehicle vehicle, boolean showStatusInfo, boolean showRequestVehicle) {
-        txtType.setText(vehicle.type().name());
-        String constrType = vehicle.constructionType().name();
-        txtRooftype.setText(
-                constrType.substring(0, 1).toUpperCase() + constrType.substring(1).toLowerCase());
-        txtNumber.setText("-" + vehicle.id());
-        if (vehicle.hasNef()) {
-            ivNEF.setImage(new Image("images/NEF.png"));
-            txtNEF.setText("hat NEF-Halterung");
-        } else {
-            ivNEF.setImage(new Image("images/NotNEF.png"));
-            txtNEF.setText("keine NEF-Halterung");
-        }
-
-        if (showRequestVehicle) {
-            btnRequest.setVisible(true);
-            btnRequest.setManaged(true);
-        } else {
-            btnRequest.setVisible(false);
-            btnRequest.setManaged(false);
-        }
-
-        if (showStatusInfo) {
-            txtStatus.setText(vehicle.status().name());
-            if (vehicle.status() == Status.FREI_FUNK || vehicle.status() == Status.FREI_WACHE) {
-                txtStatus.getStyleClass().add("bg-status-green");
-            } else {
-                txtStatus.getStyleClass().add("bg-status-orange");
-            }
-
-            Instant now = Instant.now();
-            List<Registration> regs = vehicle.registrations();
-
-            if (regs == null) {
-                return;
-            }
-
-            Optional<EducationLevel> edu =
-                    regs.stream()
-                            .filter(reg -> reg.start().isBefore(now) && reg.end().isAfter(now))
-                            .map(reg -> reg.employee().educationLevel())
-                            .max(EducationLevel::compareTo);
-
-            if (!edu.isPresent()) {
-                return;
-            }
-
-            txtQualification.setText(edu.get().name());
-        } else {
-            txtQualification.setVisible(false);
-            txtQualification.setManaged(false);
-            ivQualification.setVisible(false);
-            ivQualification.setManaged(false);
-
-            txtStatus.setVisible(false);
-        }
-
-        this.data = vehicle;
-    }
-
-    public Button getBtnRequest() {
-        return btnRequest;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAO.java
deleted file mode 100644
index 539a8e5..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import java.util.Set;
-
-public interface EmployeeDAO {
-
-    /**
-     * Persist the given employee.
-     *
-     * @param employee that should be stored
-     * @return the id that was assigned
-     * @throws PersistenceException if the employee could not be persisted
-     */
-    long add(Employee employee) throws PersistenceException;
-
-    /**
-     * Update the given employee.
-     *
-     * @param employee that should be updated
-     * @throws ElementNotFoundException if no employee with the given id exists
-     * @throws PersistenceException if the employee could not be updated
-     */
-    void update(Employee employee) throws ElementNotFoundException, PersistenceException;
-
-    /**
-     * Get all stored employees.
-     *
-     * @return list containing all stored employees
-     * @throws PersistenceException if loading the stored employees failed
-     */
-    Set<Employee> list() throws PersistenceException;
-
-    /**
-     * Remove employee with the given id from the store.
-     *
-     * @param id of the employee that should be removed
-     * @throws ElementNotFoundException if no employee with the given id exists
-     * @throws PersistenceException if the employee could not be removed
-     */
-    void remove(long id) throws ElementNotFoundException, PersistenceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java
deleted file mode 100644
index 1d8286b..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.time.LocalDate;
-import java.util.HashSet;
-import java.util.Set;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class EmployeeDatabaseDAO implements EmployeeDAO {
-
-    private JDBCConnectionManager jdbcConnectionManager;
-
-    public EmployeeDatabaseDAO(JDBCConnectionManager jdbcConnectionManager) {
-        this.jdbcConnectionManager = jdbcConnectionManager;
-    }
-
-    private long createEmployeeVersion(Connection con, Employee e)
-            throws PersistenceException, SQLException {
-        String sql =
-                "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
-                        + "VALUES(?, ?, ?, ?, ?)";
-
-        try (PreparedStatement pstmt = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-            pstmt.setString(1, e.name());
-            pstmt.setObject(2, e.birthday());
-            pstmt.setInt(3, e.educationLevel().ordinal());
-            pstmt.setBoolean(4, e.isDriver());
-            pstmt.setBoolean(5, e.isPilot());
-            pstmt.executeUpdate();
-
-            try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                if (!rs.next()) throw new PersistenceException("Failed to insert EmployeeVersion");
-
-                return rs.getLong(1);
-            }
-        }
-    }
-
-    @Override
-    public long add(Employee employee) throws PersistenceException {
-        String sql = "INSERT INTO Employee(version) VALUES(?)";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-
-            long versionId = createEmployeeVersion(con, employee);
-
-            try (PreparedStatement pstmt =
-                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setLong(1, versionId);
-                pstmt.executeUpdate();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next()) {
-                        con.rollback();
-                        throw new PersistenceException("Failed to insert Employee");
-                    }
-
-                    con.commit();
-                    return rs.getLong(1);
-                }
-            }
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void update(Employee employee) throws ElementNotFoundException, PersistenceException {
-        String sql = "UPDATE Employee SET version = ? WHERE id = ?";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-
-            long versionId = createEmployeeVersion(con, employee);
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, versionId);
-                pstmt.setLong(2, employee.id());
-
-                if (pstmt.executeUpdate() != 1) {
-                    con.rollback();
-                    throw new ElementNotFoundException("No such employeeId exists");
-                }
-            }
-
-            con.commit();
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public Set<Employee> list() throws PersistenceException {
-        String sql =
-                "SELECT emp.id, v.name, v.birthday, v.educationLevel, v.isDriver, v.isPilot "
-                        + "FROM employee emp "
-                        + "JOIN EmployeeVersion v ON v.id = emp.version";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            Set<Employee> employees = new HashSet<>();
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    while (rs.next()) {
-                        employees.add(
-                                Employee.builder()
-                                        .id(rs.getLong(1))
-                                        .name(rs.getString(2))
-                                        .birthday(rs.getObject(3, LocalDate.class))
-                                        .educationLevel(EducationLevel.valueOf(rs.getString(4)))
-                                        .isDriver(rs.getBoolean(5))
-                                        .isPilot(rs.getBoolean(6))
-                                        .build());
-                    }
-                }
-            }
-
-            return employees;
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
deleted file mode 100644
index d82f768..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import java.util.EnumSet;
-import java.util.Set;
-
-public interface OperationDAO {
-
-    /**
-     * Persist the given operation.
-     *
-     * @param operation that should be stored
-     * @return the id that was assigned
-     * @throws PersistenceException if the operation could not be persisted
-     */
-    long add(Operation operation) throws PersistenceException;
-
-    /**
-     * Update the given operation.
-     *
-     * @param operation that should be updated
-     * @throws ElementNotFoundException if no operation with the given id exists
-     * @throws PersistenceException if the operation could not be updated
-     */
-    void update(Operation operation) throws ElementNotFoundException, PersistenceException;
-
-    /**
-     * Returns the operation with the given id.
-     *
-     * @param operationId id of the operation that should be returned
-     * @return operation with the given id
-     * @throws ElementNotFoundException if no operation with the given id exists
-     * @throws PersistenceException if the operation could not be loaded
-     */
-    Operation get(long operationId) throws ElementNotFoundException, PersistenceException;
-
-    /**
-     * Get all stored operations with matching status.
-     *
-     * @param statuses set containing all statuses that should be matched
-     * @return list containing all matched operations
-     * @throws PersistenceException if loading the stored operations failed
-     */
-    Set<Operation> list(EnumSet<Status> statuses) throws PersistenceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
deleted file mode 100644
index 0b6ce08..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.lang.NonNull;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class OperationDatabaseDAO implements OperationDAO {
-
-    private JDBCConnectionManager jdbcConnectionManager;
-    private VehicleDAO vehicleDAO;
-
-    public OperationDatabaseDAO(
-            JDBCConnectionManager jdbcConnectionManager, VehicleDAO vehicleDAO) {
-        this.jdbcConnectionManager = jdbcConnectionManager;
-        this.vehicleDAO = vehicleDAO;
-    }
-
-    @Override
-    public long add(@NonNull Operation o) throws PersistenceException {
-        String sql =
-                "INSERT INTO Operation(opCode, severity, created, destination, additionalInfo,"
-                        + "            status) VALUES (?, ?, ?, ?, ?, ?)";
-        String sql2 = "INSERT INTO VehicleOperation(vehicleId, operationId) VALUES (?, ?)";
-        long operationId;
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setString(1, o.opCode());
-                pstmt.setInt(2, o.severity().ordinal());
-                pstmt.setObject(3, OffsetDateTime.ofInstant(o.created(), ZoneId.systemDefault()));
-                pstmt.setString(4, o.destination());
-                pstmt.setString(5, o.additionalInfo());
-                pstmt.setInt(6, o.status().ordinal());
-                pstmt.executeUpdate();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next()) throw new PersistenceException("Failed to persist operation");
-
-                    operationId = rs.getLong(1);
-                }
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
-                pstmt.setLong(2, operationId);
-
-                for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
-                    pstmt.setLong(1, id);
-                    pstmt.addBatch();
-                }
-
-                pstmt.executeBatch();
-            }
-            con.commit();
-            return operationId;
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void update(@NonNull Operation o) throws ElementNotFoundException, PersistenceException {
-        // Note this will, by design, not update created
-        String sql =
-                "UPDATE Operation SET opCode = ?, severity = ?, destination = ?,"
-                        + " additionalInfo = ?, status = ? WHERE id = ?";
-        String sql2 = "DELETE FROM VehicleOperation WHERE operationId = ?";
-        String sql3 = "INSERT INTO VehicleOperation(vehicleId, operationId) VALUES (?, ?)";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setString(1, o.opCode());
-                pstmt.setInt(2, o.severity().ordinal());
-                pstmt.setString(3, o.destination());
-                pstmt.setString(4, o.additionalInfo());
-                pstmt.setInt(5, o.status().ordinal());
-                pstmt.setLong(6, o.id());
-
-                if (pstmt.executeUpdate() != 1)
-                    throw new ElementNotFoundException("No such operationId exists");
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
-                pstmt.setLong(1, o.id());
-                pstmt.executeUpdate();
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
-                pstmt.setLong(2, o.id());
-
-                for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
-                    pstmt.setLong(1, id);
-                    pstmt.addBatch();
-                }
-
-                pstmt.executeBatch();
-            }
-            con.commit();
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public Operation get(long operationId) throws ElementNotFoundException, PersistenceException {
-        String sql = "Select * from operation where id = ?";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, operationId);
-                pstmt.execute();
-
-                try (ResultSet rs = pstmt.getResultSet()) {
-                    if (!rs.next())
-                        throw new ElementNotFoundException("No such element could be found");
-
-                    return operationFromRS(rs);
-                }
-            }
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public Set<Operation> list(EnumSet<Status> statuses) throws PersistenceException {
-        // This hack exists because H2 currently has a bug that prevents IN (?) with an array of
-        // ids, i.e. pstmt.setArray(1, con.createArrayOf("INT", intarray) from working. See
-        // commented code below.
-
-        // SELECT * FROM Operation WHERE status IN ('COMPLETED', 'CANCELLED') is BUGGED on H2!
-        // for this reason we use the ordinal values instead
-        String str =
-                statuses.stream()
-                        .map(e -> Integer.toString(e.ordinal()))
-                        .collect(Collectors.joining(","));
-
-        String sql = "SELECT * FROM Operation WHERE status IN (" + str + ")";
-        Set<Operation> operations = new HashSet<>();
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                // Object[] arr = statuses.stream().map(Enum::ordinal).toArray();
-                // pstmt.setArray(1, con.createArrayOf("INT", arr));
-
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    while (rs.next()) operations.add(operationFromRS(rs));
-                }
-            }
-
-            return operations;
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-    }
-
-    private Operation operationFromRS(ResultSet rs) throws PersistenceException, SQLException {
-        Long operationId = rs.getLong("id");
-
-        return Operation.builder()
-                .id(operationId)
-                .opCode(rs.getString("opCode"))
-                .severity(Severity.valueOf(rs.getString("severity")))
-                .status(Status.valueOf(rs.getString("status")))
-                .vehicles(getVehiclesFromOperationId(operationId))
-                .created((rs.getObject("created", OffsetDateTime.class)).toInstant())
-                .destination(rs.getString("destination"))
-                .additionalInfo(rs.getString("additionalInfo"))
-                .build();
-    }
-
-    private Set<Vehicle> getVehiclesFromOperationId(long operationId) throws PersistenceException {
-        String sql = "SELECT vehicleId FROM VehicleOperation WHERE operationId = ?";
-        Set<Vehicle> vehicles = new HashSet<>();
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, operationId);
-                pstmt.execute();
-
-                try (ResultSet rs = pstmt.getResultSet()) {
-                    while (rs.next()) {
-                        vehicles.add(vehicleDAO.get(rs.getLong("vehicleId")));
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        } catch (ElementNotFoundException e) {
-            throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
-        }
-
-        return vehicles;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAO.java
deleted file mode 100644
index 36b6f1b..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import java.util.Set;
-
-public interface RegistrationDAO {
-
-    /**
-     * Persist the given registration.
-     *
-     * @param vehicleId the id of the target vehicle
-     * @param registrations that should be stored
-     * @return a list of the ids that were assigned
-     * @throws PersistenceException if the registration could not be persisted
-     */
-    Set<Long> add(long vehicleId, Set<Registration> registrations) throws PersistenceException;
-
-    /**
-     * Make registration with the given id inactive.
-     *
-     * @param id of the registration that should be made inactive
-     * @throws ElementNotFoundException if no registration with the given id exists
-     * @throws PersistenceException if the registration could not be made inactive
-     */
-    void remove(long id) throws ElementNotFoundException, PersistenceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
deleted file mode 100644
index 9f7ac84..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class RegistrationDatabaseDAO implements RegistrationDAO {
-
-    private JDBCConnectionManager jdbcConnectionManager;
-    private EmployeeDAO employeePersistence;
-
-    @Autowired
-    public RegistrationDatabaseDAO(
-            JDBCConnectionManager jdbcConnectionManager, EmployeeDAO employeePersistence) {
-        this.jdbcConnectionManager = jdbcConnectionManager;
-        this.employeePersistence = employeePersistence;
-    }
-
-    @Override
-    public Set<Long> add(long vehicleId, Set<Registration> registrations)
-            throws PersistenceException {
-        String sql =
-                "INSERT INTO Registration (vehicleId, employeeId, start, end, active) VALUES (?,?,?,?,?)";
-        String sql2 = "UPDATE Vehicle SET status = 'FREI_WACHE' WHERE id = ?;";
-
-        Set<Long> vehicleIds = new HashSet<>();
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-
-            try (PreparedStatement pstmt =
-                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setLong(1, vehicleId);
-
-                for (Registration r : registrations) {
-                    pstmt.setLong(2, r.employee().id());
-                    pstmt.setObject(3, OffsetDateTime.ofInstant(r.start(), ZoneId.systemDefault()));
-                    pstmt.setObject(4, OffsetDateTime.ofInstant(r.end(), ZoneId.systemDefault()));
-                    pstmt.setBoolean(5, true);
-                    pstmt.addBatch();
-                }
-
-                pstmt.executeBatch();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    while (rs.next()) vehicleIds.add(rs.getLong(1));
-                }
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
-                pstmt.setLong(1, vehicleId);
-                if (pstmt.executeUpdate() != 1) {
-                    con.rollback();
-                    throw new PersistenceException("Failed to persist registration");
-                }
-            }
-
-            con.commit();
-            return vehicleIds;
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {
-        throw new UnsupportedOperationException();
-    }
-
-    protected List<Registration> list(long vehicleId) throws PersistenceException {
-        String sql = "SELECT * FROM Registration WHERE vehicleId = ?";
-
-        List<Registration> registrationList = new ArrayList<>();
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, vehicleId);
-
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    while (rs.next()) {
-                        long employeeId = rs.getLong("employeeId");
-                        // TODO: replace the following with employeePersistence.get once implemented
-                        Employee emp =
-                                employeePersistence
-                                        .list()
-                                        .stream()
-                                        .filter(employee -> employee.id() == employeeId)
-                                        .findAny()
-                                        .orElse(null);
-                        Registration registration =
-                                Registration.builder()
-                                        .id(rs.getLong("id"))
-                                        .start(
-                                                (rs.getObject("start", OffsetDateTime.class))
-                                                        .toInstant())
-                                        .end(
-                                                (rs.getObject("end", OffsetDateTime.class))
-                                                        .toInstant())
-                                        .employee(emp)
-                                        .build();
-                        registrationList.add(registration);
-                    }
-                }
-            }
-
-            return registrationList;
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAO.java
deleted file mode 100644
index 5782fd9..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAO.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import java.util.Set;
-
-public interface VehicleDAO {
-
-    /**
-     * Persist the given vehicle.
-     *
-     * @param vehicle that should be stored
-     * @return the id that was assigned
-     * @throws PersistenceException if the vehicle could not be persisted
-     */
-    long add(Vehicle vehicle) throws PersistenceException;
-
-    /**
-     * Update the given vehicle.
-     *
-     * @param vehicle that should be updated
-     * @throws ElementNotFoundException if no vehicle with the given id exists
-     * @throws PersistenceException if the vehicle could not be updated
-     */
-    void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException;
-
-    /**
-     * Get all stored vehicles.
-     *
-     * @return list containing all stored vehicles
-     * @throws PersistenceException if loading the stored vehicles failed
-     */
-    Set<Vehicle> list() throws PersistenceException;
-
-    /**
-     * Returns the vehicle with the given id.
-     *
-     * @param vehicleId id of the vehicle that should be returned
-     * @return vehicle with the given id
-     * @throws ElementNotFoundException if no vehicle with the given id exists
-     * @throws PersistenceException if the vehicle could not be loaded
-     */
-    Vehicle get(long vehicleId) throws ElementNotFoundException, PersistenceException;
-
-    /**
-     * Remove vehicle with the given id from the store.
-     *
-     * @param id of the vehicle that should be removed
-     * @throws ElementNotFoundException if no vehicle with the given id exists
-     * @throws PersistenceException if the vehicle could not be removed
-     */
-    void remove(long id) throws ElementNotFoundException, PersistenceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
deleted file mode 100644
index fcae6d3..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashSet;
-import java.util.Set;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class VehicleDatabaseDAO implements VehicleDAO {
-
-    private final JDBCConnectionManager jdbcConnectionManager;
-    private RegistrationDatabaseDAO registrationDatabaseDao;
-
-    public VehicleDatabaseDAO(
-            JDBCConnectionManager j, RegistrationDatabaseDAO registrationDatabaseDao) {
-        jdbcConnectionManager = j;
-        this.registrationDatabaseDao = registrationDatabaseDao;
-    }
-
-    @Override
-    public long add(Vehicle v) throws PersistenceException {
-        String sql =
-                "INSERT INTO VehicleVersion (name,hasNef,constructionType,type) VALUES (?,?,?,?)";
-        String sql2 = "INSERT INTO Vehicle (version,status) VALUES (?,?)";
-        String sql3 = "UPDATE VehicleVersion SET name=? WHERE id=?";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-            String name = "";
-            long version, id;
-
-            try (PreparedStatement pstmt =
-                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setString(1, name);
-                pstmt.setBoolean(2, v.hasNef());
-                pstmt.setInt(3, v.constructionType().ordinal());
-                pstmt.setString(4, v.type().name());
-                pstmt.executeUpdate();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next())
-                        throw new PersistenceException("Failed to insert into VehicleVersion");
-
-                    version = rs.getLong(1);
-                }
-            }
-
-            try (PreparedStatement pstmt =
-                    con.prepareStatement(sql2, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setLong(1, version);
-                pstmt.setInt(2, Status.ABGEMELDET.ordinal());
-                pstmt.executeUpdate();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next()) {
-                        con.rollback();
-                        throw new PersistenceException("Failed to insert into Vehicle");
-                    }
-
-                    id = rs.getLong(1);
-                }
-
-                name = v.type().name() + "-" + id;
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
-                pstmt.setString(1, name);
-                pstmt.setLong(2, version);
-
-                if (pstmt.executeUpdate() != 1) {
-                    con.rollback();
-                    throw new PersistenceException("Failed to update VehicleVersion");
-                }
-            }
-
-            con.commit();
-            return id;
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void update(Vehicle v) throws ElementNotFoundException, PersistenceException {
-        String sql = "SELECT version FROM Vehicle WHERE id = ?";
-        String sql2 =
-                "MERGE INTO VehicleVersion(name, constructionType, type, hasNef)"
-                        + " KEY(name, constructionType, type, hasNef) VALUES(?, ?, ?, ?)";
-        String sql3 = "UPDATE Vehicle SET version = ?, status = ? WHERE id = ?";
-
-        long versionId;
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            con.setAutoCommit(false);
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, v.id());
-
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    if (!rs.next()) throw new ElementNotFoundException("No such vehicleId exists");
-
-                    versionId = rs.getLong(1);
-                }
-            }
-
-            try (PreparedStatement pstmt =
-                    con.prepareStatement(sql2, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setString(1, v.type().name() + "-" + v.id());
-                pstmt.setString(2, v.constructionType().name());
-                pstmt.setString(3, v.type().name());
-                pstmt.setBoolean(4, v.hasNef());
-                pstmt.executeUpdate();
-
-                try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (rs.next()) {
-                        // version changed, update it
-                        versionId = rs.getLong(1);
-                    }
-                }
-            }
-
-            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
-                pstmt.setLong(1, versionId);
-                pstmt.setString(2, v.status().name());
-                pstmt.setLong(3, v.id());
-                pstmt.executeUpdate();
-            }
-
-            con.commit();
-        } catch (SQLException e) {
-            jdbcConnectionManager.rollbackConnection();
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public Set<Vehicle> list() throws PersistenceException {
-        Set<Vehicle> result = new HashSet<>();
-
-        String sql =
-                "Select * from VehicleVersion, Vehicle where VehicleVersion.id=Vehicle.version";
-
-        try (PreparedStatement pstmt =
-                jdbcConnectionManager.getConnection().prepareStatement(sql)) {
-            pstmt.executeQuery();
-            try (ResultSet rs = pstmt.getResultSet()) {
-                while (rs.next()) {
-                    result.add(vehicleFromRS(rs));
-                }
-            }
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-        return result;
-    }
-
-    @Override
-    public Vehicle get(long id) throws ElementNotFoundException, PersistenceException {
-        String sql =
-                "SELECT a.id, b.name, b.constructionType, b.type, a.status, b.hasNef"
-                        + " FROM Vehicle a"
-                        + " INNER JOIN VehicleVersion b"
-                        + " ON version = b.id"
-                        + " WHERE a.id = ?";
-
-        try {
-            Connection con = jdbcConnectionManager.getConnection();
-            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
-                pstmt.setLong(1, id);
-
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    if (!rs.first()) throw new ElementNotFoundException("No such vehicle exists");
-
-                    return vehicleFromRS(rs);
-                }
-            }
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
-    }
-
-    @Override
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {
-        throw new UnsupportedOperationException();
-    }
-
-    private Vehicle vehicleFromRS(ResultSet rs) throws SQLException, PersistenceException {
-        return Vehicle.builder()
-                .id(rs.getLong("Vehicle.id"))
-                .name(rs.getString("name"))
-                .constructionType(ConstructionType.values()[rs.getInt("constructionType")])
-                .type(VehicleType.valueOf(rs.getString("type")))
-                .status(Status.values()[rs.getInt("status")])
-                .hasNef(rs.getBoolean("hasNef"))
-                .registrations(registrationDatabaseDao.list(rs.getLong("id")))
-                .build();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Employee.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Employee.java
deleted file mode 100644
index 583bf5b..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Employee.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import com.google.auto.value.AutoValue;
-import java.time.LocalDate;
-
-@AutoValue
-public abstract class Employee {
-    public enum EducationLevel {
-        RS,
-        NFS,
-        NKV,
-        NKA,
-        NKI,
-        NA
-    }
-
-    public abstract long id();
-
-    public abstract String name();
-
-    public abstract LocalDate birthday();
-
-    public abstract EducationLevel educationLevel();
-
-    public abstract boolean isDriver();
-
-    public abstract boolean isPilot();
-
-    public static Builder builder() {
-        return new AutoValue_Employee.Builder().id(0);
-    }
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder id(long id);
-
-        public abstract Builder name(String name);
-
-        public abstract Builder birthday(LocalDate birthday);
-
-        public abstract Builder educationLevel(EducationLevel educationLevel);
-
-        public abstract Builder isDriver(boolean isDriver);
-
-        public abstract Builder isPilot(boolean isPilot);
-
-        public abstract Employee build();
-    }
-
-    public abstract Builder toBuilder();
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/EmployeeValidator.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/EmployeeValidator.java
deleted file mode 100644
index 36d8003..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/EmployeeValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-
-public class EmployeeValidator {
-
-    public static boolean validate(Employee employee) throws InvalidEmployeeException {
-
-        if (employee.name() == null || employee.name().trim().length() == 0) {
-            throw new InvalidEmployeeException("Name darf nicht leer sein!");
-        }
-
-        if (employee.birthday() == null) {
-            throw new InvalidEmployeeException("Geburtsdatum darf nicht leer sein!");
-        }
-
-        if (employee.educationLevel() == null) {
-            throw new InvalidEmployeeException("Ausbildungsgrad darf nicht leer sein!");
-        }
-
-        return true;
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Operation.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Operation.java
deleted file mode 100644
index 3a97dc7..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Operation.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import com.google.auto.value.AutoValue;
-import java.time.Instant;
-import java.util.Set;
-import javax.annotation.Nullable;
-
-@AutoValue
-public abstract class Operation {
-    public enum Severity {
-        A,
-        B,
-        C,
-        D,
-        E,
-        O,
-    }
-
-    public enum Status {
-        ACTIVE,
-        COMPLETED,
-        CANCELLED,
-    }
-
-    public abstract long id();
-
-    public abstract String opCode();
-
-    @Nullable
-    public abstract Severity severity();
-
-    public abstract Status status();
-
-    public abstract Set<Vehicle> vehicles();
-
-    @Nullable
-    public abstract Instant created();
-
-    public abstract String destination();
-
-    @Nullable
-    public abstract String additionalInfo();
-
-    public static Builder builder() {
-        return new AutoValue_Operation.Builder().id(0);
-    }
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder id(long id);
-
-        public abstract Builder opCode(String opCode);
-
-        public abstract Builder severity(Severity severity);
-
-        public abstract Builder status(Status status);
-
-        public abstract Builder vehicles(Set<Vehicle> vehicles);
-
-        public abstract Builder created(Instant created);
-
-        public abstract Builder destination(String destination);
-
-        public abstract Builder additionalInfo(String additionalInfo);
-
-        public abstract Operation build();
-    }
-
-    public abstract Builder toBuilder();
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
deleted file mode 100644
index 8551266..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import com.google.auto.value.AutoValue;
-import java.time.Instant;
-
-@AutoValue
-public abstract class Registration {
-    public abstract long id();
-
-    public abstract Instant start();
-
-    public abstract Instant end();
-
-    public abstract Employee employee();
-
-    public static Builder builder() {
-        return new AutoValue_Registration.Builder().id(0);
-    }
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder id(long id);
-
-        public abstract Builder start(Instant start);
-
-        public abstract Builder end(Instant end);
-
-        public abstract Builder employee(Employee employee);
-
-        public abstract Registration build();
-    }
-
-    public abstract Builder toBuilder();
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/RegistrationValidator.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/RegistrationValidator.java
deleted file mode 100644
index 3456534..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/RegistrationValidator.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-public class RegistrationValidator {
-
-    private RegistrationValidator() {}
-
-    public static void validate(Vehicle vehicle, Set<Registration> registrations)
-            throws InvalidVehicleException, InvalidRegistrationException {
-        /*
-        Vehicles and Employees are assumed to be valid.
-        They have been checked at creation, and for them to be checked again, access to
-        VehicleValidator and EmployeeValidator are needed, which are not available at this time.
-         */
-        /*
-        The method used here goes as follows: All given employees are inspected in regards to their
-        qualifications, and added to the appropriate lists of the roles they could fill.
-        For example, an NFS, who is also a driver, would be added to the lists driverIds, nfsIds
-        and rsIds (because an NFS can always substitute an RS).
-        Afterwards, the number of people is checked according to the chosen vehicle type, and if
-        the number is okay, the program tries to find a valid combination of roles for the vehicle.
-        For example, for an RTW, first a driver is chosen, their ID marked as found in the aptly
-        titled HashMap, and then for the second RS, the list of RS is checked, excluding the chosen
-        driver. If no other valid RS is found, the next possible driver is chosen, and so on. If no
-        valid combination is found, an InvalidRegistrationException is thrown.
-         */
-        List<Long> pilotIds = new LinkedList<>();
-        List<Long> driverIds = new LinkedList<>();
-        List<Long> naIds = new LinkedList<>();
-        List<Long> nfsIds = new LinkedList<>();
-        List<Long> rsIds = new LinkedList<>();
-        HashMap<Long, Boolean> found =
-                new HashMap<>(); // needed later in DFS, checks that no person is chosen twice
-        int total = 0;
-        for (Registration registration : registrations) {
-            total++;
-            if (found.put(registration.employee().id(), false) != null) {
-                throw new InvalidRegistrationException(
-                        "Person mit der ID: "
-                                + registration.employee().id()
-                                + " wurde mehrmals hinzugefügt!");
-            }
-            if (registration.employee().isPilot()) {
-                pilotIds.add(registration.employee().id());
-            }
-            if (registration.employee().isDriver()) {
-                driverIds.add(registration.employee().id());
-            }
-            if (registration.employee().educationLevel() == EducationLevel.NA) {
-                naIds.add(registration.employee().id());
-                nfsIds.add(registration.employee().id());
-                rsIds.add(registration.employee().id());
-            } else if (isNFS(registration.employee())) {
-                nfsIds.add(registration.employee().id());
-                rsIds.add(registration.employee().id());
-            } else { // only RS left
-                rsIds.add(registration.employee().id());
-            }
-        }
-        if (total <= 0) {
-            throw new InvalidRegistrationException("Kein Personal ausgewählt!");
-        }
-        if (vehicle.type() == VehicleType.NAH) {
-            /*
-            NAH
-            1 Pilot
-            1 NFS
-            1 NA
-            3-4 Personen
-             */
-            if (total < 3) {
-                throw new InvalidRegistrationException("Zu wenig Personal für NAH!");
-            } else if (total > 4) {
-                throw new InvalidRegistrationException("Zu viel Personal für NAH!");
-            }
-            for (long pilot_id : pilotIds) {
-                found.put(pilot_id, true);
-                for (long na_id : naIds) {
-                    if (found.get(na_id)) continue;
-                    found.put(na_id, true);
-                    for (long nfs_id : nfsIds) {
-                        if (found.get(nfs_id)) continue;
-                        return;
-                    }
-                    found.put(na_id, false);
-                }
-                found.put(pilot_id, false);
-            }
-            throw new InvalidRegistrationException(
-                    "Keine gültige Kombination von Personen für NAH!");
-        } else if (vehicle.type() == VehicleType.NEF) {
-            /*
-            NEF
-            1 Driver (has to be NFS)
-            1 NA
-             */
-            if (total < 2) {
-                throw new InvalidRegistrationException("Zu wenig Personal für NEF!");
-            } else if (total > 3) {
-                throw new InvalidRegistrationException("Zu viel Personal für NEF!");
-            }
-            for (long driver_id : driverIds) {
-                if (!nfsIds.contains(driver_id))
-                    continue; // if possible driver is not NFS, skip him
-                found.put(driver_id, true);
-                for (long na_id : naIds) {
-                    if (found.get(na_id)) continue;
-                    return;
-                }
-                found.put(driver_id, false);
-            }
-            throw new InvalidRegistrationException(
-                    "Keine gültige Kombination von Personen für NEF!");
-        } else if (vehicle.type() == VehicleType.BKTW) {
-            /*
-            BKTW
-            1 Driver
-             */
-            if (total > 3) {
-                throw new InvalidRegistrationException("Zu viel Personal für BKTW!");
-            }
-            if (!driverIds.isEmpty()) {
-                return;
-            }
-            throw new InvalidRegistrationException("Kein Fahrer gefunden für BKTW!");
-        } else { // KTW or RTW, both have the same requirements
-            /*
-            RTW/KTW
-            1 Driver
-            1 RS
-             */
-            if (total < 2) {
-                throw new InvalidRegistrationException(
-                        "Zu wenig Personal für " + vehicle.type().name() + "!");
-            } else if (total > 4) {
-                throw new InvalidRegistrationException(
-                        "Zu viel Persoanl für " + vehicle.type().name() + "!");
-            }
-            for (long driver_id : driverIds) { // driver includes rs
-                found.put(driver_id, true);
-                for (long rs_id : rsIds) {
-                    if (found.get(rs_id)) continue;
-                    return;
-                }
-            }
-            throw new InvalidRegistrationException(
-                    "Keine gültige Kombination von Personen für " + vehicle.type().name() + "!");
-        }
-    }
-
-    private static boolean isNFS(Employee employee) {
-        EducationLevel educationLevel = employee.educationLevel();
-        switch (educationLevel) {
-            case NFS:
-                return true;
-            case NKA:
-                return true;
-            case NKI:
-                return true;
-            case NKV:
-                return true;
-            default:
-                return false;
-        }
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java
deleted file mode 100644
index e81db0b..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
-
-import com.google.auto.value.AutoValue;
-import java.util.List;
-import javax.annotation.Nullable;
-
-@AutoValue
-public abstract class Vehicle {
-    public enum ConstructionType {
-        NORMAL,
-        HOCHDACH,
-        MITTELHOCHDACH,
-    }
-
-    public enum VehicleType {
-        BKTW,
-        KTW_B,
-        KTW,
-        RTW,
-        NEF,
-        NAH,
-    }
-
-    public enum Status {
-        ABGEMELDET,
-        FREI_WACHE,
-        FREI_FUNK,
-        ZUM_BERUFUNGSORT,
-        AM_BERUFUNGSORT,
-        ZUM_ZIELORT,
-        AM_ZIELORT,
-    }
-
-    public abstract long id();
-
-    public abstract String name();
-
-    public abstract ConstructionType constructionType();
-
-    public abstract VehicleType type();
-
-    public abstract Status status();
-
-    public abstract boolean hasNef();
-
-    @Nullable
-    public abstract List<Registration> registrations();
-
-    public static Builder builder() {
-        return new AutoValue_Vehicle.Builder().id(0);
-    }
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder id(long id);
-
-        public abstract Builder name(String name);
-
-        public abstract Builder constructionType(ConstructionType constructionType);
-
-        public abstract Builder type(VehicleType type);
-
-        public abstract Builder status(Status status);
-
-        public abstract Builder hasNef(boolean hasNef);
-
-        public abstract Builder registrations(List<Registration> registrations);
-
-        public abstract Vehicle build();
-    }
-
-    public abstract Builder toBuilder();
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java
deleted file mode 100644
index f7f8e71..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-
-public interface EmployeeService {
-
-    /**
-     * Add given employee to the store.
-     *
-     * @param employee that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidEmployeeException if the employee is invalid
-     * @throws ServiceException if the employee could not be persisted
-     */
-    long add(Employee employee) throws InvalidEmployeeException, ServiceException;
-
-    /**
-     * Update the given employee.
-     *
-     * @param employee that should be updated
-     * @return the updated employee
-     * @throws InvalidEmployeeException if the employee is invalid
-     * @throws ServiceException if the updated employee could not be persisted
-     */
-    Employee update(Employee employee) throws InvalidEmployeeException, ServiceException;
-
-    /**
-     * Get all stored employees.
-     *
-     * @return list containing all stored employees
-     * @throws ServiceException if loading the stored employees failed
-     */
-    Set<Employee> list() throws ServiceException;
-
-    /**
-     * Remove employee with the given id from the store.
-     *
-     * @param id of the employee that should be removed
-     * @throws InvalidEmployeeException if given employee id is invalid or does not exist
-     * @throws ServiceException if the employee could not be removed from the store
-     */
-    void remove(long id) throws InvalidEmployeeException, ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
deleted file mode 100644
index cf054c3..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.EmployeeValidator;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-import org.springframework.stereotype.Service;
-
-@Service
-public class EmployeeServiceImpl implements EmployeeService {
-
-    private final EmployeeDAO employeePersistence;
-
-    public EmployeeServiceImpl(EmployeeDAO employeePersistence) {
-        this.employeePersistence = employeePersistence;
-    }
-
-    @Override
-    public long add(Employee employee) throws InvalidEmployeeException, ServiceException {
-
-        EmployeeValidator.validate(employee);
-        try {
-            return employeePersistence.add(employee);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public Employee update(Employee employee) throws InvalidEmployeeException, ServiceException {
-
-        EmployeeValidator.validate(employee);
-        try {
-            employeePersistence.update(employee);
-            return employee;
-        } catch (ElementNotFoundException | PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public Set<Employee> list() throws ServiceException {
-
-        try {
-            return employeePersistence.list();
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public void remove(long id) throws InvalidEmployeeException, ServiceException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java
deleted file mode 100644
index 4b7e630..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.SortedSet;
-
-public interface OperationService {
-
-    /**
-     * Add given operation to the store.
-     *
-     * @param operation that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidOperationException if the operation is invalid
-     * @throws ServiceException if the operation could not be persisted
-     */
-    long add(Operation operation) throws InvalidOperationException, ServiceException;
-
-    /**
-     * Request new vehicles to the given operation.
-     *
-     * @param operationId id of the operation that the vehicles should be send to
-     * @param vehicleIds the ids of the vehicles that should be send to the given operation
-     * @throws InvalidOperationException if the operationId is invalid or does not exist
-     * @throws InvalidVehicleException if one of the vehicle ids is invalid or does not exist
-     * @throws ServiceException if the vehicles could not be loaded or the operation could not be
-     *     persisted
-     */
-    void requestVehicles(long operationId, Set<Long> vehicleIds)
-            throws InvalidOperationException, InvalidVehicleException, ServiceException;
-
-    /**
-     * Completes the given operation with the specified status.
-     *
-     * @param operationId id of the operation that should be completed
-     * @param status of the completed operation, either {@link Status#COMPLETED} or {@link
-     *     Status#CANCELLED}
-     * @throws InvalidOperationException if the operationId is invalid or does not exist
-     * @throws ServiceException if the operation could not be persisted
-     */
-    void complete(long operationId, Status status)
-            throws InvalidOperationException, ServiceException;
-
-    /**
-     * Get all available vehicles, sorted by how well they fit to the given opCode, starting with
-     * the best fitting.
-     *
-     * @param opCode the operation code that is used to determine the ranking
-     * @return a sorted list containing all available vehicles
-     * @throws InvalidOperationException if the opCode is invalid
-     * @throws ServiceException if loading the stored vehicles failed
-     */
-    SortedSet<Vehicle> rankVehicles(String opCode)
-            throws InvalidOperationException, ServiceException;
-
-    /**
-     * Get all stored operations with matching status.
-     *
-     * @param statuses set containing all statuses that should be matched
-     * @return list containing all matched operations
-     * @throws ServiceException if loading the stored operations failed
-     */
-    Set<Operation> list(EnumSet<Status> statuses) throws ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
deleted file mode 100644
index a83cf64..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-@Service
-public class OperationServiceImpl implements OperationService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(OperationServiceImpl.class);
-
-    private final OperationDAO operationDAO;
-    private final VehicleDAO vehicleDAO;
-    private final VehicleService vehicleService;
-
-    public OperationServiceImpl(
-            OperationDAO operationDAO, VehicleDAO vehicleDAO, VehicleService vehicleService) {
-        this.operationDAO = operationDAO;
-        this.vehicleDAO = vehicleDAO;
-        this.vehicleService = vehicleService;
-    }
-
-    @Override
-    public long add(Operation o) throws InvalidOperationException, ServiceException {
-        if (o.created() != null) {
-            throw new InvalidOperationException("Erstellungszeitpunkt darf nicht gesetzt sein");
-        }
-
-        if (o.severity() != null) {
-            throw new InvalidOperationException("Der Schweregrad darf nicht gesetzt sein");
-        }
-
-        if (o.id() != 0) {
-            throw new InvalidOperationException("Einsatz-ID muss 0 sein");
-        }
-
-        if (o.status() != Status.ACTIVE)
-            LOG.info("Status was set but will be overridden"); // TODO: nullable instead??
-
-        try {
-            for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
-                Vehicle v = vehicleDAO.get(id);
-                VehicleServiceImpl.validateVehicle(v);
-
-                if (v.status() != Vehicle.Status.FREI_FUNK
-                        && v.status() != Vehicle.Status.FREI_WACHE)
-                    throw new InvalidOperationException("Fahrzeug nicht verfügbar: " + v.status());
-            }
-
-            validateOperation(o);
-
-            return operationDAO.add(
-                    o.toBuilder()
-                            .created(Instant.now())
-                            .severity(extractSeverityFromOpCode(o.opCode()))
-                            .status(Status.ACTIVE)
-                            .build());
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        } catch (InvalidVehicleException e) {
-            // already logged as invalid vehicle
-            throw new InvalidOperationException("Enthaltenes Fahrzeug ist ungültig", e);
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException("Enthaltenes Fahrzeug existiert nicht", e);
-        }
-    }
-
-    @Override
-    public void requestVehicles(long operationId, Set<Long> vehicleIds)
-            throws InvalidOperationException, InvalidVehicleException, ServiceException {
-        Set<Vehicle> vs = new HashSet<>();
-
-        try {
-            if (operationId <= 0) {
-                throw new InvalidOperationException("Einsatz-ID ist ungültig");
-            }
-            Operation o = operationDAO.get(operationId);
-            validateOperation(o);
-
-            if (o.opCode().trim().isEmpty()
-                    || extractSeverityFromOpCode(o.opCode()) != o.severity()) {
-                throw new InvalidOperationException("Einsatzcode ist ungültig");
-            }
-
-            if (o.status() != Status.ACTIVE) {
-                throw new InvalidOperationException("Einsatz ist ungültig");
-            }
-
-            if (o.created() == null) {
-                throw new InvalidOperationException("Erstellungszeitpunkt darf nicht leer sein");
-            }
-
-            for (Long id : vehicleIds) {
-                if (id <= 0) {
-                    throw new InvalidVehicleException("Fahrzeug-ID ist ungültig");
-                }
-
-                try {
-                    Vehicle v = vehicleDAO.get(id);
-                    VehicleServiceImpl.validateVehicle(v);
-                    if (v.status() != Vehicle.Status.FREI_FUNK
-                            && v.status() != Vehicle.Status.FREI_WACHE)
-                        throw new InvalidOperationException(
-                                "Fahrzeug nicht verfügbar: " + v.status());
-
-                    vs.add(v);
-                } catch (ElementNotFoundException e) {
-                    throw new InvalidVehicleException("VehicleId ist invalid");
-                }
-            }
-
-            vs.addAll(o.vehicles());
-            if (vs.equals(o.vehicles())) return;
-
-            operationDAO.update(o.toBuilder().vehicles(vs).build());
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException("Kein Einsatz mit dieser ID existiert");
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public void complete(long operationId, Status status)
-            throws InvalidOperationException, ServiceException {
-        try {
-            Operation o = operationDAO.get(operationId);
-            operationDAO.update(o.toBuilder().status(status).build());
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException(e);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public SortedSet<Vehicle> rankVehicles(String opCode)
-            throws InvalidOperationException, ServiceException {
-        Set<Vehicle> vehicles =
-                vehicleService.list(EnumSet.complementOf(EnumSet.of(Vehicle.Status.ABGEMELDET)));
-
-        List<Predicate<Vehicle>> priorities = new ArrayList<>();
-        Predicate<Vehicle> ktw = v -> v.type() == VehicleType.KTW;
-        Predicate<Vehicle> rtwNoNEF = v -> v.type() == VehicleType.RTW && !v.hasNef();
-        Predicate<Vehicle> rtwNEF = v -> v.type() == VehicleType.RTW && v.hasNef();
-        Predicate<Vehicle> nef = v -> v.type() == VehicleType.NEF;
-        Predicate<Vehicle> nah = v -> v.type() == VehicleType.NAH;
-
-        switch (extractSeverityFromOpCode(opCode)) {
-            case A:
-                // fallthrough
-            case B:
-                // fallthrough
-            case O:
-                priorities.add(ktw);
-                priorities.add(rtwNoNEF);
-                priorities.add(rtwNEF);
-                break;
-            case C:
-                priorities.add(rtwNEF);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-            case D:
-                priorities.add(rtwNEF);
-                priorities.add(nef);
-                priorities.add(nah);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-            case E:
-                priorities.add(nah);
-                priorities.add(nef);
-                priorities.add(rtwNEF);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-        }
-
-        Comparator<Vehicle> vehicleComparator =
-                (v1, v2) -> {
-                    for (Predicate<Vehicle> priority : priorities) {
-                        if (priority.test(v1)) {
-                            return -1;
-                        }
-                        if (priority.test(v2)) {
-                            return +1;
-                        }
-                    }
-                    return 0;
-                };
-
-        Supplier<TreeSet<Vehicle>> supplier = () -> new TreeSet<>(vehicleComparator);
-
-        return vehicles.stream().collect(Collectors.toCollection(supplier));
-    }
-
-    @Override
-    public Set<Operation> list(EnumSet<Status> statuses) throws ServiceException {
-        try {
-            Set<Operation> operations = operationDAO.list(statuses);
-            for (Operation o : operations) validateOperation(o);
-
-            return operations;
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        } catch (InvalidOperationException e) {
-            // database returned invalid values
-            throw new ServiceException("DB returned invalid operation", e);
-        }
-    }
-
-    private static void validateOperation(Operation o) throws InvalidOperationException {
-        if (o.vehicles().isEmpty()) {
-            throw new InvalidOperationException(
-                    "Es muss mindestens ein Fahrzeug ausgewählt werden!");
-        }
-
-        for (Vehicle v : o.vehicles()) {
-            try {
-                VehicleServiceImpl.validateVehicle(v);
-            } catch (InvalidVehicleException e) {
-                throw new InvalidOperationException("Fahrzeug " + v.name() + " ist ungültig", e);
-            }
-
-            // TODO: validate if NEF/RTW/NAH conditions?
-        }
-
-        Instant created = o.created();
-        if (created != null && created.isAfter(Instant.now())) {
-            throw new InvalidOperationException("Einsatz wurde in der Zukunft erstellt");
-        }
-
-        if (o.destination() == null || o.destination().trim().isEmpty()) {
-            throw new InvalidOperationException("Adresse darf nicht leer sein");
-        }
-
-        if (o.destination().length() > 100) {
-            throw new InvalidOperationException("Adresse darf 100 Zeichen nicht überschreiten");
-        }
-
-        if (o.additionalInfo() != null && o.additionalInfo().length() > 100) {
-            throw new InvalidOperationException("Anmerkung darf 100 Zeichen nicht überschreiten");
-        }
-    }
-
-    private static final Pattern opCodePattern =
-            Pattern.compile("(?:\\w{1,3}-\\d{0,2})([ABCDEO])(?:.*)");
-
-    private static Severity extractSeverityFromOpCode(String opCode)
-            throws InvalidOperationException {
-        Matcher m = opCodePattern.matcher(opCode);
-
-        if (!m.matches()) {
-            throw new InvalidOperationException("Einsatzcode ist ungültig");
-        }
-
-        return Severity.valueOf(m.group(1));
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java
deleted file mode 100644
index b7d8eef..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-
-public interface RegistrationService {
-
-    /**
-     * Register employee to a vehicle.
-     *
-     * @param vehicleId the id of the target vehicle
-     * @param registrations that should be added to the vehicle
-     * @return the list of ids that were assigned
-     * @throws InvalidVehicleException if the vehicleId is invalid or does not exist
-     * @throws InvalidRegistrationException if the registration is invalid
-     * @throws ServiceException if the registration could not be persisted
-     */
-    Set<Long> add(long vehicleId, Set<Registration> registrations)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException;
-
-    /**
-     * Remove given registration from the store.
-     *
-     * @param registrationId the id of the registration that should be removed
-     * @throws InvalidRegistrationException if the registration is invalid or does not exist
-     * @throws ServiceException if the registration could not be removed from the store
-     */
-    void remove(long registrationId) throws InvalidRegistrationException, ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
deleted file mode 100644
index 1d92644..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.RegistrationValidator;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RegistrationServiceImpl implements RegistrationService {
-
-    private final RegistrationDAO registrationDAO;
-    private final VehicleDAO vehicleDAO;
-
-    @Autowired
-    public RegistrationServiceImpl(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO) {
-        this.registrationDAO = registrationDAO;
-        this.vehicleDAO = vehicleDAO;
-    }
-
-    @Override
-    public Set<Long> add(long vehicleId, Set<Registration> registrations)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
-
-        if (vehicleId <= 0) throw new InvalidVehicleException("VehicleId invalid");
-
-        try {
-            Vehicle vehicle = vehicleDAO.get(vehicleId);
-
-            RegistrationValidator.validate(vehicle, registrations);
-
-            return registrationDAO.add(vehicle.id(), registrations);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        } catch (ElementNotFoundException e) {
-            throw new InvalidVehicleException(e);
-        }
-    }
-
-    @Override
-    public void remove(long registrationId) throws InvalidRegistrationException, ServiceException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java
deleted file mode 100644
index fe09ca1..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-
-public interface VehicleService {
-
-    /**
-     * Add given vehicle to the store.
-     *
-     * @param vehicle that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidVehicleException if the vehicle is invalid
-     * @throws ServiceException if the vehicle could not be persisted
-     */
-    long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
-
-    /**
-     * Update the given vehicle.
-     *
-     * @param vehicle that should be updated
-     * @return the updated vehicle
-     * @throws InvalidVehicleException if the vehicle is invalid
-     * @throws ServiceException if the updated vehicle could not be persisted
-     */
-    Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
-
-    /**
-     * Get all stored vehicles with matching status.
-     *
-     * @param statuses set containing all statuses that should be matched
-     * @return list containing all stored vehicles
-     * @throws ServiceException if loading the stored vehicles failed
-     */
-    Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException;
-
-    /**
-     * Remove vehicle with the given id from the store.
-     *
-     * @param id of the vehicle that should be removed
-     * @throws InvalidVehicleException if given vehicle id is invalid or does not exist
-     * @throws ServiceException if the vehicle could not be removed from the store
-     */
-    void remove(long id) throws InvalidVehicleException, ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
deleted file mode 100644
index 0bf4aa6..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-@Service
-public class VehicleServiceImpl implements VehicleService {
-
-    private VehicleDAO vehiclePersistence;
-
-    public VehicleServiceImpl(VehicleDAO vehiclePersistence) {
-        this.vehiclePersistence = vehiclePersistence;
-    }
-
-    public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
-        if (!CollectionUtils.isEmpty(vehicle.registrations())) {
-            throw new InvalidVehicleException(
-                    "Fahrzeug kann nicht mit Anmeldungen erstellt werden");
-        }
-
-        validateVehicle(vehicle);
-        try {
-            vehiclePersistence.add(vehicle);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-        return 0;
-    }
-
-    public Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
-        validateVehicle(vehicle);
-        try {
-            vehiclePersistence.update(vehicle);
-        } catch (ElementNotFoundException e) {
-            throw new ServiceException("Element not found", e);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-        return vehicle;
-    }
-
-    protected static void validateVehicle(Vehicle vehicle) throws InvalidVehicleException {
-        switch (vehicle.type()) {
-            case RTW:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("RTW darf kein Normales Dach haben");
-                } else if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("RTW darf kein Mittelhochdach haben");
-                }
-                break;
-            case KTW:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("KTW darf kein Normales Dach haben");
-                }
-                break;
-            case KTW_B:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("KTW-B darf kein Normales Dach haben");
-                }
-                break;
-            case NEF:
-                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
-                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
-                }
-                break;
-            case NAH:
-                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
-                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
-                }
-                break;
-            case BKTW:
-                break;
-            default:
-                throw new IllegalStateException("BUG: invalid vehicle type" + vehicle.type());
-        }
-    }
-
-    @Override
-    public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException {
-        if (statuses == null) {
-            throw new ServiceException("Statuses may not be null");
-        }
-
-        Set<Vehicle> vehicles;
-
-        try {
-            vehicles = vehiclePersistence.list();
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-
-        return vehicles.stream()
-                .filter(vehicle -> statuses.contains(vehicle.status()))
-                .collect(Collectors.toSet());
-    }
-
-    @Override
-    public void remove(long id) throws InvalidVehicleException, ServiceException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
new file mode 100644
index 0000000..6e0c89d
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
@@ -0,0 +1,213 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class ArchiveOperationController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ArchiveOperationController.class);
+
+    @FXML private ImageView imvVehicleDetail;
+    @FXML private Label lblStatus;
+    @FXML private AnchorPane apMainDetails;
+    @FXML private Label lblOperations;
+    @FXML private Label lblCompleted;
+    @FXML private Label lblCancelled;
+    @FXML private AnchorPane backApMain;
+    @FXML private AnchorPane backApDetails;
+    @FXML private AnchorPane archiveOperationAP;
+    @FXML private AnchorPane apDetails;
+    @FXML private Label lblCodeHeader;
+    @FXML private Label lblOpCode;
+    @FXML private Label lblVehicles;
+    @FXML private Label lblDate;
+    @FXML private Label lblAddress;
+    @FXML private FlowPane fpVehicles;
+    private final OperationService operationService;
+    @FXML private FlowPane archiveOperationFlowPane;
+    private final CreateOperationController createOperationController;
+    private Set<Operation> list = new HashSet<>();
+    private final SpringFXMLLoader fxmlLoader;
+
+    public ArchiveOperationController(
+            OperationService operationService,
+            CreateOperationController createOperationController,
+            SpringFXMLLoader fxmlLoader) {
+        this.operationService = operationService;
+        this.createOperationController = createOperationController;
+        this.fxmlLoader = fxmlLoader;
+    }
+
+    @FXML
+    private void initialize() {
+        update();
+    }
+
+    public void update() {
+        archiveOperationFlowPane.getChildren().clear();
+        list.clear();
+        try {
+            list.addAll(operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED)));
+            long cancelledAmount = 0;
+            long completedAmount = 0;
+            for (Operation operation : list) {
+                if (operation.status() == Status.CANCELLED) cancelledAmount++;
+                else completedAmount++;
+            }
+            lblCancelled.setText("storniert: " + cancelledAmount);
+            lblCompleted.setText("abgeschlossen: " + completedAmount);
+            lblOperations.setText("Einsätze: " + list.size());
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in update().", e);
+            showServiceExceptionAlertAndWait("Die Einsätze konnten nicht geladen werden!");
+            ;
+        }
+        setFlowPane();
+    }
+
+    private void setFlowPane() {
+        try {
+            archiveOperationFlowPane.getChildren().clear();
+            for (Operation operation : sortSet(list)) {
+                OperationInArchiveController opInAController =
+                        OperationInArchiveController.create();
+                opInAController.set(operation);
+                opInAController
+                        .getRoot()
+                        .setOnMouseClicked(
+                                event -> {
+                                    detailOperation = operation;
+                                    backApMain.setVisible(false);
+                                    apMainDetails.setVisible(false);
+                                    backApDetails.setVisible(true);
+                                    setOperation();
+                                    setDetailsVisible(true);
+                                    imvVehicleDetail.setImage(new Image("/images/Vehicle.png"));
+                                });
+                archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
+            }
+        } catch (IOException e) {
+            LOG.error("IOException in setFlowPane(). ", e);
+            showServiceExceptionAlertAndWait("Die Elemente konnten nicht geladen werden!");
+        }
+    }
+
+    private Operation detailOperation;
+
+    private List<Operation> sortSet(Set<Operation> operationsSet) {
+        Operation[] array = operationsSet.toArray(new Operation[operationsSet.size()]);
+        for (int i = array.length - 1; i > 0; i--) {
+            for (int j = 0; j < i; j++) {
+                LocalDateTime first =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j].created()), ZoneOffset.UTC);
+                LocalDateTime second =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC);
+                if (first.isBefore(second)) {
+                    Operation help = array[j];
+                    array[j] = array[j + 1];
+                    array[j + 1] = help;
+                }
+            }
+        }
+        return Arrays.asList(array);
+    }
+
+    private void setOperation() {
+        lblCodeHeader.setText(detailOperation.opCode());
+        if (detailOperation.created() != null) {
+            LocalDateTime dateTime =
+                    LocalDateTime.ofInstant(
+                            Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
+            lblDate.setText(
+                    "am "
+                            + dateTime.getDayOfMonth()
+                            + "."
+                            + dateTime.getMonth().getValue()
+                            + "."
+                            + dateTime.getYear());
+        } else {
+            lblDate.setText("---");
+        }
+        lblStatus.setText(
+                "Status: "
+                        + (detailOperation.status() == Status.CANCELLED
+                                ? "storniert"
+                                : "abgeschlossen"));
+        lblOpCode.setText(detailOperation.opCode());
+        Collection<String> elements =
+                detailOperation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
+        String result = String.join(", ", elements);
+
+        lblVehicles.setText(result);
+        lblAddress.setText(detailOperation.destination());
+
+        fpVehicles.getChildren().clear();
+        try {
+            for (Vehicle vehicle : detailOperation.vehicles()) {
+                DetailArchiveOperationController controller = null;
+
+                controller = DetailArchiveOperationController.create(fxmlLoader);
+
+                controller.set(vehicle);
+                fpVehicles.getChildren().add(controller.getRoot());
+            }
+        } catch (IOException e) {
+            LOG.error("IOException in setOperation(). ", e);
+            showServiceExceptionAlertAndWait("Die Element konnte nicht geladen werden!");
+        }
+    }
+
+    private void setDetailsVisible(boolean b) {
+        apDetails.setVisible(b);
+    }
+
+    public void backClicked() {
+        LOG.debug("Hyperlink \"Zurück\" in archive detail view clicked.");
+        fpVehicles.getChildren().clear();
+        setDetailsVisible(false);
+        backApDetails.setVisible(false);
+        apMainDetails.setVisible(true);
+        backApMain.setVisible(true);
+    }
+
+    public void backToMain() {
+        LOG.debug("Hyperlink \"Zurück\" in archive main view clicked.");
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+
+    void setVisible(boolean b) {
+        archiveOperationAP.setVisible(b);
+        backApMain.setVisible(b);
+        apMainDetails.setVisible(b);
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateCarController.java
new file mode 100644
index 0000000..aa76535
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateCarController.java
@@ -0,0 +1,231 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showSuccessAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class CreateCarController {
+
+    @FXML private AnchorPane createCarAP;
+    @FXML private ChoiceBox<String> cmbCtype;
+    @FXML private ChoiceBox<String> cmbTyp;
+
+    @FXML private Button btnCreate;
+    @FXML private CheckBox cbxNEF;
+    @FXML private FlowPane fpVehicleList;
+    private final CreateOperationController createOperationController;
+
+    private static final Logger LOG = LoggerFactory.getLogger(CreateCarController.class);
+    private final VehicleService vehicleService;
+    private boolean update = false;
+    private long vid = -1;
+
+    private Vehicle chooseVehicle;
+
+    public CreateCarController(
+            CreateOperationController createOperationController, VehicleService vehicleService) {
+        this.createOperationController = createOperationController;
+        this.vehicleService = vehicleService;
+    }
+
+    @FXML
+    private void initialize() {
+        fpVehicleList.setHgap(5);
+        fpVehicleList.setVgap(5);
+
+        cmbCtype.setItems(
+                FXCollections.observableArrayList(
+                        Stream.of(
+                                        ConstructionType.NORMAL,
+                                        ConstructionType.MITTELHOCHDACH,
+                                        ConstructionType.HOCHDACH)
+                                .map(Enum::toString)
+                                .collect(Collectors.toList())));
+        cmbCtype.setValue(ConstructionType.NORMAL.toString());
+        cmbTyp.setItems(
+                FXCollections.observableArrayList(
+                        Stream.of(
+                                        VehicleType.BKTW,
+                                        VehicleType.KTW_B,
+                                        VehicleType.KTW,
+                                        VehicleType.RTW,
+                                        VehicleType.NEF,
+                                        VehicleType.NAH)
+                                .map(Enum::toString)
+                                .collect(Collectors.toList())));
+        cmbTyp.setValue(VehicleType.BKTW.toString());
+
+        updateVehiclePane();
+    }
+
+    @FXML
+    private void createCar(ActionEvent actionEvent) {
+
+        if (!update) {
+            LOG.debug("Button \"Erstellen\" clicked.");
+            Vehicle vehicle =
+                    Vehicle.builder()
+                            .constructionType(parseConstructionType())
+                            .type(parseType())
+                            .name("")
+                            .status(Status.ABGEMELDET)
+                            .hasNef(cbxNEF.isSelected())
+                            .build();
+            try {
+                vehicleService.add(vehicle);
+                setToStart();
+            } catch (InvalidVehicleException e) {
+                LOG.debug("Validation of Vehicle failed");
+                showValidationErrorAlertAndWait(e.getMessage());
+                setToStart();
+                return;
+            } catch (ServiceException e) {
+                LOG.error("ServiceException in createCar(). ", e);
+                showServiceExceptionAlertAndWait(
+                        "Ein Fehler beim Erstellen des Fahrzeuges ist aufgetreten.");
+                setToStart();
+                return;
+            }
+            showSuccessAlertAndWait("Auto wurde erfolgreich angelegt.");
+        } else {
+            LOG.debug("Button \"Speichern\" clicked.");
+            try {
+                Vehicle vehicle =
+                        Vehicle.builder()
+                                .id(vid)
+                                .constructionType(parseConstructionType())
+                                .type(parseType())
+                                .name("")
+                                .status(Status.ABGEMELDET)
+                                .hasNef(cbxNEF.isSelected())
+                                .build();
+                vehicleService.update(vehicle);
+                setToStart();
+                chooseVehicle = null;
+            } catch (InvalidVehicleException e) {
+                LOG.debug("Validation of Vehicle failed");
+                showValidationErrorAlertAndWait(e.getMessage());
+                setToStart();
+                return;
+            } catch (ServiceException e) {
+                LOG.error("ServiceException in createCar(). ", e);
+                showServiceExceptionAlertAndWait(e.getMessage());
+                setToStart();
+                return;
+            }
+            showSuccessAlertAndWait("Auto wurde erfolgreich bearbeitet.");
+        }
+
+        updateVehiclePane();
+    }
+
+    private ConstructionType parseConstructionType() {
+        if (cmbCtype.getSelectionModel().getSelectedItem() == null) {
+            return ConstructionType.NORMAL;
+        }
+        return ConstructionType.valueOf(cmbCtype.getSelectionModel().getSelectedItem());
+    }
+
+    private VehicleType parseType() {
+        if (cmbTyp.getSelectionModel().getSelectedItem() == null) {
+            return VehicleType.BKTW;
+        }
+        return VehicleType.valueOf(cmbTyp.getSelectionModel().getSelectedItem());
+    }
+
+    private void setToStart() {
+        btnCreate.setText("Erstellen");
+        cbxNEF.setSelected(false);
+        cmbTyp.setValue(VehicleType.BKTW.name());
+        cmbCtype.setValue(ConstructionType.NORMAL.name());
+        update = false;
+    }
+
+    private void updateVehicle(Vehicle vehicle) {
+
+        cmbCtype.setValue(vehicle.constructionType().name());
+        cmbTyp.setValue(vehicle.type().name());
+        cbxNEF.setSelected(vehicle.hasNef());
+        btnCreate.setText("Speichern");
+        vid = vehicle.id();
+        update = true;
+        chooseVehicle = vehicle;
+    }
+
+    public void setVisible(boolean b) {
+        createCarAP.setVisible(b);
+    }
+
+    @FXML
+    private void backToMain() {
+        LOG.debug("Hyperlink \"zurück\" clicked.");
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+
+    private void updateVehiclePane() {
+        try {
+            fpVehicleList.getChildren().clear();
+
+            Set<Vehicle> vehicles;
+
+            vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
+
+            for (Vehicle vehicle : vehicles) {
+                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
+
+                controller.setData(vehicle, false, false);
+                controller
+                        .getRootElement()
+                        .setOnMouseClicked(
+                                event -> {
+                                    if (event.getButton().equals(MouseButton.PRIMARY)) {
+                                        if (chooseVehicle == null || vehicle == chooseVehicle) {
+                                            if (update == false) {
+                                                chooseVehicle = vehicle;
+                                                updateVehicle(vehicle);
+                                                controller.setSelected(true);
+                                            } else {
+                                                setToStart();
+                                                controller.setSelected(false);
+
+                                                chooseVehicle = null;
+                                            }
+                                        }
+                                    }
+                                });
+
+                fpVehicleList.getChildren().add(controller.getRootElement());
+            }
+        } catch (ServiceException | IOException e) {
+            LOG.error("Exception in updateVehiclePane(). ", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeController.java
new file mode 100644
index 0000000..433bfa6
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeController.java
@@ -0,0 +1,174 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showSuccessAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+
+@Controller
+@Scope("prototype")
+public class CreateNewEmployeeController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(CreateNewEmployeeController.class);
+    private final EmployeeService employeeService;
+
+    @FXML private Label lblHeader;
+    @FXML private CheckBox inputIsDriver;
+    @FXML private CheckBox inputIsPilot;
+    @FXML private TextField inputName;
+    @FXML private ChoiceBox<String> inputQualification;
+    @FXML private Button btnCreate;
+
+    private Node rootElement;
+    private Employee employee;
+    private boolean isEdit;
+
+    private Runnable consumerCancelClicked;
+    private Runnable consumerCreateClicked;
+
+    public CreateNewEmployeeController(EmployeeService employeeService) {
+        this.employeeService = employeeService;
+    }
+
+    @FXML
+    private void initialize() {
+        inputQualification.setItems(
+                FXCollections.observableArrayList(
+                        Stream.of(
+                                        EducationLevel.RS,
+                                        EducationLevel.NFS,
+                                        EducationLevel.NKV,
+                                        EducationLevel.NKA,
+                                        EducationLevel.NKI,
+                                        EducationLevel.NA)
+                                .map(Enum::toString)
+                                .collect(Collectors.toList())));
+
+        inputQualification.setValue(EducationLevel.RS.toString());
+        employee =
+                Employee.builder()
+                        .name("")
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(false)
+                        .isPilot(false)
+                        .birthday(LocalDate.MIN)
+                        .build();
+    }
+
+    @FXML
+    private void onCancelClicked() {
+        LOG.debug("Hyperlink \"abbrechen\" clicked.");
+        if (consumerCancelClicked != null) {
+            consumerCancelClicked.run();
+        }
+    }
+
+    @FXML
+    private void onCreateClicked() {
+        LOG.debug("Button {} clicked.", btnCreate.getText());
+
+        employee =
+                employee.toBuilder()
+                        .name(inputName.getText())
+                        .educationLevel(parseEducationLevel())
+                        .birthday(LocalDate.MIN) // TODO: change UI to include birthday field
+                        .isDriver(inputIsDriver.isSelected())
+                        .isPilot(inputIsPilot.isSelected())
+                        .build();
+
+        try {
+            if (isEdit) {
+                employeeService.update(employee);
+            } else {
+                employeeService.add(employee);
+            }
+        } catch (InvalidEmployeeException e) {
+            LOG.debug("Validation for Employee failed");
+            showValidationErrorAlertAndWait(e.getMessage());
+            return;
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in onCreateClicked(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Der Eintrag konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.");
+            return;
+        }
+
+        showSuccessAlertAndWait(
+                "Der/die MitarbeiterIn wurde erfolgreich angelegt und gespeichert!");
+
+        if (consumerCreateClicked != null) {
+            consumerCreateClicked.run();
+        }
+    }
+
+    private EducationLevel parseEducationLevel() {
+        if (inputQualification.getSelectionModel().getSelectedItem() == null) {
+            return EducationLevel.RS;
+        }
+        return EducationLevel.valueOf(inputQualification.getSelectionModel().getSelectedItem());
+    }
+
+    private void setData(Employee employee) {
+        isEdit = true;
+        this.employee = employee;
+        inputName.setText(employee.name());
+        inputQualification.setValue(employee.educationLevel().name());
+        inputIsDriver.setSelected(employee.isDriver());
+        inputIsPilot.setSelected(employee.isPilot());
+        lblHeader.setText("Person bearbeiten");
+        btnCreate.setText("Speichern");
+    }
+
+    public static CreateNewEmployeeController createCreateNewEmployeeController(
+            SpringFXMLLoader fxmlLoader, Employee employee) throws IOException {
+        CreateNewEmployeeController controller = createCreateNewEmployeeController(fxmlLoader);
+        controller.setData(employee);
+        return controller;
+    }
+
+    public static CreateNewEmployeeController createCreateNewEmployeeController(
+            SpringFXMLLoader fxmlLoader) throws IOException {
+        FXMLWrapper<Object, CreateNewEmployeeController> wrapper =
+                fxmlLoader.loadAndWrap(
+                        "/fxml/createNewEmployee.fxml", CreateNewEmployeeController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        CreateNewEmployeeController controller = wrapper.getController();
+        controller.rootElement = root;
+        return controller;
+    }
+
+    public Node getRootElement() {
+        return rootElement;
+    }
+
+    public void setConsumerCancelClicked(Runnable consumerCancelClicked) {
+        this.consumerCancelClicked = consumerCancelClicked;
+    }
+
+    public void setConsumerCreateClicked(Runnable consumerCreateClicked) {
+        this.consumerCreateClicked = consumerCreateClicked;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java
new file mode 100644
index 0000000..b237265
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java
@@ -0,0 +1,371 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showSuccessAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.io.IOException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class CreateOperationController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(CreateOperationController.class);
+
+    public AnchorPane apCreateOperation;
+    @FXML private GridPane grdWindowContainer;
+    @FXML private TextField txtCode;
+    @FXML private TextField txtAddress;
+    @FXML private TextField txtNote;
+    @FXML private Button btnCreateOperation;
+    @FXML private ListView<Vehicle> lvVehicles;
+    @FXML private ListView<Operation> lvActiveOperations;
+    @FXML private Label lblChosenVehicles;
+    @FXML private AnchorPane apInvisible;
+    @FXML private OperationDetailsController operationDetailsController;
+    @FXML private ManageEmployeesController manageEmployeesController;
+    @FXML private CreateCarController createCarController;
+    @FXML private RegistrationWindowController registrationWindowController;
+    @FXML private ArchiveOperationController archiveOperationController;
+    @FXML private FlowPane fpVehicles;
+
+    private LinkedList<Vehicle> chosenVehicles = new LinkedList<>();
+
+    private final OperationService operationService;
+    private final VehicleService vehicleService;
+
+    public CreateOperationController(
+            OperationService operationService, VehicleService vehicleService) {
+        this.operationService = operationService;
+        this.vehicleService = vehicleService;
+    }
+
+    @FXML
+    private void initialize() {
+
+        lblChosenVehicles.setText("keine ausgewählt");
+        lvActiveOperations.setCellFactory(param -> generateOpCodeListItem());
+
+        lvActiveOperations.setOnMouseClicked(
+                event -> {
+                    if (event.getClickCount() == 2) {
+                        if (lvActiveOperations.getSelectionModel().getSelectedItem() == null) {
+                            return;
+                        }
+                        openDetailsWindow(lvActiveOperations.getSelectionModel().getSelectedItem());
+                    }
+                });
+
+        setVisible(true);
+        createCarController.setVisible(false);
+        registrationWindowController.setVisible(false);
+    }
+
+    public void updateList() {
+        try {
+            fpVehicles.getChildren().clear();
+
+            // TODO: this should probably be handled differently
+            Set<Vehicle> vehicles;
+            if (txtCode.getText().isEmpty()) {
+                vehicles =
+                        vehicleService.list(
+                                EnumSet.complementOf(EnumSet.of(Vehicle.Status.ABGEMELDET)));
+            } else {
+                vehicles = operationService.rankVehicles(txtCode.getText());
+            }
+
+            for (Vehicle vehicle : vehicles) {
+                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
+
+                controller.setData(vehicle, true, false);
+                controller
+                        .getRootElement()
+                        .setOnMouseClicked(
+                                event -> {
+                                    if (event.getButton().equals(MouseButton.SECONDARY)) {
+                                        createContextMenu(vehicle, vehicleService)
+                                                .show(
+                                                        controller.getRootElement(),
+                                                        event.getScreenX(),
+                                                        event.getScreenY());
+                                    } else {
+                                        if (chosenVehicles.contains(vehicle)) {
+                                            chosenVehicles.remove(vehicle);
+                                            controller.setSelected(false);
+                                        } else {
+                                            chosenVehicles.add(vehicle);
+                                            controller.setSelected(true);
+                                        }
+
+                                        StringBuilder result = new StringBuilder();
+                                        for (int i = 0; i < chosenVehicles.size(); i++) {
+                                            if (i == chosenVehicles.size() - 1) {
+                                                result.append(chosenVehicles.get(i).name());
+                                            } else {
+                                                result.append(chosenVehicles.get(i).name())
+                                                        .append(", ");
+                                            }
+                                        }
+                                        if (result.toString().equals("")) {
+                                            lblChosenVehicles.setText("keine ausgewählt");
+                                        } else {
+                                            lblChosenVehicles.setText(result.toString());
+                                        }
+                                    }
+                                });
+
+                if (chosenVehicles.stream().anyMatch(v -> v.id() == vehicle.id()))
+                    controller.setSelected(true);
+
+                fpVehicles.getChildren().add(controller.getRootElement());
+            }
+        } catch (ServiceException | IOException e) {
+            LOG.error("Exception in updateList(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen des Ranking ist ein Fehler aufgetreten.");
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in updateList(). ", e);
+            showValidationErrorAlertAndWait(e.getMessage());
+        }
+        try {
+            lvActiveOperations.setItems(
+                    FXCollections.observableArrayList(
+                            operationService.list(EnumSet.of(Status.ACTIVE))));
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in updateList(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten");
+        }
+    }
+
+    private ContextMenu createContextMenu(Vehicle data, VehicleService vehicleService) {
+        ContextMenu menu = new ContextMenu();
+
+        for (Vehicle.Status status : Vehicle.Status.values()) {
+            if (status == Vehicle.Status.ABGEMELDET) {
+                continue;
+            }
+
+            MenuItem mi = new MenuItem(status.name());
+
+            if (status == Vehicle.Status.FREI_FUNK || status == Vehicle.Status.FREI_WACHE) {
+                mi.getStyleClass().add("mi-free");
+            } else {
+                mi.getStyleClass().add("mi-other");
+            }
+
+            mi.setOnAction(
+                    event -> {
+                        try {
+                            vehicleService.update(data.toBuilder().status(status).build());
+                            this.updateList();
+                        } catch (InvalidVehicleException e) {
+                            LOG.debug(
+                                    "Validation error in createContextMenu(). (mi.setOnAction) ",
+                                    e);
+                            showValidationErrorAlertAndWait(e.getMessage());
+                        } catch (ServiceException e) {
+                            LOG.error("Exception in createContextMenu(). (mi.setOnAction) ", e);
+                            showServiceExceptionAlertAndWait(
+                                    "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
+                        }
+                    });
+
+            menu.getItems().add(mi);
+        }
+
+        MenuItem abmelden = new MenuItem("abmelden");
+
+        abmelden.setOnAction(
+                event -> {
+                    try {
+                        List<Registration> registrations = data.registrations();
+                        assert registrations
+                                != null; // Otherwise the element shouldn't be in the list.
+
+                        List<Registration> newRegistrations = new ArrayList<>();
+                        Instant now = Instant.now();
+
+                        for (Registration registration : registrations) {
+                            if (registration.start().isBefore(now)
+                                    && registration.end().isAfter(now)) {
+                                newRegistrations.add(
+                                        registration
+                                                .toBuilder()
+                                                .end(Instant.now().minus(1, ChronoUnit.SECONDS))
+                                                .build());
+                            } else newRegistrations.add(registration);
+                        }
+
+                        vehicleService.update(
+                                data.toBuilder()
+                                        .registrations(newRegistrations)
+                                        .status(Vehicle.Status.ABGEMELDET)
+                                        .build());
+
+                        this.updateList();
+                    } catch (InvalidVehicleException e) {
+                        LOG.debug(
+                                "Validation error in createContextMenu(). (abmelden.setOnAction) ",
+                                e);
+                        showValidationErrorAlertAndWait(e.getMessage());
+                    } catch (ServiceException e) {
+                        LOG.error("Exception in createContextMenu(). (abmelden.setOnAction) ", e);
+                        showServiceExceptionAlertAndWait(
+                                "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
+                    }
+                });
+
+        menu.getItems().add(abmelden);
+        return menu;
+    }
+
+    @FXML
+    protected void createOperationClicked() {
+        LOG.debug("Button \"Erstellen\" clicked.");
+        Vehicle[] vehicles = new Vehicle[chosenVehicles.size()];
+        for (int i = 0; i < chosenVehicles.size(); i++) {
+            vehicles[i] = chosenVehicles.get(i);
+        }
+        Operation operation =
+                Operation.builder()
+                        .additionalInfo(txtNote.getText())
+                        .destination(txtAddress.getText())
+                        .opCode(txtCode.getText())
+                        .status(Status.ACTIVE)
+                        .vehicles(Set.of(vehicles))
+                        .build();
+        try {
+            operationService.add(operation);
+        } catch (ServiceException e) {
+            LOG.error("Exception in createOperationClicked(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen des Einsatzes ist ein Fehler aufgetreten.");
+            return;
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in createOperationClicked(). ", e);
+            showValidationErrorAlertAndWait(e.getMessage());
+            return;
+        }
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich gespeichert.");
+        updateList();
+        lblChosenVehicles.setText("keine ausgewählt");
+        txtAddress.setText("");
+        txtCode.setText("");
+        txtNote.setText("");
+        chosenVehicles = new LinkedList<>();
+    }
+
+    @FXML
+    private void onRegistrationLinkClicked() {
+        LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
+        openRegistrationWindow();
+    }
+
+    @FXML
+    private void onEmployeeLinkClicked() {
+        LOG.debug("Hyperlink \"Personen\" clicked.");
+        openCreateNewEmployeeWindow();
+    }
+
+    @FXML
+    private void onVehicleLinkClicked() {
+        LOG.debug("Hyperlink \"Fahrzeuge\" clicked.");
+        openCreateCarWindow();
+    }
+
+    @FXML
+    private void onArchivLinkClicked() {
+        LOG.debug("Hyperlink \"Archiv\" clicked.");
+        archiveOperationController.update();
+        openArchivWindow();
+    }
+
+    private void openArchivWindow() {
+        archiveOperationController.setVisible(true);
+        this.setVisible(false);
+    }
+
+    void setVisible(boolean b) {
+        apInvisible.setVisible(!b);
+        grdWindowContainer.setVisible(!b);
+
+        updateList();
+    }
+
+    private void openDetailsWindow(Operation operation) {
+        operationDetailsController.initOperation(operation);
+        this.setVisible(false);
+    }
+
+    private void openCreateNewEmployeeWindow() {
+        this.setVisible(false);
+        manageEmployeesController.setVisible(true);
+    }
+
+    private void openCreateCarWindow() {
+        this.setVisible(false);
+        createCarController.setVisible(true);
+    }
+
+    private void openRegistrationWindow() {
+        this.setVisible(false);
+        registrationWindowController.setVisible(true);
+    }
+
+    @FXML
+    private void onOperationCodeChanged(KeyEvent keyEvent) {
+        if (keyEvent.getCode() == KeyCode.ENTER) {
+            updateList();
+        }
+    }
+
+    static ListCell<Operation> generateOpCodeListItem() {
+        return new ListCell<>() {
+            @Override
+            protected void updateItem(Operation item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (empty || item == null || item.opCode() == null) {
+                    setText(null);
+                } else {
+                    setText(item.opCode());
+                }
+            }
+        };
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CustomListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CustomListItemController.java
new file mode 100644
index 0000000..ced0c10
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CustomListItemController.java
@@ -0,0 +1,24 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import javafx.scene.Node;
+
+public abstract class CustomListItemController {
+
+    protected Node rootElement;
+
+    public Node getRootElement() {
+        return rootElement;
+    }
+
+    public void setSelected(boolean selected) {
+        rootElement.getStyleClass().clear();
+
+        if (selected) {
+            rootElement.getStyleClass().add("bg-yellow");
+            rootElement.getStyleClass().add("shadowed");
+        } else {
+            rootElement.getStyleClass().add("bg-white");
+            rootElement.getStyleClass().add("shadowed");
+        }
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/DetailArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/DetailArchiveOperationController.java
new file mode 100644
index 0000000..32630a5
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/DetailArchiveOperationController.java
@@ -0,0 +1,77 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.util.Objects;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.layout.VBox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class DetailArchiveOperationController {
+    private static final Logger LOG =
+            LoggerFactory.getLogger(DetailArchiveOperationController.class);
+
+    @FXML private VBox vBoxVehicle;
+    @FXML private VBox vBoxPeople;
+    private final SpringFXMLLoader fxmlLoader;
+
+    public DetailArchiveOperationController(SpringFXMLLoader fxmlLoader) {
+        this.fxmlLoader = fxmlLoader;
+    }
+
+    static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader) throws IOException {
+        FXMLWrapper<Object, DetailArchiveOperationController> wrapper =
+                fxmlLoader.loadAndWrap(
+                        "/fxml/DetailArchiveOperation.fxml",
+                        DetailArchiveOperationController.class);
+
+        Node root = (Node) wrapper.getLoadedObject();
+        DetailArchiveOperationController result = wrapper.getController();
+        result.rootElement = root;
+
+        return result;
+    }
+
+    public Node getRoot() {
+        return rootElement;
+    }
+
+    private Node rootElement;
+
+    public void set(Vehicle vehicle) {
+        VehiclePaneController controller;
+        try {
+            controller = VehiclePaneController.createVehiclePane();
+            controller.setData(vehicle, false, false);
+            vBoxVehicle.getChildren().add(controller.getRootElement());
+        } catch (IOException e) {
+            LOG.error("IOException in set(Vehicle). (vBoxVehicle) ", e);
+            showServiceExceptionAlertAndWait(
+                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
+        }
+        try {
+            for (int i = 0; i < Objects.requireNonNull(vehicle.registrations()).size(); i++) {
+                Employee employee =
+                        Objects.requireNonNull(vehicle.registrations()).get(i).employee();
+
+                EmployeeListItemController employeeListItemController =
+                        EmployeeListItemController.createEmployeeListItemController(
+                                fxmlLoader, employee);
+                vBoxPeople.getChildren().add(employeeListItemController.getRootElement());
+            }
+        } catch (IOException e) {
+            LOG.error("IOException in set(Vehicle). (vBoxPeople) ", e);
+            showServiceExceptionAlertAndWait(
+                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
+        }
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListController.java
new file mode 100644
index 0000000..12f6bff
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListController.java
@@ -0,0 +1,133 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.layout.FlowPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+
+@Controller
+@Scope("prototype")
+public class EmployeeListController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(EmployeeListController.class);
+
+    @FXML private FlowPane flowPaneEmployeeList;
+
+    private Consumer<Employee> onEmployeeClicked;
+
+    private final SpringFXMLLoader fxmlLoader;
+    private Node rootElement;
+    private List<EmployeeListItemController> employeeListItemControllers;
+    private Insets listItemMargins = new Insets(10, 5, 0, 5);
+
+    public EmployeeListController(SpringFXMLLoader fxmlLoader) {
+        this.fxmlLoader = fxmlLoader;
+        this.employeeListItemControllers = new ArrayList<>();
+    }
+
+    public void setListItemMargins(Insets value) {
+        this.listItemMargins = value;
+    }
+
+    public void setData(Set<Employee> employeeList) {
+        setData(employeeList, null, null);
+    }
+
+    public void setData(Set<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
+        setData(employeeList, onEmployeeClicked, null);
+    }
+
+    public void setData(
+            Set<Employee> employeeList,
+            Consumer<Employee> onEmployeeClicked,
+            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
+
+        flowPaneEmployeeList.getChildren().clear();
+        employeeListItemControllers.clear();
+        employeeList.forEach(
+                employee ->
+                        addEmployeeToFlowPane(
+                                employee, onEmployeeClicked, onEmployeeListItemClicked));
+    }
+
+    private void addEmployeeToFlowPane(
+            Employee employee,
+            Consumer<Employee> onEmployeeClicked,
+            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
+
+        try {
+            EmployeeListItemController controller =
+                    EmployeeListItemController.createEmployeeListItemController(
+                            fxmlLoader, employee);
+            Node rootElement = controller.getRootElement();
+            flowPaneEmployeeList.getChildren().add(rootElement);
+            employeeListItemControllers.add(controller);
+            FlowPane.setMargin(rootElement, listItemMargins);
+            if (onEmployeeClicked != null) {
+                controller.setConsumerEmployeeClicked(onEmployeeClicked);
+            }
+            if (onEmployeeListItemClicked != null) {
+                controller.setConsumerEmployeeListItemClicked(
+                        employeeListItemController -> {
+                            onEmployeeListItemClicked.accept(employeeListItemController);
+                            if (this.onEmployeeClicked != null) {
+                                this.onEmployeeClicked.accept(
+                                        employeeListItemController.getEmployee());
+                            }
+                        });
+            }
+        } catch (IOException e) {
+            LOG.error("IOException in addEmployeeToFlowPane. ", e);
+        }
+    }
+
+    private void setEmployeeSelected(Employee employee, boolean selected) {
+        employeeListItemControllers
+                .stream()
+                .filter(controller -> controller.getEmployee().equals(employee))
+                .forEach(controller -> controller.setSelected(selected));
+    }
+
+    public void selectEmployee(Employee employee) {
+        setEmployeeSelected(employee, true);
+    }
+
+    public void deselectEmployee(Employee employee) {
+        setEmployeeSelected(employee, false);
+    }
+
+    public void deselectAllEmployees() {
+        employeeListItemControllers.forEach(
+                employeeListItemController -> employeeListItemController.setSelected(false));
+    }
+
+    public static EmployeeListController createEmployeeListController(SpringFXMLLoader loader)
+            throws IOException {
+        FXMLWrapper<Object, EmployeeListController> wrapper =
+                loader.loadAndWrap("/fxml/employeeList.fxml", EmployeeListController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        EmployeeListController controller = wrapper.getController();
+        controller.rootElement = root;
+        return controller;
+    }
+
+    public Node getRootElement() {
+        return rootElement;
+    }
+
+    public void setOnEmployeeClicked(Consumer<Employee> onEmployeeClicked) {
+        this.onEmployeeClicked = onEmployeeClicked;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListItemController.java
new file mode 100644
index 0000000..543fe0d
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/EmployeeListItemController.java
@@ -0,0 +1,87 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.util.function.Consumer;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+
+@Controller
+@Scope("prototype")
+public class EmployeeListItemController extends CustomListItemController {
+
+    @FXML private Label lblName;
+    @FXML private Label lblQualification;
+    @FXML private Label lblPilot;
+    @FXML private Label lblDriver;
+    @FXML private ImageView imgPilot;
+    @FXML private ImageView imgDriver;
+    @FXML private ImageView imgQualification;
+
+    private Employee employee;
+
+    private Consumer<Employee> consumerEmployeeClicked;
+    private Consumer<EmployeeListItemController> consumerEmployeeListItemClicked;
+
+    @FXML
+    private void onEmployeeClicked() {
+        if (consumerEmployeeClicked != null) {
+            consumerEmployeeClicked.accept(employee);
+        }
+        if (consumerEmployeeListItemClicked != null) {
+            consumerEmployeeListItemClicked.accept(this);
+        }
+    }
+
+    private void setData(Employee employee) {
+        this.employee = employee;
+        lblName.setText(employee.name());
+        lblQualification.setText(employee.educationLevel().name());
+        lblPilot.setText(String.format("%s Pilot", employee.isPilot() ? "ist" : "nicht"));
+        lblDriver.setText(String.format("%s Fahrer", employee.isDriver() ? "ist" : "nicht"));
+        imgQualification.setImage(new Image("/images/Qualification.png"));
+        String imgSrcPilot =
+                String.format("/images/%s", employee.isPilot() ? "Pilot.png" : "NotPilot.png");
+        imgPilot.setImage(new Image(imgSrcPilot));
+        String imgSrcDriver =
+                String.format("/images/%s", employee.isDriver() ? "Driver.png" : "NotDriver.png");
+        imgDriver.setImage(new Image(imgSrcDriver));
+    }
+
+    public static EmployeeListItemController createEmployeeListItemController(
+            SpringFXMLLoader fxmlLoader, Employee employee) throws IOException {
+        EmployeeListItemController controller = createEmployeeListItemController(fxmlLoader);
+        controller.setData(employee);
+        return controller;
+    }
+
+    public static EmployeeListItemController createEmployeeListItemController(
+            SpringFXMLLoader loader) throws IOException {
+        FXMLWrapper<Object, EmployeeListItemController> wrapper =
+                loader.loadAndWrap("/fxml/employeeListItem.fxml", EmployeeListItemController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        EmployeeListItemController controller = wrapper.getController();
+        controller.rootElement = root;
+        return controller;
+    }
+
+    public Employee getEmployee() {
+        return employee;
+    }
+
+    public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) {
+        this.consumerEmployeeClicked = consumerEmployeeClicked;
+    }
+
+    public void setConsumerEmployeeListItemClicked(
+            Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) {
+        this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/FilterEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/FilterEmployeesController.java
new file mode 100644
index 0000000..a31c3e3
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/FilterEmployeesController.java
@@ -0,0 +1,65 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
+import java.io.IOException;
+import java.util.function.Consumer;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.TextField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+
+@Controller
+@Scope("prototype")
+public class FilterEmployeesController {
+    private static final Logger LOG = LoggerFactory.getLogger(FilterEmployeesController.class);
+
+    @FXML private TextField inputFilterString;
+
+    private Consumer<String> consumerFilterTextChanged;
+    private Runnable consumerAddEmployeeClicked;
+
+    private Node rootElement;
+
+    @FXML
+    private void onAddEmployeeClicked() {
+        LOG.debug("Button \"Person hinzufügen\" clicked.");
+        if (consumerAddEmployeeClicked != null) {
+            consumerAddEmployeeClicked.run();
+        }
+    }
+
+    @FXML
+    private void onFilterTextChanged() {
+        LOG.debug("Filter text changed.");
+        if (consumerFilterTextChanged != null) {
+            consumerFilterTextChanged.accept(inputFilterString.getText());
+        }
+    }
+
+    public void setOnFilterTextChangedListener(Consumer<String> callback) {
+        this.consumerFilterTextChanged = callback;
+    }
+
+    public void setOnAddEmployeeClickedListener(Runnable callback) {
+        this.consumerAddEmployeeClicked = callback;
+    }
+
+    public static FilterEmployeesController createFilterEmployeesController(
+            SpringFXMLLoader fxmlLoader) throws IOException {
+        FXMLWrapper<Object, FilterEmployeesController> wrapper =
+                fxmlLoader.loadAndWrap(
+                        "/fxml/filterEmployeesControl.fxml", FilterEmployeesController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        FilterEmployeesController controller = wrapper.getController();
+        controller.rootElement = root;
+        return controller;
+    }
+
+    public Node getRootElement() {
+        return rootElement;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/Helper.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/Helper.java
new file mode 100644
index 0000000..f120eb6
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/Helper.java
@@ -0,0 +1,34 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
+
+public class Helper {
+
+    static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
+    static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
+    static final String ALERT_TITLE_SUCCESS = "Erfolg";
+
+    private Helper() {} // SonarLint insisted to create a private constructor to hide the public one
+
+    static void showValidationErrorAlertAndWait(String message) {
+        showAlertWithOkButtonAndWait(AlertType.ERROR, ALERT_TITLE_VALIDATION_ERROR, message);
+    }
+
+    static void showServiceExceptionAlertAndWait(String message) {
+        showAlertWithOkButtonAndWait(AlertType.ERROR, ALERT_TITLE_SERVICE_EXCEPTION, message);
+    }
+
+    static void showSuccessAlertAndWait(String message) {
+        showAlertWithOkButtonAndWait(AlertType.INFORMATION, ALERT_TITLE_SUCCESS, message);
+    }
+
+    static void showAlertWithOkButtonAndWait(
+            AlertType alertType, String headerText, String contentText) {
+        Alert alert = new Alert(alertType, contentText, ButtonType.OK);
+        alert.setTitle(headerText);
+        alert.setHeaderText(headerText);
+        alert.showAndWait();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ManageEmployeesController.java
new file mode 100644
index 0000000..6138094
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ManageEmployeesController.java
@@ -0,0 +1,120 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+import javafx.fxml.FXML;
+import javafx.scene.layout.AnchorPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class ManageEmployeesController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ManageEmployeesController.class);
+    @FXML private AnchorPane listEmployeesAP;
+    @FXML private AnchorPane containerHeader;
+    @FXML private EmployeeListController employeeListController;
+
+    private final EmployeeService employeeService;
+    private final SpringFXMLLoader fxmlLoader;
+
+    private final CreateOperationController createOperationController;
+
+    public ManageEmployeesController(
+            EmployeeService employeeService,
+            SpringFXMLLoader fxmlLoader,
+            CreateOperationController createOperationController) {
+        this.employeeService = employeeService;
+        this.fxmlLoader = fxmlLoader;
+        this.createOperationController = createOperationController;
+    }
+
+    @FXML
+    private void initialize() {
+        openFilter();
+    }
+
+    private void openFilter() {
+        try {
+            FilterEmployeesController filterEmployeesController =
+                    FilterEmployeesController.createFilterEmployeesController(fxmlLoader);
+            containerHeader.getChildren().clear();
+            containerHeader.getChildren().add(filterEmployeesController.getRootElement());
+            filterEmployeesController.setOnFilterTextChangedListener(this::updateEmployeeList);
+            filterEmployeesController.setOnAddEmployeeClickedListener(this::openAddEmployee);
+            updateEmployeeList();
+
+        } catch (IOException e) {
+            LOG.error("IOException in openFilter().", e);
+        }
+    }
+
+    private void openAddEmployee() {
+        employeeListController.deselectAllEmployees();
+        openEmployee(null);
+    }
+
+    private void openEditEmployee(Employee employee) {
+        employeeListController.deselectAllEmployees();
+        employeeListController.selectEmployee(employee);
+        openEmployee(employee);
+    }
+
+    private void openEmployee(Employee employee) {
+        try {
+            CreateNewEmployeeController createNewEmployeeController =
+                    employee == null
+                            ? CreateNewEmployeeController.createCreateNewEmployeeController(
+                                    fxmlLoader)
+                            : CreateNewEmployeeController.createCreateNewEmployeeController(
+                                    fxmlLoader, employee);
+            containerHeader.getChildren().clear();
+            containerHeader.getChildren().add(createNewEmployeeController.getRootElement());
+            createNewEmployeeController.setConsumerCancelClicked(this::openFilter);
+            createNewEmployeeController.setConsumerCreateClicked(this::openFilter);
+        } catch (IOException e) {
+            LOG.error("IOException in openEmployee(). ", e);
+        }
+    }
+
+    private void updateEmployeeList() {
+        updateEmployeeList("");
+    }
+
+    private void updateEmployeeList(String searchString) {
+
+        try {
+            employeeListController.setData(
+                    employeeService
+                            .list()
+                            .stream()
+                            .filter(
+                                    employee ->
+                                            searchString.trim().isEmpty()
+                                                    || employee.name()
+                                                            .toLowerCase()
+                                                            .contains(searchString.toLowerCase()))
+                            .collect(Collectors.toCollection(HashSet::new)),
+                    this::openEditEmployee);
+
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in updateEmployeeList(). ", e);
+        }
+    }
+
+    public void setVisible(boolean b) {
+        listEmployeesAP.setVisible(b);
+    }
+
+    public void backToMain() {
+        LOG.debug("Hyperlink \"Zurück\" clicked.");
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
new file mode 100644
index 0000000..0476fc6
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
@@ -0,0 +1,169 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showAlertWithOkButtonAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showSuccessAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class OperationDetailsController {
+    private static final Logger LOG = LoggerFactory.getLogger(OperationDetailsController.class);
+
+    public Operation operation;
+    private final OperationService operationService;
+    private final VehicleService vehicleService;
+    private final CreateOperationController createOperationController;
+    @FXML private FlowPane fpVehicles;
+    @FXML private ListView<Operation> lvActiveOperations;
+    @FXML private Label lblChosenVehicles;
+    @FXML private Button btnCloseOperation;
+    @FXML private Button btnCancelOperation;
+    @FXML private Label lblCode, lblAdditionalInfo, lblAddress;
+    @FXML private AnchorPane operationDetailsAP;
+
+    public OperationDetailsController(
+            OperationService operationService,
+            VehicleService vehicleService,
+            CreateOperationController createOperationController) {
+        this.operationService = operationService;
+        this.vehicleService = vehicleService;
+        this.createOperationController = createOperationController;
+    }
+
+    @FXML
+    private void initialize() {
+        lvActiveOperations.setCellFactory(
+                param -> CreateOperationController.generateOpCodeListItem());
+        lvActiveOperations.setOnMouseClicked(
+                event -> {
+                    if (event.getClickCount() == 2) {
+                        if (lvActiveOperations.getSelectionModel().getSelectedItem() == null) {
+                            return;
+                        }
+                        initOperation(lvActiveOperations.getSelectionModel().getSelectedItem());
+                    }
+                });
+    }
+
+    private void updateFlowPane() {
+        try {
+            fpVehicles.getChildren().clear();
+            for (Vehicle vehicle : operation.vehicles()) {
+                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
+                controller.setData(vehicle, true, true);
+                controller.getBtnRequest().setOnAction(e -> requestVehicleClicked(controller));
+                fpVehicles.getChildren().add(controller.getRootElement());
+            }
+        } catch (IOException e) {
+            LOG.error("Error while updating list.", e);
+            showServiceExceptionAlertAndWait("Error while updating list.");
+        }
+    }
+
+    void initOperation(Operation operation) {
+        fillActiveList();
+        this.operation = operation;
+        lblCode.setText(operation.opCode());
+        Collection<String> vehicleNames =
+                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
+        String result = String.join(", ", vehicleNames);
+        lblChosenVehicles.setText(result.toString());
+        lblAdditionalInfo.setText(operation.additionalInfo());
+        lblAddress.setText(operation.destination());
+        updateFlowPane();
+        operationDetailsAP.setVisible(true);
+    }
+
+    private void fillActiveList() {
+        try {
+            lvActiveOperations.setItems(
+                    FXCollections.observableArrayList(
+                            operationService.list(EnumSet.of(Status.ACTIVE))));
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in fillActiveList(). ", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+        }
+    }
+
+    @FXML
+    public void closeOperationClicked() {
+        LOG.debug("Button \"Abschließen\" clicked.");
+        try {
+            operationService.complete(operation.id(), Status.COMPLETED);
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in closeOperationClicked(). ", e);
+            showAlertWithOkButtonAndWait(AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            return;
+        } catch (ServiceException e) {
+            LOG.error("Exception in closeOperationClicked(). ", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+            return;
+        }
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
+        createOperationController.updateList();
+        closeWindow();
+    }
+
+    public void cancelOperationClicked() {
+        LOG.debug("Button \"Stornieren\" clicked.");
+        try {
+            operationService.complete(operation.id(), Status.CANCELLED);
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in cancelOperationClicked(). ", e);
+            showValidationErrorAlertAndWait(e.getMessage());
+            return;
+        } catch (ServiceException e) {
+            LOG.error("Exception in cancelOperationClicked(). ", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+            return;
+        }
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
+        createOperationController.updateList();
+        closeWindow();
+    }
+
+    private void requestVehicleClicked(VehiclePaneController v) {
+        LOG.debug("Button \"Nachfordern\" clicked.");
+
+        try {
+            operationService.requestVehicles(operation.id(), Set.of(v.getData().id()));
+        } catch (ServiceException | InvalidOperationException | InvalidVehicleException e) {
+            LOG.error("Exception in requestVehicleClicked()", e);
+            showServiceExceptionAlertAndWait(e.getMessage());
+            return;
+        }
+        showSuccessAlertAndWait("Das Fahrzeug wurde erfolgreich angefordert");
+        createOperationController.updateList();
+    }
+
+    public void closeWindow() {
+        LOG.debug("Hyperlink \"Zurück\" clicked.");
+        operationDetailsAP.setVisible(false);
+        this.createOperationController.setVisible(true);
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationInArchiveController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationInArchiveController.java
new file mode 100644
index 0000000..17f0f55
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationInArchiveController.java
@@ -0,0 +1,65 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.text.Text;
+
+public class OperationInArchiveController {
+
+    @FXML private Text txtAddress;
+    @FXML private Text txtVehicles;
+    @FXML private Text txtDate;
+    @FXML private Text txtOpCode;
+
+    static OperationInArchiveController create() throws IOException {
+        FXMLLoader fxmlLoader =
+                new FXMLLoader(
+                        OperationInArchiveController.class.getResource(
+                                "/fxml/OperationInArchive.fxml"));
+        Node root = fxmlLoader.load();
+        OperationInArchiveController result = fxmlLoader.getController();
+        result.rootElement = root;
+
+        return result;
+    }
+
+    public Node getRoot() {
+        return rootElement;
+    }
+
+    private Node rootElement;
+
+    public void set(Operation operation) {
+        txtAddress.setText(operation.destination());
+        String date = "am ";
+        if (operation.created() != null) {
+            LocalDateTime myDateTime =
+                    LocalDateTime.ofInstant(
+                            Objects.requireNonNull(operation.created()), ZoneOffset.UTC);
+            date +=
+                    myDateTime.getDayOfMonth()
+                            + "."
+                            + myDateTime.getMonth().getValue()
+                            + "."
+                            + myDateTime.getYear();
+            txtDate.setText(date);
+        } else {
+            txtDate.setText("---");
+        }
+        txtOpCode.setText(operation.opCode());
+        Collection<String> elements =
+                operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
+        String result = String.join(", ", elements);
+
+        txtVehicles.setText(result);
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java
new file mode 100644
index 0000000..9c47fe4
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java
@@ -0,0 +1,279 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showServiceExceptionAlertAndWait;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.RegistrationService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class RegistrationWindowController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RegistrationWindowController.class);
+
+    private final EmployeeService employeeService;
+    private final VehicleService vehicleService;
+    private final RegistrationService registrationService;
+    private final CreateOperationController createOperationController;
+    private final SpringFXMLLoader fxmlLoader;
+
+    @FXML private GridPane root;
+    @FXML private VBox vbVehicles;
+    @FXML private ScrollPane listEmployee;
+    @FXML private ChoiceBox<Integer> cbStart;
+    @FXML private ChoiceBox<Integer> cbEnd;
+    @FXML private Label lVehicles;
+    @FXML private Label lEmployees;
+    @FXML private TextField tfVehicleSearch;
+    @FXML private TextField tfEmployeeSearch;
+    private EmployeeListController employeeListController;
+
+    private Vehicle chosenVehicle;
+    private List<Employee> chosenEmployees = new LinkedList<>();
+
+    public RegistrationWindowController(
+            EmployeeService employeeService,
+            VehicleService vehicleService,
+            CreateOperationController createOperationController,
+            RegistrationService registrationService,
+            SpringFXMLLoader fxmlLoader) {
+        this.employeeService = employeeService;
+        this.vehicleService = vehicleService;
+        this.createOperationController = createOperationController;
+        this.registrationService = registrationService;
+        this.fxmlLoader = fxmlLoader;
+    }
+
+    @FXML
+    private void initialize() throws IOException {
+        employeeListController = EmployeeListController.createEmployeeListController(fxmlLoader);
+        employeeListController.setListItemMargins(new Insets(10, 6, 0, 6));
+        //        listEmployee. .getChildren().add(employeeListController.getRootElement());
+        Node emplList = employeeListController.getRootElement();
+        //        emplList.(360);
+        listEmployee.setContent(emplList);
+
+        ObservableList<Integer> hours =
+                FXCollections.observableArrayList(
+                        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+                        21, 22, 23);
+        cbStart.setItems(hours);
+        cbStart.setValue(0);
+        cbEnd.setItems(hours);
+        cbEnd.setValue(12);
+
+        reset();
+    }
+
+    private void updateEmplList() {
+        employeeListController.deselectAllEmployees();
+
+        try {
+            Set<Employee> employees =
+                    employeeService
+                            .list()
+                            .stream()
+                            .filter(
+                                    e ->
+                                            e.name()
+                                                    .toLowerCase()
+                                                    .contains(
+                                                            tfEmployeeSearch
+                                                                    .getText()
+                                                                    .toLowerCase()))
+                            .collect(Collectors.toCollection(HashSet::new));
+            employeeListController.setData(
+                    employees,
+                    selection -> {
+                        if (selection == null) {
+                            return;
+                        } else if (chosenEmployees.contains(selection)) {
+                            chosenEmployees.remove(selection);
+                        } else {
+                            chosenEmployees.add(selection);
+                        }
+
+                        StringBuilder text = new StringBuilder();
+                        boolean first = true;
+                        for (Employee employee : chosenEmployees) {
+                            if (!first) {
+                                text.append(", ");
+                            }
+                            text.append(employee.name());
+                            first = false;
+                        }
+                        lEmployees.setText(text.toString());
+                    },
+                    contr -> contr.setSelected(chosenEmployees.contains(contr.getEmployee())));
+
+            employees.forEach(
+                    e -> {
+                        if (chosenEmployees.contains(e)) employeeListController.selectEmployee(e);
+                    });
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in updateEmplList(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Auflisten des Personals ist ein Fehler aufgetreten.");
+        }
+    }
+
+    private void updateVehList() {
+        vbVehicles.getChildren().clear();
+
+        try {
+            Set<Vehicle> vehicles = vehicleService.list(EnumSet.of(Status.ABGEMELDET));
+
+            boolean anyMatch = false;
+
+            for (Vehicle vehicle : vehicles) {
+                if (!vehicle.name().toLowerCase().contains(tfVehicleSearch.getText().toLowerCase()))
+                    continue;
+
+                anyMatch = true;
+
+                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
+                vp.setData(vehicle, false, false);
+                vbVehicles.getChildren().add(vp.getRootElement());
+
+                vp.getRootElement()
+                        .setOnMouseClicked(
+                                event -> {
+                                    if (event.getButton() == MouseButton.PRIMARY) {
+                                        chosenVehicle = vehicle;
+                                        lVehicles.setText(chosenVehicle.name());
+                                        updateVehList();
+                                    }
+                                });
+                if (chosenVehicle != null && chosenVehicle.id() == vehicle.id())
+                    vp.setSelected(true);
+            }
+
+            if (!anyMatch) {
+                // Kind of ugly, but best way to get the size of a VehiclePane
+                VehiclePaneController vp = VehiclePaneController.createVehiclePane();
+                vp.getRootElement().setVisible(false);
+                vbVehicles.getChildren().add(vp.getRootElement());
+            }
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in updateVehList(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Auflisten der Fahrzeuge ist ein Fehler aufgetreten");
+        } catch (IOException e) {
+            LOG.error("IOException in updateVehList(). ", e);
+            showServiceExceptionAlertAndWait("Beim Laden der Fahrzeuge ist ein Fehler aufgetreten");
+        }
+    }
+
+    public void cancel() {
+        LOG.debug("Hyperlink \"schließen\" clicked");
+        reset();
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
+
+    private void reset() {
+        chosenEmployees.clear();
+        chosenVehicle = null;
+        tfEmployeeSearch.setText("");
+        tfVehicleSearch.setText("");
+        lEmployees.setText("-");
+        lVehicles.setText("-");
+        updateVehList();
+        updateEmplList();
+    }
+
+    public void create() {
+        LOG.debug("Button \"ERSTELLEN\" clicked");
+
+        Set<Registration> registrations = new HashSet<>();
+        try {
+            if (chosenVehicle == null) {
+                throw new InvalidVehicleException("no Vehicle");
+            }
+            for (Employee employee : chosenEmployees) {
+                registrations.add(
+                        Registration.builder()
+                                .id(chosenVehicle.id())
+                                .employee(employee)
+                                .start(
+                                        LocalDateTime.of(
+                                                        LocalDate.now(),
+                                                        LocalTime.of(cbStart.getValue(), 0))
+                                                .toInstant(OffsetDateTime.now().getOffset()))
+                                .end(
+                                        LocalDateTime.of(
+                                                        LocalDate.now(),
+                                                        LocalTime.of(cbEnd.getValue(), 0))
+                                                .toInstant(OffsetDateTime.now().getOffset()))
+                                .build());
+            }
+
+            registrationService.add(chosenVehicle.id(), registrations);
+            chosenEmployees.clear();
+            // ((Stage) lVehicles.getScene().getWindow()).close();
+            this.setVisible(false);
+            createOperationController.setVisible(true);
+            reset();
+        } catch (InvalidVehicleException e) {
+            LOG.debug("Validation of Vehicle in Registration failed.");
+            showValidationErrorAlertAndWait("Das spezifizierte Fahrzeug ist nicht gültig.");
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in create(). ", e);
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
+        } catch (InvalidRegistrationException e) {
+            LOG.debug("Validation of Registration failed.");
+            showValidationErrorAlertAndWait(
+                    "Die gewählte Kombination von Fahrzeug und Personal ist nicht gültig!");
+        }
+    }
+
+    public void setVisible(boolean b) {
+        root.setVisible(b);
+        reset();
+    }
+
+    public void tfVehicleSearch_TextChanged(KeyEvent keyEvent) {
+        updateVehList();
+    }
+
+    public void tfEmployeeSearch_TextChanged(KeyEvent keyEvent) {
+        updateEmplList();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/VehiclePaneController.java
new file mode 100644
index 0000000..66b45d2
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/VehiclePaneController.java
@@ -0,0 +1,118 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.text.Text;
+
+public class VehiclePaneController extends CustomListItemController {
+
+    public static VehiclePaneController createVehiclePane() throws IOException {
+        FXMLLoader fxmlLoader =
+                new FXMLLoader(VehiclePaneController.class.getResource("/fxml/vehiclePane.fxml"));
+        Node root = fxmlLoader.load();
+        VehiclePaneController result = fxmlLoader.getController();
+        result.rootElement = root;
+
+        return result;
+    }
+
+    @FXML private Label txtStatus;
+    @FXML private Text txtType;
+    @FXML private Text txtNumber;
+    @FXML private ImageView ivNEF;
+    @FXML private Text txtNEF;
+    @FXML private ImageView ivQualification;
+    @FXML private Text txtQualification;
+    @FXML private Text txtRooftype;
+    @FXML private Button btnRequest;
+
+    private Vehicle data;
+
+    public Vehicle getData() {
+        return data;
+    }
+
+    /**
+     * * Set the displayed data of this VehiclePane.
+     *
+     * @param vehicle The data to display.
+     * @param showStatusInfo If true, the highest qualification of the vehicle's active registration
+     *     and the vehicle's status will be shown.
+     */
+    public void setData(Vehicle vehicle, boolean showStatusInfo, boolean showRequestVehicle) {
+        txtType.setText(vehicle.type().name());
+        String constrType = vehicle.constructionType().name();
+        txtRooftype.setText(
+                constrType.substring(0, 1).toUpperCase() + constrType.substring(1).toLowerCase());
+        txtNumber.setText("-" + vehicle.id());
+        if (vehicle.hasNef()) {
+            ivNEF.setImage(new Image("images/NEF.png"));
+            txtNEF.setText("hat NEF-Halterung");
+        } else {
+            ivNEF.setImage(new Image("images/NotNEF.png"));
+            txtNEF.setText("keine NEF-Halterung");
+        }
+
+        if (showRequestVehicle) {
+            btnRequest.setVisible(true);
+            btnRequest.setManaged(true);
+        } else {
+            btnRequest.setVisible(false);
+            btnRequest.setManaged(false);
+        }
+
+        if (showStatusInfo) {
+            txtStatus.setText(vehicle.status().name());
+            if (vehicle.status() == Status.FREI_FUNK || vehicle.status() == Status.FREI_WACHE) {
+                txtStatus.getStyleClass().add("bg-status-green");
+            } else {
+                txtStatus.getStyleClass().add("bg-status-orange");
+            }
+
+            Instant now = Instant.now();
+            List<Registration> regs = vehicle.registrations();
+
+            if (regs == null) {
+                return;
+            }
+
+            Optional<EducationLevel> edu =
+                    regs.stream()
+                            .filter(reg -> reg.start().isBefore(now) && reg.end().isAfter(now))
+                            .map(reg -> reg.employee().educationLevel())
+                            .max(EducationLevel::compareTo);
+
+            if (!edu.isPresent()) {
+                return;
+            }
+
+            txtQualification.setText(edu.get().name());
+        } else {
+            txtQualification.setVisible(false);
+            txtQualification.setManaged(false);
+            ivQualification.setVisible(false);
+            ivQualification.setManaged(false);
+
+            txtStatus.setVisible(false);
+        }
+
+        this.data = vehicle;
+    }
+
+    public Button getBtnRequest() {
+        return btnRequest;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAO.java
new file mode 100644
index 0000000..d8ac513
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAO.java
@@ -0,0 +1,44 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import java.util.Set;
+
+public interface EmployeeDAO {
+
+    /**
+     * Persist the given employee.
+     *
+     * @param employee that should be stored
+     * @return the id that was assigned
+     * @throws PersistenceException if the employee could not be persisted
+     */
+    long add(Employee employee) throws PersistenceException;
+
+    /**
+     * Update the given employee.
+     *
+     * @param employee that should be updated
+     * @throws ElementNotFoundException if no employee with the given id exists
+     * @throws PersistenceException if the employee could not be updated
+     */
+    void update(Employee employee) throws ElementNotFoundException, PersistenceException;
+
+    /**
+     * Get all stored employees.
+     *
+     * @return list containing all stored employees
+     * @throws PersistenceException if loading the stored employees failed
+     */
+    Set<Employee> list() throws PersistenceException;
+
+    /**
+     * Remove employee with the given id from the store.
+     *
+     * @param id of the employee that should be removed
+     * @throws ElementNotFoundException if no employee with the given id exists
+     * @throws PersistenceException if the employee could not be removed
+     */
+    void remove(long id) throws ElementNotFoundException, PersistenceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDatabaseDAO.java
new file mode 100644
index 0000000..889b0fc
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDatabaseDAO.java
@@ -0,0 +1,144 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.time.LocalDate;
+import java.util.HashSet;
+import java.util.Set;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class EmployeeDatabaseDAO implements EmployeeDAO {
+
+    private JDBCConnectionManager jdbcConnectionManager;
+
+    public EmployeeDatabaseDAO(JDBCConnectionManager jdbcConnectionManager) {
+        this.jdbcConnectionManager = jdbcConnectionManager;
+    }
+
+    private long createEmployeeVersion(Connection con, Employee e)
+            throws PersistenceException, SQLException {
+        String sql =
+                "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
+                        + "VALUES(?, ?, ?, ?, ?)";
+
+        try (PreparedStatement pstmt = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+            pstmt.setString(1, e.name());
+            pstmt.setObject(2, e.birthday());
+            pstmt.setInt(3, e.educationLevel().ordinal());
+            pstmt.setBoolean(4, e.isDriver());
+            pstmt.setBoolean(5, e.isPilot());
+            pstmt.executeUpdate();
+
+            try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                if (!rs.next()) throw new PersistenceException("Failed to insert EmployeeVersion");
+
+                return rs.getLong(1);
+            }
+        }
+    }
+
+    @Override
+    public long add(Employee employee) throws PersistenceException {
+        String sql = "INSERT INTO Employee(version) VALUES(?)";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+
+            long versionId = createEmployeeVersion(con, employee);
+
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setLong(1, versionId);
+                pstmt.executeUpdate();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next()) {
+                        con.rollback();
+                        throw new PersistenceException("Failed to insert Employee");
+                    }
+
+                    con.commit();
+                    return rs.getLong(1);
+                }
+            }
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void update(Employee employee) throws ElementNotFoundException, PersistenceException {
+        String sql = "UPDATE Employee SET version = ? WHERE id = ?";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+
+            long versionId = createEmployeeVersion(con, employee);
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, versionId);
+                pstmt.setLong(2, employee.id());
+
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
+                    throw new ElementNotFoundException("No such employeeId exists");
+                }
+            }
+
+            con.commit();
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public Set<Employee> list() throws PersistenceException {
+        String sql =
+                "SELECT emp.id, v.name, v.birthday, v.educationLevel, v.isDriver, v.isPilot "
+                        + "FROM employee emp "
+                        + "JOIN EmployeeVersion v ON v.id = emp.version";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            Set<Employee> employees = new HashSet<>();
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    while (rs.next()) {
+                        employees.add(
+                                Employee.builder()
+                                        .id(rs.getLong(1))
+                                        .name(rs.getString(2))
+                                        .birthday(rs.getObject(3, LocalDate.class))
+                                        .educationLevel(EducationLevel.valueOf(rs.getString(4)))
+                                        .isDriver(rs.getBoolean(5))
+                                        .isPilot(rs.getBoolean(6))
+                                        .build());
+                    }
+                }
+            }
+
+            return employees;
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void remove(long id) throws ElementNotFoundException, PersistenceException {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAO.java
new file mode 100644
index 0000000..c0ef5d4
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAO.java
@@ -0,0 +1,48 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import java.util.EnumSet;
+import java.util.Set;
+
+public interface OperationDAO {
+
+    /**
+     * Persist the given operation.
+     *
+     * @param operation that should be stored
+     * @return the id that was assigned
+     * @throws PersistenceException if the operation could not be persisted
+     */
+    long add(Operation operation) throws PersistenceException;
+
+    /**
+     * Update the given operation.
+     *
+     * @param operation that should be updated
+     * @throws ElementNotFoundException if no operation with the given id exists
+     * @throws PersistenceException if the operation could not be updated
+     */
+    void update(Operation operation) throws ElementNotFoundException, PersistenceException;
+
+    /**
+     * Returns the operation with the given id.
+     *
+     * @param operationId id of the operation that should be returned
+     * @return operation with the given id
+     * @throws ElementNotFoundException if no operation with the given id exists
+     * @throws PersistenceException if the operation could not be loaded
+     */
+    Operation get(long operationId) throws ElementNotFoundException, PersistenceException;
+
+    /**
+     * Get all stored operations with matching status.
+     *
+     * @param statuses set containing all statuses that should be matched
+     * @return list containing all matched operations
+     * @throws PersistenceException if loading the stored operations failed
+     */
+    Set<Operation> list(EnumSet<Status> statuses) throws PersistenceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDatabaseDAO.java
new file mode 100644
index 0000000..1641720
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDatabaseDAO.java
@@ -0,0 +1,221 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class OperationDatabaseDAO implements OperationDAO {
+
+    private JDBCConnectionManager jdbcConnectionManager;
+    private VehicleDAO vehicleDAO;
+
+    public OperationDatabaseDAO(
+            JDBCConnectionManager jdbcConnectionManager, VehicleDAO vehicleDAO) {
+        this.jdbcConnectionManager = jdbcConnectionManager;
+        this.vehicleDAO = vehicleDAO;
+    }
+
+    @Override
+    public long add(@NonNull Operation o) throws PersistenceException {
+        String sql =
+                "INSERT INTO Operation(opCode, severity, created, destination, additionalInfo,"
+                        + "            status) VALUES (?, ?, ?, ?, ?, ?)";
+        String sql2 = "INSERT INTO VehicleOperation(vehicleId, operationId) VALUES (?, ?)";
+        long operationId;
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setString(1, o.opCode());
+                pstmt.setInt(2, o.severity().ordinal());
+                pstmt.setObject(3, OffsetDateTime.ofInstant(o.created(), ZoneId.systemDefault()));
+                pstmt.setString(4, o.destination());
+                pstmt.setString(5, o.additionalInfo());
+                pstmt.setInt(6, o.status().ordinal());
+                pstmt.executeUpdate();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next()) throw new PersistenceException("Failed to persist operation");
+
+                    operationId = rs.getLong(1);
+                }
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
+                pstmt.setLong(2, operationId);
+
+                for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
+                    pstmt.setLong(1, id);
+                    pstmt.addBatch();
+                }
+
+                pstmt.executeBatch();
+            }
+            con.commit();
+            return operationId;
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void update(@NonNull Operation o) throws ElementNotFoundException, PersistenceException {
+        // Note this will, by design, not update created
+        String sql =
+                "UPDATE Operation SET opCode = ?, severity = ?, destination = ?,"
+                        + " additionalInfo = ?, status = ? WHERE id = ?";
+        String sql2 = "DELETE FROM VehicleOperation WHERE operationId = ?";
+        String sql3 = "INSERT INTO VehicleOperation(vehicleId, operationId) VALUES (?, ?)";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setString(1, o.opCode());
+                pstmt.setInt(2, o.severity().ordinal());
+                pstmt.setString(3, o.destination());
+                pstmt.setString(4, o.additionalInfo());
+                pstmt.setInt(5, o.status().ordinal());
+                pstmt.setLong(6, o.id());
+
+                if (pstmt.executeUpdate() != 1)
+                    throw new ElementNotFoundException("No such operationId exists");
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
+                pstmt.setLong(1, o.id());
+                pstmt.executeUpdate();
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
+                pstmt.setLong(2, o.id());
+
+                for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
+                    pstmt.setLong(1, id);
+                    pstmt.addBatch();
+                }
+
+                pstmt.executeBatch();
+            }
+            con.commit();
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public Operation get(long operationId) throws ElementNotFoundException, PersistenceException {
+        String sql = "Select * from operation where id = ?";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, operationId);
+                pstmt.execute();
+
+                try (ResultSet rs = pstmt.getResultSet()) {
+                    if (!rs.next())
+                        throw new ElementNotFoundException("No such element could be found");
+
+                    return operationFromRS(rs);
+                }
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public Set<Operation> list(EnumSet<Status> statuses) throws PersistenceException {
+        // This hack exists because H2 currently has a bug that prevents IN (?) with an array of
+        // ids, i.e. pstmt.setArray(1, con.createArrayOf("INT", intarray) from working. See
+        // commented code below.
+
+        // SELECT * FROM Operation WHERE status IN ('COMPLETED', 'CANCELLED') is BUGGED on H2!
+        // for this reason we use the ordinal values instead
+        String str =
+                statuses.stream()
+                        .map(e -> Integer.toString(e.ordinal()))
+                        .collect(Collectors.joining(","));
+
+        String sql = "SELECT * FROM Operation WHERE status IN (" + str + ")";
+        Set<Operation> operations = new HashSet<>();
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                // Object[] arr = statuses.stream().map(Enum::ordinal).toArray();
+                // pstmt.setArray(1, con.createArrayOf("INT", arr));
+
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    while (rs.next()) operations.add(operationFromRS(rs));
+                }
+            }
+
+            return operations;
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
+    private Operation operationFromRS(ResultSet rs) throws PersistenceException, SQLException {
+        Long operationId = rs.getLong("id");
+
+        return Operation.builder()
+                .id(operationId)
+                .opCode(rs.getString("opCode"))
+                .severity(Severity.valueOf(rs.getString("severity")))
+                .status(Status.valueOf(rs.getString("status")))
+                .vehicles(getVehiclesFromOperationId(operationId))
+                .created((rs.getObject("created", OffsetDateTime.class)).toInstant())
+                .destination(rs.getString("destination"))
+                .additionalInfo(rs.getString("additionalInfo"))
+                .build();
+    }
+
+    private Set<Vehicle> getVehiclesFromOperationId(long operationId) throws PersistenceException {
+        String sql = "SELECT vehicleId FROM VehicleOperation WHERE operationId = ?";
+        Set<Vehicle> vehicles = new HashSet<>();
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, operationId);
+                pstmt.execute();
+
+                try (ResultSet rs = pstmt.getResultSet()) {
+                    while (rs.next()) {
+                        vehicles.add(vehicleDAO.get(rs.getLong("vehicleId")));
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        } catch (ElementNotFoundException e) {
+            throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
+        }
+
+        return vehicles;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAO.java
new file mode 100644
index 0000000..02e742c
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAO.java
@@ -0,0 +1,28 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import java.util.Set;
+
+public interface RegistrationDAO {
+
+    /**
+     * Persist the given registration.
+     *
+     * @param vehicleId the id of the target vehicle
+     * @param registrations that should be stored
+     * @return a list of the ids that were assigned
+     * @throws PersistenceException if the registration could not be persisted
+     */
+    Set<Long> add(long vehicleId, Set<Registration> registrations) throws PersistenceException;
+
+    /**
+     * Make registration with the given id inactive.
+     *
+     * @param id of the registration that should be made inactive
+     * @throws ElementNotFoundException if no registration with the given id exists
+     * @throws PersistenceException if the registration could not be made inactive
+     */
+    void remove(long id) throws ElementNotFoundException, PersistenceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDatabaseDAO.java
new file mode 100644
index 0000000..1006a33
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDatabaseDAO.java
@@ -0,0 +1,130 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class RegistrationDatabaseDAO implements RegistrationDAO {
+
+    private JDBCConnectionManager jdbcConnectionManager;
+    private EmployeeDAO employeePersistence;
+
+    @Autowired
+    public RegistrationDatabaseDAO(
+            JDBCConnectionManager jdbcConnectionManager, EmployeeDAO employeePersistence) {
+        this.jdbcConnectionManager = jdbcConnectionManager;
+        this.employeePersistence = employeePersistence;
+    }
+
+    @Override
+    public Set<Long> add(long vehicleId, Set<Registration> registrations)
+            throws PersistenceException {
+        String sql =
+                "INSERT INTO Registration (vehicleId, employeeId, start, end, active) VALUES (?,?,?,?,?)";
+        String sql2 = "UPDATE Vehicle SET status = 'FREI_WACHE' WHERE id = ?;";
+
+        Set<Long> vehicleIds = new HashSet<>();
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setLong(1, vehicleId);
+
+                for (Registration r : registrations) {
+                    pstmt.setLong(2, r.employee().id());
+                    pstmt.setObject(3, OffsetDateTime.ofInstant(r.start(), ZoneId.systemDefault()));
+                    pstmt.setObject(4, OffsetDateTime.ofInstant(r.end(), ZoneId.systemDefault()));
+                    pstmt.setBoolean(5, true);
+                    pstmt.addBatch();
+                }
+
+                pstmt.executeBatch();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    while (rs.next()) vehicleIds.add(rs.getLong(1));
+                }
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
+                pstmt.setLong(1, vehicleId);
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
+                    throw new PersistenceException("Failed to persist registration");
+                }
+            }
+
+            con.commit();
+            return vehicleIds;
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void remove(long id) throws ElementNotFoundException, PersistenceException {
+        throw new UnsupportedOperationException();
+    }
+
+    protected List<Registration> list(long vehicleId) throws PersistenceException {
+        String sql = "SELECT * FROM Registration WHERE vehicleId = ?";
+
+        List<Registration> registrationList = new ArrayList<>();
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, vehicleId);
+
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    while (rs.next()) {
+                        long employeeId = rs.getLong("employeeId");
+                        // TODO: replace the following with employeePersistence.get once implemented
+                        Employee emp =
+                                employeePersistence
+                                        .list()
+                                        .stream()
+                                        .filter(employee -> employee.id() == employeeId)
+                                        .findAny()
+                                        .orElse(null);
+                        Registration registration =
+                                Registration.builder()
+                                        .id(rs.getLong("id"))
+                                        .start(
+                                                (rs.getObject("start", OffsetDateTime.class))
+                                                        .toInstant())
+                                        .end(
+                                                (rs.getObject("end", OffsetDateTime.class))
+                                                        .toInstant())
+                                        .employee(emp)
+                                        .build();
+                        registrationList.add(registration);
+                    }
+                }
+            }
+
+            return registrationList;
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAO.java
new file mode 100644
index 0000000..ed24498
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAO.java
@@ -0,0 +1,54 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import java.util.Set;
+
+public interface VehicleDAO {
+
+    /**
+     * Persist the given vehicle.
+     *
+     * @param vehicle that should be stored
+     * @return the id that was assigned
+     * @throws PersistenceException if the vehicle could not be persisted
+     */
+    long add(Vehicle vehicle) throws PersistenceException;
+
+    /**
+     * Update the given vehicle.
+     *
+     * @param vehicle that should be updated
+     * @throws ElementNotFoundException if no vehicle with the given id exists
+     * @throws PersistenceException if the vehicle could not be updated
+     */
+    void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException;
+
+    /**
+     * Get all stored vehicles.
+     *
+     * @return list containing all stored vehicles
+     * @throws PersistenceException if loading the stored vehicles failed
+     */
+    Set<Vehicle> list() throws PersistenceException;
+
+    /**
+     * Returns the vehicle with the given id.
+     *
+     * @param vehicleId id of the vehicle that should be returned
+     * @return vehicle with the given id
+     * @throws ElementNotFoundException if no vehicle with the given id exists
+     * @throws PersistenceException if the vehicle could not be loaded
+     */
+    Vehicle get(long vehicleId) throws ElementNotFoundException, PersistenceException;
+
+    /**
+     * Remove vehicle with the given id from the store.
+     *
+     * @param id of the vehicle that should be removed
+     * @throws ElementNotFoundException if no vehicle with the given id exists
+     * @throws PersistenceException if the vehicle could not be removed
+     */
+    void remove(long id) throws ElementNotFoundException, PersistenceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDatabaseDAO.java
new file mode 100644
index 0000000..dd7c0f2
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDatabaseDAO.java
@@ -0,0 +1,211 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashSet;
+import java.util.Set;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class VehicleDatabaseDAO implements VehicleDAO {
+
+    private final JDBCConnectionManager jdbcConnectionManager;
+    private RegistrationDatabaseDAO registrationDatabaseDao;
+
+    public VehicleDatabaseDAO(
+            JDBCConnectionManager j, RegistrationDatabaseDAO registrationDatabaseDao) {
+        jdbcConnectionManager = j;
+        this.registrationDatabaseDao = registrationDatabaseDao;
+    }
+
+    @Override
+    public long add(Vehicle v) throws PersistenceException {
+        String sql =
+                "INSERT INTO VehicleVersion (name,hasNef,constructionType,type) VALUES (?,?,?,?)";
+        String sql2 = "INSERT INTO Vehicle (version,status) VALUES (?,?)";
+        String sql3 = "UPDATE VehicleVersion SET name=? WHERE id=?";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+            String name = "";
+            long version, id;
+
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setString(1, name);
+                pstmt.setBoolean(2, v.hasNef());
+                pstmt.setInt(3, v.constructionType().ordinal());
+                pstmt.setString(4, v.type().name());
+                pstmt.executeUpdate();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next())
+                        throw new PersistenceException("Failed to insert into VehicleVersion");
+
+                    version = rs.getLong(1);
+                }
+            }
+
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql2, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setLong(1, version);
+                pstmt.setInt(2, Status.ABGEMELDET.ordinal());
+                pstmt.executeUpdate();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next()) {
+                        con.rollback();
+                        throw new PersistenceException("Failed to insert into Vehicle");
+                    }
+
+                    id = rs.getLong(1);
+                }
+
+                name = v.type().name() + "-" + id;
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
+                pstmt.setString(1, name);
+                pstmt.setLong(2, version);
+
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
+                    throw new PersistenceException("Failed to update VehicleVersion");
+                }
+            }
+
+            con.commit();
+            return id;
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void update(Vehicle v) throws ElementNotFoundException, PersistenceException {
+        String sql = "SELECT version FROM Vehicle WHERE id = ?";
+        String sql2 =
+                "MERGE INTO VehicleVersion(name, constructionType, type, hasNef)"
+                        + " KEY(name, constructionType, type, hasNef) VALUES(?, ?, ?, ?)";
+        String sql3 = "UPDATE Vehicle SET version = ?, status = ? WHERE id = ?";
+
+        long versionId;
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, v.id());
+
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    if (!rs.next()) throw new ElementNotFoundException("No such vehicleId exists");
+
+                    versionId = rs.getLong(1);
+                }
+            }
+
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql2, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setString(1, v.type().name() + "-" + v.id());
+                pstmt.setString(2, v.constructionType().name());
+                pstmt.setString(3, v.type().name());
+                pstmt.setBoolean(4, v.hasNef());
+                pstmt.executeUpdate();
+
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (rs.next()) {
+                        // version changed, update it
+                        versionId = rs.getLong(1);
+                    }
+                }
+            }
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
+                pstmt.setLong(1, versionId);
+                pstmt.setString(2, v.status().name());
+                pstmt.setLong(3, v.id());
+                pstmt.executeUpdate();
+            }
+
+            con.commit();
+        } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public Set<Vehicle> list() throws PersistenceException {
+        Set<Vehicle> result = new HashSet<>();
+
+        String sql =
+                "Select * from VehicleVersion, Vehicle where VehicleVersion.id=Vehicle.version";
+
+        try (PreparedStatement pstmt =
+                jdbcConnectionManager.getConnection().prepareStatement(sql)) {
+            pstmt.executeQuery();
+            try (ResultSet rs = pstmt.getResultSet()) {
+                while (rs.next()) {
+                    result.add(vehicleFromRS(rs));
+                }
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+        return result;
+    }
+
+    @Override
+    public Vehicle get(long id) throws ElementNotFoundException, PersistenceException {
+        String sql =
+                "SELECT a.id, b.name, b.constructionType, b.type, a.status, b.hasNef"
+                        + " FROM Vehicle a"
+                        + " INNER JOIN VehicleVersion b"
+                        + " ON version = b.id"
+                        + " WHERE a.id = ?";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, id);
+
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    if (!rs.first()) throw new ElementNotFoundException("No such vehicle exists");
+
+                    return vehicleFromRS(rs);
+                }
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
+    @Override
+    public void remove(long id) throws ElementNotFoundException, PersistenceException {
+        throw new UnsupportedOperationException();
+    }
+
+    private Vehicle vehicleFromRS(ResultSet rs) throws SQLException, PersistenceException {
+        return Vehicle.builder()
+                .id(rs.getLong("Vehicle.id"))
+                .name(rs.getString("name"))
+                .constructionType(ConstructionType.values()[rs.getInt("constructionType")])
+                .type(VehicleType.valueOf(rs.getString("type")))
+                .status(Status.values()[rs.getInt("status")])
+                .hasNef(rs.getBoolean("hasNef"))
+                .registrations(registrationDatabaseDao.list(rs.getLong("id")))
+                .build();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Employee.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Employee.java
new file mode 100644
index 0000000..f45550e
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Employee.java
@@ -0,0 +1,51 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import com.google.auto.value.AutoValue;
+import java.time.LocalDate;
+
+@AutoValue
+public abstract class Employee {
+    public enum EducationLevel {
+        RS,
+        NFS,
+        NKV,
+        NKA,
+        NKI,
+        NA
+    }
+
+    public abstract long id();
+
+    public abstract String name();
+
+    public abstract LocalDate birthday();
+
+    public abstract EducationLevel educationLevel();
+
+    public abstract boolean isDriver();
+
+    public abstract boolean isPilot();
+
+    public static Builder builder() {
+        return new AutoValue_Employee.Builder().id(0);
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+        public abstract Builder id(long id);
+
+        public abstract Builder name(String name);
+
+        public abstract Builder birthday(LocalDate birthday);
+
+        public abstract Builder educationLevel(EducationLevel educationLevel);
+
+        public abstract Builder isDriver(boolean isDriver);
+
+        public abstract Builder isPilot(boolean isPilot);
+
+        public abstract Employee build();
+    }
+
+    public abstract Builder toBuilder();
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/EmployeeValidator.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/EmployeeValidator.java
new file mode 100644
index 0000000..b03fa04
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/EmployeeValidator.java
@@ -0,0 +1,23 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+
+public class EmployeeValidator {
+
+    public static boolean validate(Employee employee) throws InvalidEmployeeException {
+
+        if (employee.name() == null || employee.name().trim().length() == 0) {
+            throw new InvalidEmployeeException("Name darf nicht leer sein!");
+        }
+
+        if (employee.birthday() == null) {
+            throw new InvalidEmployeeException("Geburtsdatum darf nicht leer sein!");
+        }
+
+        if (employee.educationLevel() == null) {
+            throw new InvalidEmployeeException("Ausbildungsgrad darf nicht leer sein!");
+        }
+
+        return true;
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Operation.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Operation.java
new file mode 100644
index 0000000..e119622
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Operation.java
@@ -0,0 +1,70 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import com.google.auto.value.AutoValue;
+import java.time.Instant;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+@AutoValue
+public abstract class Operation {
+    public enum Severity {
+        A,
+        B,
+        C,
+        D,
+        E,
+        O,
+    }
+
+    public enum Status {
+        ACTIVE,
+        COMPLETED,
+        CANCELLED,
+    }
+
+    public abstract long id();
+
+    public abstract String opCode();
+
+    @Nullable
+    public abstract Severity severity();
+
+    public abstract Status status();
+
+    public abstract Set<Vehicle> vehicles();
+
+    @Nullable
+    public abstract Instant created();
+
+    public abstract String destination();
+
+    @Nullable
+    public abstract String additionalInfo();
+
+    public static Builder builder() {
+        return new AutoValue_Operation.Builder().id(0);
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+        public abstract Builder id(long id);
+
+        public abstract Builder opCode(String opCode);
+
+        public abstract Builder severity(Severity severity);
+
+        public abstract Builder status(Status status);
+
+        public abstract Builder vehicles(Set<Vehicle> vehicles);
+
+        public abstract Builder created(Instant created);
+
+        public abstract Builder destination(String destination);
+
+        public abstract Builder additionalInfo(String additionalInfo);
+
+        public abstract Operation build();
+    }
+
+    public abstract Builder toBuilder();
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Registration.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Registration.java
new file mode 100644
index 0000000..a12c038
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Registration.java
@@ -0,0 +1,34 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import com.google.auto.value.AutoValue;
+import java.time.Instant;
+
+@AutoValue
+public abstract class Registration {
+    public abstract long id();
+
+    public abstract Instant start();
+
+    public abstract Instant end();
+
+    public abstract Employee employee();
+
+    public static Builder builder() {
+        return new AutoValue_Registration.Builder().id(0);
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+        public abstract Builder id(long id);
+
+        public abstract Builder start(Instant start);
+
+        public abstract Builder end(Instant end);
+
+        public abstract Builder employee(Employee employee);
+
+        public abstract Registration build();
+    }
+
+    public abstract Builder toBuilder();
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/RegistrationValidator.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/RegistrationValidator.java
new file mode 100644
index 0000000..9512f64
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/RegistrationValidator.java
@@ -0,0 +1,174 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+public class RegistrationValidator {
+
+    private RegistrationValidator() {}
+
+    public static void validate(Vehicle vehicle, Set<Registration> registrations)
+            throws InvalidVehicleException, InvalidRegistrationException {
+        /*
+        Vehicles and Employees are assumed to be valid.
+        They have been checked at creation, and for them to be checked again, access to
+        VehicleValidator and EmployeeValidator are needed, which are not available at this time.
+         */
+        /*
+        The method used here goes as follows: All given employees are inspected in regards to their
+        qualifications, and added to the appropriate lists of the roles they could fill.
+        For example, an NFS, who is also a driver, would be added to the lists driverIds, nfsIds
+        and rsIds (because an NFS can always substitute an RS).
+        Afterwards, the number of people is checked according to the chosen vehicle type, and if
+        the number is okay, the program tries to find a valid combination of roles for the vehicle.
+        For example, for an RTW, first a driver is chosen, their ID marked as found in the aptly
+        titled HashMap, and then for the second RS, the list of RS is checked, excluding the chosen
+        driver. If no other valid RS is found, the next possible driver is chosen, and so on. If no
+        valid combination is found, an InvalidRegistrationException is thrown.
+         */
+        List<Long> pilotIds = new LinkedList<>();
+        List<Long> driverIds = new LinkedList<>();
+        List<Long> naIds = new LinkedList<>();
+        List<Long> nfsIds = new LinkedList<>();
+        List<Long> rsIds = new LinkedList<>();
+        HashMap<Long, Boolean> found =
+                new HashMap<>(); // needed later in DFS, checks that no person is chosen twice
+        int total = 0;
+        for (Registration registration : registrations) {
+            total++;
+            if (found.put(registration.employee().id(), false) != null) {
+                throw new InvalidRegistrationException(
+                        "Person mit der ID: "
+                                + registration.employee().id()
+                                + " wurde mehrmals hinzugefügt!");
+            }
+            if (registration.employee().isPilot()) {
+                pilotIds.add(registration.employee().id());
+            }
+            if (registration.employee().isDriver()) {
+                driverIds.add(registration.employee().id());
+            }
+            if (registration.employee().educationLevel() == EducationLevel.NA) {
+                naIds.add(registration.employee().id());
+                nfsIds.add(registration.employee().id());
+                rsIds.add(registration.employee().id());
+            } else if (isNFS(registration.employee())) {
+                nfsIds.add(registration.employee().id());
+                rsIds.add(registration.employee().id());
+            } else { // only RS left
+                rsIds.add(registration.employee().id());
+            }
+        }
+        if (total <= 0) {
+            throw new InvalidRegistrationException("Kein Personal ausgewählt!");
+        }
+        if (vehicle.type() == VehicleType.NAH) {
+            /*
+            NAH
+            1 Pilot
+            1 NFS
+            1 NA
+            3-4 Personen
+             */
+            if (total < 3) {
+                throw new InvalidRegistrationException("Zu wenig Personal für NAH!");
+            } else if (total > 4) {
+                throw new InvalidRegistrationException("Zu viel Personal für NAH!");
+            }
+            for (long pilot_id : pilotIds) {
+                found.put(pilot_id, true);
+                for (long na_id : naIds) {
+                    if (found.get(na_id)) continue;
+                    found.put(na_id, true);
+                    for (long nfs_id : nfsIds) {
+                        if (found.get(nfs_id)) continue;
+                        return;
+                    }
+                    found.put(na_id, false);
+                }
+                found.put(pilot_id, false);
+            }
+            throw new InvalidRegistrationException(
+                    "Keine gültige Kombination von Personen für NAH!");
+        } else if (vehicle.type() == VehicleType.NEF) {
+            /*
+            NEF
+            1 Driver (has to be NFS)
+            1 NA
+             */
+            if (total < 2) {
+                throw new InvalidRegistrationException("Zu wenig Personal für NEF!");
+            } else if (total > 3) {
+                throw new InvalidRegistrationException("Zu viel Personal für NEF!");
+            }
+            for (long driver_id : driverIds) {
+                if (!nfsIds.contains(driver_id))
+                    continue; // if possible driver is not NFS, skip him
+                found.put(driver_id, true);
+                for (long na_id : naIds) {
+                    if (found.get(na_id)) continue;
+                    return;
+                }
+                found.put(driver_id, false);
+            }
+            throw new InvalidRegistrationException(
+                    "Keine gültige Kombination von Personen für NEF!");
+        } else if (vehicle.type() == VehicleType.BKTW) {
+            /*
+            BKTW
+            1 Driver
+             */
+            if (total > 3) {
+                throw new InvalidRegistrationException("Zu viel Personal für BKTW!");
+            }
+            if (!driverIds.isEmpty()) {
+                return;
+            }
+            throw new InvalidRegistrationException("Kein Fahrer gefunden für BKTW!");
+        } else { // KTW or RTW, both have the same requirements
+            /*
+            RTW/KTW
+            1 Driver
+            1 RS
+             */
+            if (total < 2) {
+                throw new InvalidRegistrationException(
+                        "Zu wenig Personal für " + vehicle.type().name() + "!");
+            } else if (total > 4) {
+                throw new InvalidRegistrationException(
+                        "Zu viel Persoanl für " + vehicle.type().name() + "!");
+            }
+            for (long driver_id : driverIds) { // driver includes rs
+                found.put(driver_id, true);
+                for (long rs_id : rsIds) {
+                    if (found.get(rs_id)) continue;
+                    return;
+                }
+            }
+            throw new InvalidRegistrationException(
+                    "Keine gültige Kombination von Personen für " + vehicle.type().name() + "!");
+        }
+    }
+
+    private static boolean isNFS(Employee employee) {
+        EducationLevel educationLevel = employee.educationLevel();
+        switch (educationLevel) {
+            case NFS:
+                return true;
+            case NKA:
+                return true;
+            case NKI:
+                return true;
+            case NKV:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Vehicle.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Vehicle.java
new file mode 100644
index 0000000..c2033f5
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dto/Vehicle.java
@@ -0,0 +1,73 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto;
+
+import com.google.auto.value.AutoValue;
+import java.util.List;
+import javax.annotation.Nullable;
+
+@AutoValue
+public abstract class Vehicle {
+    public enum ConstructionType {
+        NORMAL,
+        HOCHDACH,
+        MITTELHOCHDACH,
+    }
+
+    public enum VehicleType {
+        BKTW,
+        KTW_B,
+        KTW,
+        RTW,
+        NEF,
+        NAH,
+    }
+
+    public enum Status {
+        ABGEMELDET,
+        FREI_WACHE,
+        FREI_FUNK,
+        ZUM_BERUFUNGSORT,
+        AM_BERUFUNGSORT,
+        ZUM_ZIELORT,
+        AM_ZIELORT,
+    }
+
+    public abstract long id();
+
+    public abstract String name();
+
+    public abstract ConstructionType constructionType();
+
+    public abstract VehicleType type();
+
+    public abstract Status status();
+
+    public abstract boolean hasNef();
+
+    @Nullable
+    public abstract List<Registration> registrations();
+
+    public static Builder builder() {
+        return new AutoValue_Vehicle.Builder().id(0);
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+        public abstract Builder id(long id);
+
+        public abstract Builder name(String name);
+
+        public abstract Builder constructionType(ConstructionType constructionType);
+
+        public abstract Builder type(VehicleType type);
+
+        public abstract Builder status(Status status);
+
+        public abstract Builder hasNef(boolean hasNef);
+
+        public abstract Builder registrations(List<Registration> registrations);
+
+        public abstract Vehicle build();
+    }
+
+    public abstract Builder toBuilder();
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeService.java
new file mode 100644
index 0000000..fa4d0e6
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeService.java
@@ -0,0 +1,46 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.Set;
+
+public interface EmployeeService {
+
+    /**
+     * Add given employee to the store.
+     *
+     * @param employee that should be added to the store
+     * @return the id that was assigned
+     * @throws InvalidEmployeeException if the employee is invalid
+     * @throws ServiceException if the employee could not be persisted
+     */
+    long add(Employee employee) throws InvalidEmployeeException, ServiceException;
+
+    /**
+     * Update the given employee.
+     *
+     * @param employee that should be updated
+     * @return the updated employee
+     * @throws InvalidEmployeeException if the employee is invalid
+     * @throws ServiceException if the updated employee could not be persisted
+     */
+    Employee update(Employee employee) throws InvalidEmployeeException, ServiceException;
+
+    /**
+     * Get all stored employees.
+     *
+     * @return list containing all stored employees
+     * @throws ServiceException if loading the stored employees failed
+     */
+    Set<Employee> list() throws ServiceException;
+
+    /**
+     * Remove employee with the given id from the store.
+     *
+     * @param id of the employee that should be removed
+     * @throws InvalidEmployeeException if given employee id is invalid or does not exist
+     * @throws ServiceException if the employee could not be removed from the store
+     */
+    void remove(long id) throws InvalidEmployeeException, ServiceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceImpl.java
new file mode 100644
index 0000000..945fb49
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceImpl.java
@@ -0,0 +1,59 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.EmployeeValidator;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.Set;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EmployeeServiceImpl implements EmployeeService {
+
+    private final EmployeeDAO employeePersistence;
+
+    public EmployeeServiceImpl(EmployeeDAO employeePersistence) {
+        this.employeePersistence = employeePersistence;
+    }
+
+    @Override
+    public long add(Employee employee) throws InvalidEmployeeException, ServiceException {
+
+        EmployeeValidator.validate(employee);
+        try {
+            return employeePersistence.add(employee);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public Employee update(Employee employee) throws InvalidEmployeeException, ServiceException {
+
+        EmployeeValidator.validate(employee);
+        try {
+            employeePersistence.update(employee);
+            return employee;
+        } catch (ElementNotFoundException | PersistenceException e) {
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public Set<Employee> list() throws ServiceException {
+
+        try {
+            return employeePersistence.list();
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public void remove(long id) throws InvalidEmployeeException, ServiceException {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationService.java
new file mode 100644
index 0000000..ca1dce9
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationService.java
@@ -0,0 +1,70 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.SortedSet;
+
+public interface OperationService {
+
+    /**
+     * Add given operation to the store.
+     *
+     * @param operation that should be added to the store
+     * @return the id that was assigned
+     * @throws InvalidOperationException if the operation is invalid
+     * @throws ServiceException if the operation could not be persisted
+     */
+    long add(Operation operation) throws InvalidOperationException, ServiceException;
+
+    /**
+     * Request new vehicles to the given operation.
+     *
+     * @param operationId id of the operation that the vehicles should be send to
+     * @param vehicleIds the ids of the vehicles that should be send to the given operation
+     * @throws InvalidOperationException if the operationId is invalid or does not exist
+     * @throws InvalidVehicleException if one of the vehicle ids is invalid or does not exist
+     * @throws ServiceException if the vehicles could not be loaded or the operation could not be
+     *     persisted
+     */
+    void requestVehicles(long operationId, Set<Long> vehicleIds)
+            throws InvalidOperationException, InvalidVehicleException, ServiceException;
+
+    /**
+     * Completes the given operation with the specified status.
+     *
+     * @param operationId id of the operation that should be completed
+     * @param status of the completed operation, either {@link Status#COMPLETED} or {@link
+     *     Status#CANCELLED}
+     * @throws InvalidOperationException if the operationId is invalid or does not exist
+     * @throws ServiceException if the operation could not be persisted
+     */
+    void complete(long operationId, Status status)
+            throws InvalidOperationException, ServiceException;
+
+    /**
+     * Get all available vehicles, sorted by how well they fit to the given opCode, starting with
+     * the best fitting.
+     *
+     * @param opCode the operation code that is used to determine the ranking
+     * @return a sorted list containing all available vehicles
+     * @throws InvalidOperationException if the opCode is invalid
+     * @throws ServiceException if loading the stored vehicles failed
+     */
+    SortedSet<Vehicle> rankVehicles(String opCode)
+            throws InvalidOperationException, ServiceException;
+
+    /**
+     * Get all stored operations with matching status.
+     *
+     * @param statuses set containing all statuses that should be matched
+     * @return list containing all matched operations
+     * @throws ServiceException if loading the stored operations failed
+     */
+    Set<Operation> list(EnumSet<Status> statuses) throws ServiceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceImpl.java
new file mode 100644
index 0000000..baae598
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceImpl.java
@@ -0,0 +1,286 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.OperationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OperationServiceImpl implements OperationService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(OperationServiceImpl.class);
+
+    private final OperationDAO operationDAO;
+    private final VehicleDAO vehicleDAO;
+    private final VehicleService vehicleService;
+
+    public OperationServiceImpl(
+            OperationDAO operationDAO, VehicleDAO vehicleDAO, VehicleService vehicleService) {
+        this.operationDAO = operationDAO;
+        this.vehicleDAO = vehicleDAO;
+        this.vehicleService = vehicleService;
+    }
+
+    @Override
+    public long add(Operation o) throws InvalidOperationException, ServiceException {
+        if (o.created() != null) {
+            throw new InvalidOperationException("Erstellungszeitpunkt darf nicht gesetzt sein");
+        }
+
+        if (o.severity() != null) {
+            throw new InvalidOperationException("Der Schweregrad darf nicht gesetzt sein");
+        }
+
+        if (o.id() != 0) {
+            throw new InvalidOperationException("Einsatz-ID muss 0 sein");
+        }
+
+        if (o.status() != Status.ACTIVE)
+            LOG.info("Status was set but will be overridden"); // TODO: nullable instead??
+
+        try {
+            for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
+                Vehicle v = vehicleDAO.get(id);
+                VehicleServiceImpl.validateVehicle(v);
+
+                if (v.status() != Vehicle.Status.FREI_FUNK
+                        && v.status() != Vehicle.Status.FREI_WACHE)
+                    throw new InvalidOperationException("Fahrzeug nicht verfügbar: " + v.status());
+            }
+
+            validateOperation(o);
+
+            return operationDAO.add(
+                    o.toBuilder()
+                            .created(Instant.now())
+                            .severity(extractSeverityFromOpCode(o.opCode()))
+                            .status(Status.ACTIVE)
+                            .build());
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        } catch (InvalidVehicleException e) {
+            // already logged as invalid vehicle
+            throw new InvalidOperationException("Enthaltenes Fahrzeug ist ungültig", e);
+        } catch (ElementNotFoundException e) {
+            throw new InvalidOperationException("Enthaltenes Fahrzeug existiert nicht", e);
+        }
+    }
+
+    @Override
+    public void requestVehicles(long operationId, Set<Long> vehicleIds)
+            throws InvalidOperationException, InvalidVehicleException, ServiceException {
+        Set<Vehicle> vs = new HashSet<>();
+
+        try {
+            if (operationId <= 0) {
+                throw new InvalidOperationException("Einsatz-ID ist ungültig");
+            }
+            Operation o = operationDAO.get(operationId);
+            validateOperation(o);
+
+            if (o.opCode().trim().isEmpty()
+                    || extractSeverityFromOpCode(o.opCode()) != o.severity()) {
+                throw new InvalidOperationException("Einsatzcode ist ungültig");
+            }
+
+            if (o.status() != Status.ACTIVE) {
+                throw new InvalidOperationException("Einsatz ist ungültig");
+            }
+
+            if (o.created() == null) {
+                throw new InvalidOperationException("Erstellungszeitpunkt darf nicht leer sein");
+            }
+
+            for (Long id : vehicleIds) {
+                if (id <= 0) {
+                    throw new InvalidVehicleException("Fahrzeug-ID ist ungültig");
+                }
+
+                try {
+                    Vehicle v = vehicleDAO.get(id);
+                    VehicleServiceImpl.validateVehicle(v);
+                    if (v.status() != Vehicle.Status.FREI_FUNK
+                            && v.status() != Vehicle.Status.FREI_WACHE)
+                        throw new InvalidOperationException(
+                                "Fahrzeug nicht verfügbar: " + v.status());
+
+                    vs.add(v);
+                } catch (ElementNotFoundException e) {
+                    throw new InvalidVehicleException("VehicleId ist invalid");
+                }
+            }
+
+            vs.addAll(o.vehicles());
+            if (vs.equals(o.vehicles())) return;
+
+            operationDAO.update(o.toBuilder().vehicles(vs).build());
+        } catch (ElementNotFoundException e) {
+            throw new InvalidOperationException("Kein Einsatz mit dieser ID existiert");
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public void complete(long operationId, Status status)
+            throws InvalidOperationException, ServiceException {
+        try {
+            Operation o = operationDAO.get(operationId);
+            operationDAO.update(o.toBuilder().status(status).build());
+        } catch (ElementNotFoundException e) {
+            throw new InvalidOperationException(e);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public SortedSet<Vehicle> rankVehicles(String opCode)
+            throws InvalidOperationException, ServiceException {
+        Set<Vehicle> vehicles =
+                vehicleService.list(EnumSet.complementOf(EnumSet.of(Vehicle.Status.ABGEMELDET)));
+
+        List<Predicate<Vehicle>> priorities = new ArrayList<>();
+        Predicate<Vehicle> ktw = v -> v.type() == VehicleType.KTW;
+        Predicate<Vehicle> rtwNoNEF = v -> v.type() == VehicleType.RTW && !v.hasNef();
+        Predicate<Vehicle> rtwNEF = v -> v.type() == VehicleType.RTW && v.hasNef();
+        Predicate<Vehicle> nef = v -> v.type() == VehicleType.NEF;
+        Predicate<Vehicle> nah = v -> v.type() == VehicleType.NAH;
+
+        switch (extractSeverityFromOpCode(opCode)) {
+            case A:
+                // fallthrough
+            case B:
+                // fallthrough
+            case O:
+                priorities.add(ktw);
+                priorities.add(rtwNoNEF);
+                priorities.add(rtwNEF);
+                break;
+            case C:
+                priorities.add(rtwNEF);
+                priorities.add(rtwNoNEF);
+                priorities.add(ktw);
+                break;
+            case D:
+                priorities.add(rtwNEF);
+                priorities.add(nef);
+                priorities.add(nah);
+                priorities.add(rtwNoNEF);
+                priorities.add(ktw);
+                break;
+            case E:
+                priorities.add(nah);
+                priorities.add(nef);
+                priorities.add(rtwNEF);
+                priorities.add(rtwNoNEF);
+                priorities.add(ktw);
+                break;
+        }
+
+        Comparator<Vehicle> vehicleComparator =
+                (v1, v2) -> {
+                    for (Predicate<Vehicle> priority : priorities) {
+                        if (priority.test(v1)) {
+                            return -1;
+                        }
+                        if (priority.test(v2)) {
+                            return +1;
+                        }
+                    }
+                    return 0;
+                };
+
+        Supplier<TreeSet<Vehicle>> supplier = () -> new TreeSet<>(vehicleComparator);
+
+        return vehicles.stream().collect(Collectors.toCollection(supplier));
+    }
+
+    @Override
+    public Set<Operation> list(EnumSet<Status> statuses) throws ServiceException {
+        try {
+            Set<Operation> operations = operationDAO.list(statuses);
+            for (Operation o : operations) validateOperation(o);
+
+            return operations;
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        } catch (InvalidOperationException e) {
+            // database returned invalid values
+            throw new ServiceException("DB returned invalid operation", e);
+        }
+    }
+
+    private static void validateOperation(Operation o) throws InvalidOperationException {
+        if (o.vehicles().isEmpty()) {
+            throw new InvalidOperationException(
+                    "Es muss mindestens ein Fahrzeug ausgewählt werden!");
+        }
+
+        for (Vehicle v : o.vehicles()) {
+            try {
+                VehicleServiceImpl.validateVehicle(v);
+            } catch (InvalidVehicleException e) {
+                throw new InvalidOperationException("Fahrzeug " + v.name() + " ist ungültig", e);
+            }
+
+            // TODO: validate if NEF/RTW/NAH conditions?
+        }
+
+        Instant created = o.created();
+        if (created != null && created.isAfter(Instant.now())) {
+            throw new InvalidOperationException("Einsatz wurde in der Zukunft erstellt");
+        }
+
+        if (o.destination() == null || o.destination().trim().isEmpty()) {
+            throw new InvalidOperationException("Adresse darf nicht leer sein");
+        }
+
+        if (o.destination().length() > 100) {
+            throw new InvalidOperationException("Adresse darf 100 Zeichen nicht überschreiten");
+        }
+
+        if (o.additionalInfo() != null && o.additionalInfo().length() > 100) {
+            throw new InvalidOperationException("Anmerkung darf 100 Zeichen nicht überschreiten");
+        }
+    }
+
+    private static final Pattern opCodePattern =
+            Pattern.compile("(?:\\w{1,3}-\\d{0,2})([ABCDEO])(?:.*)");
+
+    private static Severity extractSeverityFromOpCode(String opCode)
+            throws InvalidOperationException {
+        Matcher m = opCodePattern.matcher(opCode);
+
+        if (!m.matches()) {
+            throw new InvalidOperationException("Einsatzcode ist ungültig");
+        }
+
+        return Severity.valueOf(m.group(1));
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationService.java
new file mode 100644
index 0000000..027417f
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationService.java
@@ -0,0 +1,32 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.Set;
+
+public interface RegistrationService {
+
+    /**
+     * Register employee to a vehicle.
+     *
+     * @param vehicleId the id of the target vehicle
+     * @param registrations that should be added to the vehicle
+     * @return the list of ids that were assigned
+     * @throws InvalidVehicleException if the vehicleId is invalid or does not exist
+     * @throws InvalidRegistrationException if the registration is invalid
+     * @throws ServiceException if the registration could not be persisted
+     */
+    Set<Long> add(long vehicleId, Set<Registration> registrations)
+            throws InvalidVehicleException, InvalidRegistrationException, ServiceException;
+
+    /**
+     * Remove given registration from the store.
+     *
+     * @param registrationId the id of the registration that should be removed
+     * @throws InvalidRegistrationException if the registration is invalid or does not exist
+     * @throws ServiceException if the registration could not be removed from the store
+     */
+    void remove(long registrationId) throws InvalidRegistrationException, ServiceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceImpl.java
new file mode 100644
index 0000000..3ec69e7
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceImpl.java
@@ -0,0 +1,52 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.RegistrationValidator;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RegistrationServiceImpl implements RegistrationService {
+
+    private final RegistrationDAO registrationDAO;
+    private final VehicleDAO vehicleDAO;
+
+    @Autowired
+    public RegistrationServiceImpl(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO) {
+        this.registrationDAO = registrationDAO;
+        this.vehicleDAO = vehicleDAO;
+    }
+
+    @Override
+    public Set<Long> add(long vehicleId, Set<Registration> registrations)
+            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
+
+        if (vehicleId <= 0) throw new InvalidVehicleException("VehicleId invalid");
+
+        try {
+            Vehicle vehicle = vehicleDAO.get(vehicleId);
+
+            RegistrationValidator.validate(vehicle, registrations);
+
+            return registrationDAO.add(vehicle.id(), registrations);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        } catch (ElementNotFoundException e) {
+            throw new InvalidVehicleException(e);
+        }
+    }
+
+    @Override
+    public void remove(long registrationId) throws InvalidRegistrationException, ServiceException {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleService.java
new file mode 100644
index 0000000..d96dfb7
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleService.java
@@ -0,0 +1,49 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.EnumSet;
+import java.util.Set;
+
+public interface VehicleService {
+
+    /**
+     * Add given vehicle to the store.
+     *
+     * @param vehicle that should be added to the store
+     * @return the id that was assigned
+     * @throws InvalidVehicleException if the vehicle is invalid
+     * @throws ServiceException if the vehicle could not be persisted
+     */
+    long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
+
+    /**
+     * Update the given vehicle.
+     *
+     * @param vehicle that should be updated
+     * @return the updated vehicle
+     * @throws InvalidVehicleException if the vehicle is invalid
+     * @throws ServiceException if the updated vehicle could not be persisted
+     */
+    Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
+
+    /**
+     * Get all stored vehicles with matching status.
+     *
+     * @param statuses set containing all statuses that should be matched
+     * @return list containing all stored vehicles
+     * @throws ServiceException if loading the stored vehicles failed
+     */
+    Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException;
+
+    /**
+     * Remove vehicle with the given id from the store.
+     *
+     * @param id of the vehicle that should be removed
+     * @throws InvalidVehicleException if given vehicle id is invalid or does not exist
+     * @throws ServiceException if the vehicle could not be removed from the store
+     */
+    void remove(long id) throws InvalidVehicleException, ServiceException;
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleServiceImpl.java
new file mode 100644
index 0000000..6a035c6
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/VehicleServiceImpl.java
@@ -0,0 +1,116 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class VehicleServiceImpl implements VehicleService {
+
+    private VehicleDAO vehiclePersistence;
+
+    public VehicleServiceImpl(VehicleDAO vehiclePersistence) {
+        this.vehiclePersistence = vehiclePersistence;
+    }
+
+    public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
+        if (!CollectionUtils.isEmpty(vehicle.registrations())) {
+            throw new InvalidVehicleException(
+                    "Fahrzeug kann nicht mit Anmeldungen erstellt werden");
+        }
+
+        validateVehicle(vehicle);
+        try {
+            vehiclePersistence.add(vehicle);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+        return 0;
+    }
+
+    public Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
+        validateVehicle(vehicle);
+        try {
+            vehiclePersistence.update(vehicle);
+        } catch (ElementNotFoundException e) {
+            throw new ServiceException("Element not found", e);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+        return vehicle;
+    }
+
+    protected static void validateVehicle(Vehicle vehicle) throws InvalidVehicleException {
+        switch (vehicle.type()) {
+            case RTW:
+                if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    throw new InvalidVehicleException("RTW darf kein Normales Dach haben");
+                } else if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    throw new InvalidVehicleException("RTW darf kein Mittelhochdach haben");
+                }
+                break;
+            case KTW:
+                if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    throw new InvalidVehicleException("KTW darf kein Normales Dach haben");
+                }
+                break;
+            case KTW_B:
+                if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    throw new InvalidVehicleException("KTW-B darf kein Normales Dach haben");
+                }
+                break;
+            case NEF:
+                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
+                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
+                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
+                }
+                break;
+            case NAH:
+                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
+                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
+                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
+                }
+                break;
+            case BKTW:
+                break;
+            default:
+                throw new IllegalStateException("BUG: invalid vehicle type" + vehicle.type());
+        }
+    }
+
+    @Override
+    public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException {
+        if (statuses == null) {
+            throw new ServiceException("Statuses may not be null");
+        }
+
+        Set<Vehicle> vehicles;
+
+        try {
+            vehicles = vehiclePersistence.list();
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
+
+        return vehicles.stream()
+                .filter(vehicle -> statuses.contains(vehicle.status()))
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public void remove(long id) throws InvalidVehicleException, ServiceException {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 0150d81..e9549ae 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" 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.ArchiveOperationController">
+<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" 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.missioncontrol.controller.ArchiveOperationController">
    <children>
       <ScrollPane hbarPolicy="NEVER" layoutX="43.0" layoutY="202.0" prefHeight="435.0" prefWidth="906.0" style="-fx-background-color:  rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="43.0">
          <content>
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 0c82e29..56e0c90 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -14,7 +14,7 @@
 <?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 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.missioncontrol.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" />
diff --git a/src/main/resources/fxml/DetailArchiveOperation.fxml b/src/main/resources/fxml/DetailArchiveOperation.fxml
index 82c23ed..553dfd3 100644
--- a/src/main/resources/fxml/DetailArchiveOperation.fxml
+++ b/src/main/resources/fxml/DetailArchiveOperation.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" 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.DetailArchiveOperationController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.DetailArchiveOperationController">
    <children>
       <HBox prefHeight="100.0" prefWidth="200.0" spacing="100.0">
          <children>
diff --git a/src/main/resources/fxml/OperationDetails.fxml b/src/main/resources/fxml/OperationDetails.fxml
index 4ca3a10..e1a4daa 100644
--- a/src/main/resources/fxml/OperationDetails.fxml
+++ b/src/main/resources/fxml/OperationDetails.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" 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.OperationDetailsController">
+<AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" 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.missioncontrol.controller.OperationDetailsController">
   <children>
     <AnchorPane prefHeight="542.0" prefWidth="1100.0" style="-fx-background-color: rgba(239,235,232,1);" />
     <AnchorPane layoutX="10.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1000.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml
index 9da1d9b..ebbaec8 100644
--- a/src/main/resources/fxml/OperationInArchive.fxml
+++ b/src/main/resources/fxml/OperationInArchive.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<GridPane hgap="12.0" prefHeight="106.0" prefWidth="374.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController">
+<GridPane hgap="12.0" prefHeight="106.0" prefWidth="374.0" styleClass="bg-white, shadowed" vgap="12" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.OperationInArchiveController">
    <columnConstraints>
       <ColumnConstraints maxWidth="249.6000518798828" minWidth="205.60003662109375" prefWidth="249.6000518798828" />
       <ColumnConstraints maxWidth="182.39996337890625" minWidth="138.3999481201172" prefWidth="138.3999481201172" />
diff --git a/src/main/resources/fxml/RegistrationWindow.fxml b/src/main/resources/fxml/RegistrationWindow.fxml
index afd6d55..1f57c11 100644
--- a/src/main/resources/fxml/RegistrationWindow.fxml
+++ b/src/main/resources/fxml/RegistrationWindow.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?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">
+<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.missioncontrol.controller.RegistrationWindowController">
   <rowConstraints>
     <RowConstraints/> <!--"Neue Anmeldung", "von x bis x", Buttons-->
     <RowConstraints/> <!--"Fahrzeug", "Personen"-->
diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml
index 5c1bafc..399c9bc 100644
--- a/src/main/resources/fxml/createCar.fxml
+++ b/src/main/resources/fxml/createCar.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 
-<AnchorPane fx:id="createCarAP" prefHeight="522.0" prefWidth="847.0" style="-fx-background-color: WHITE;" 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.CreateCarController">
+<AnchorPane fx:id="createCarAP" prefHeight="522.0" prefWidth="847.0" style="-fx-background-color: WHITE;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.CreateCarController">
    <children>
       <ScrollPane layoutX="29.0" layoutY="194.0" prefHeight="314.0" prefWidth="803.0">
          <content>
diff --git a/src/main/resources/fxml/createNewEmployee.fxml b/src/main/resources/fxml/createNewEmployee.fxml
index e2f841f..fd04ee1 100644
--- a/src/main/resources/fxml/createNewEmployee.fxml
+++ b/src/main/resources/fxml/createNewEmployee.fxml
@@ -12,7 +12,7 @@
   prefWidth="${apCreateNewEmployee.parent.width}" styleClass="bg-edit-area-orange"
   stylesheets="@/styles/main.css" 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.CreateNewEmployeeController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.CreateNewEmployeeController">
   <children>
     <Label fx:id="lblHeader" layoutX="14.0" layoutY="14.0" styleClass="text-bold, text-medium"
       text="Neue Person erstellen"/>
diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
index 5bcce1c..85f693c 100644
--- a/src/main/resources/fxml/employeeList.fxml
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -5,7 +5,7 @@
 <FlowPane
   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.EmployeeListController"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.EmployeeListController"
   fx:id="flowPaneEmployeeList"
   stylesheets="@/styles/main.css"
   prefWidth="${flowPaneEmployeeList.parent.width}"
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index 3c020eb..7f6aabd 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -9,7 +9,7 @@
   onMouseClicked="#onEmployeeClicked" prefHeight="80.0" prefWidth="320.0"
   styleClass="bg-white, shadowed" stylesheets="@/styles/main.css"
   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.EmployeeListItemController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.EmployeeListItemController">
   <children>
     <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" styleClass="text-big, text-bold"
       text="Peter Mustermann" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 55c80d8..8f7e72f 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -9,7 +9,7 @@
 <AnchorPane fx:id="apFilterEmployees" prefHeight="80" prefWidth="${apFilterEmployees.parent.width}"
   style="-fx-background-color: white;" stylesheets="/styles/main.css"
   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.FilterEmployeesController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.FilterEmployeesController">
   <children>
     <Label text="Filtern nach Name" AnchorPane.leftAnchor="20.0"
       AnchorPane.topAnchor="15.0" styleClass="text-medium, text-bold"/>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index 68851e2..b0ce2fc 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -9,7 +9,7 @@
 <AnchorPane fx:id="listEmployeesAP" prefHeight="536.0" prefWidth="702.0" styleClass="bg-gray-orange"
   stylesheets="@/styles/main.css" 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.ManageEmployeesController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.ManageEmployeesController">
   <children>
     <AnchorPane prefHeight="120.0" styleClass="bg-dark-orange" AnchorPane.leftAnchor="0.0"
       AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 5a47181..752941a 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.control.Label?>
 <GridPane stylesheets="@/styles/main.css" minWidth="-Infinity" styleClass="bg-white, shadowed"
   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.VehiclePaneController">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.VehiclePaneController">
   <columnConstraints>
     <ColumnConstraints/>
     <ColumnConstraints/>
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
deleted file mode 100644
index 3273593..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SUCCESS;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
-import javafx.scene.control.DialogPane;
-import javafx.scene.input.MouseButton;
-import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.testfx.api.FxToolkit;
-import org.testfx.robot.Motion;
-
-public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest {
-
-    private EmployeeService employeeService;
-
-    @Before
-    public void setup() throws Exception {
-        FxToolkit.registerPrimaryStage();
-        FxToolkit.setupApplication(GuiTestApplication.class, "createNewEmployee.fxml");
-        employeeService = GuiTestApplication.context.getBean(EmployeeService.class);
-    }
-
-    @After
-    public void cleanup() throws Exception {
-        FxToolkit.cleanupStages();
-    }
-
-    @Test
-    public void testClickAddValidEmployee() throws InvalidEmployeeException, ServiceException {
-
-        when(employeeService.add(any())).thenReturn(1L);
-
-        clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
-        write("Name");
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
-    }
-
-    @Test
-    public void testClickAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
-
-        when(employeeService.add(any())).thenThrow(InvalidEmployeeException.class);
-
-        moveTo("#inputName");
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
-    }
-
-    @Test
-    public void testClickAddEmployeeWithServiceException()
-            throws InvalidEmployeeException, ServiceException {
-
-        when(employeeService.add(any())).thenThrow(ServiceException.class);
-
-        clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
-        write("Test");
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
deleted file mode 100644
index f5f4b57..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_SUCCESS;
-import static at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
-import javafx.scene.control.DialogPane;
-import javafx.scene.input.MouseButton;
-import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.testfx.api.FxToolkit;
-import org.testfx.robot.Motion;
-
-public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest {
-
-    private VehicleService vehicleService;
-
-    @Before
-    public void setup() throws Exception {
-        FxToolkit.registerPrimaryStage();
-        FxToolkit.setupApplication(GuiTestApplication.class, "createCar.fxml");
-        vehicleService = GuiTestApplication.context.getBean(VehicleService.class);
-    }
-
-    @After
-    public void cleanup() throws Exception {
-        FxToolkit.cleanupStages();
-    }
-
-    @Test
-    public void testClickAddValidVehicle() throws ServiceException, InvalidVehicleException {
-
-        when(vehicleService.add(any())).thenReturn(1L);
-
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
-    }
-
-    @Test
-    public void testClickInvalidVehicleEx() throws ServiceException, InvalidVehicleException {
-
-        when(vehicleService.add(any())).thenThrow(InvalidVehicleException.class);
-
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
-    }
-
-    @Test
-    public void testClickInvalidServiceEx() throws ServiceException, InvalidVehicleException {
-
-        when(vehicleService.add(any())).thenThrow(ServiceException.class);
-
-        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
-
-        Stage alertDialog = Helper.getTopModalStage(robotContext());
-        Assert.assertNotNull(alertDialog);
-
-        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
deleted file mode 100644
index cec2da0..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static org.mockito.Mockito.mock;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.RegistrationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.RegistrationServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
-import java.lang.invoke.MethodHandles;
-import javafx.application.Application;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-@Component
-@ComponentScan("at.ac.tuwien.sepm.assignment.groupphase")
-public class GuiTestApplication extends Application {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-    public static AnnotationConfigApplicationContext context;
-
-    @Configuration
-    public static class ContextConfiguration {
-
-        @Bean
-        @Primary
-        public EmployeeService employeeService() {
-            return mock(EmployeeServiceImpl.class);
-        }
-
-        @Bean
-        @Primary
-        public VehicleService vehicleService() {
-            return mock(VehicleServiceImpl.class);
-        }
-
-        @Bean
-        @Primary
-        public OperationService operationService() {
-            return mock(OperationServiceImpl.class);
-        }
-
-        @Bean
-        @Primary
-        public RegistrationService registrationService() {
-            return mock(RegistrationServiceImpl.class);
-        }
-    }
-
-    @Override
-    public void start(Stage primaryStage) throws Exception {
-        // setup application
-        primaryStage.setTitle("Test window");
-        primaryStage.setWidth(1366);
-        primaryStage.setHeight(768);
-        primaryStage.centerOnScreen();
-        primaryStage.setOnCloseRequest(event -> LOG.debug("Application shutdown initiated"));
-
-        if (getParameters().getRaw().size() < 1) {
-            throw new UnsupportedOperationException("FXML file not set");
-        }
-
-        context = new AnnotationConfigApplicationContext(GuiTestApplication.class);
-        final var fxmlLoader = context.getBean(SpringFXMLLoader.class);
-        primaryStage.setScene(
-                new Scene(
-                        (Parent)
-                                fxmlLoader.load(
-                                        getClass()
-                                                .getResourceAsStream(
-                                                        "/fxml/"
-                                                                + getParameters()
-                                                                        .getRaw()
-                                                                        .get(0)))));
-
-        // show application
-        primaryStage.show();
-        primaryStage.toFront();
-        LOG.debug("Application startup complete");
-    }
-
-    @Override
-    public void stop() {
-        LOG.debug("Stopping application");
-        context.close();
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationControllerTest.java
deleted file mode 100644
index 560032e..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationControllerTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.testfx.api.FxToolkit;
-
-public class RegistrationControllerTest extends HighDpiAwareApplicationTest {
-
-    @Before
-    public void setup() throws Exception {
-        FxToolkit.registerPrimaryStage();
-        FxToolkit.setupApplication(GuiTestApplication.class, "RegistrationWindow.fxml");
-    }
-
-    @After
-    public void cleanup() throws Exception {
-        FxToolkit.cleanupStages();
-    }
-
-    // TODO: implement GUI Tests
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java
deleted file mode 100644
index dfee5f0..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import java.io.InputStream;
-import java.time.LocalDate;
-import java.util.Set;
-import org.dbunit.Assertion;
-import org.dbunit.dataset.DataSetException;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.ITable;
-import org.dbunit.dataset.filter.DefaultColumnFilter;
-import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class EmployeeDAOTest extends JdbcTestCase {
-
-    private EmployeeDAO employeePersistence;
-
-    public EmployeeDAOTest() {
-        employeePersistence = new EmployeeDatabaseDAO(getJdbcConnectionManager());
-    }
-
-    @Override
-    protected IDataSet getDataSet() throws DataSetException {
-        InputStream res =
-                getClass()
-                        .getClassLoader()
-                        .getResourceAsStream("EmployeePersistenceTestBaseData.xml");
-        return new FlatXmlDataSetBuilder().build(res);
-    }
-
-    @Test
-    public void testListEmployees() throws PersistenceException {
-        Set<Employee> employees = employeePersistence.list();
-
-        Employee empOne =
-                Employee.builder()
-                        .id(1)
-                        .name("Adam")
-                        .birthday(LocalDate.parse("2010-10-10"))
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(false)
-                        .build();
-
-        Employee empTwo =
-                Employee.builder()
-                        .id(2)
-                        .name("Max")
-                        .birthday(LocalDate.parse("1990-11-11"))
-                        .educationLevel(EducationLevel.NFS)
-                        .isDriver(false)
-                        .isPilot(false)
-                        .build();
-
-        Employee empThree =
-                Employee.builder()
-                        .id(3)
-                        .name("Lisa")
-                        .birthday(LocalDate.parse("1999-10-16"))
-                        .educationLevel(EducationLevel.NKI)
-                        .isDriver(true)
-                        .isPilot(false)
-                        .build();
-
-        Assert.assertTrue(employees.contains(empOne));
-        Assert.assertTrue(employees.contains(empTwo));
-        Assert.assertTrue(employees.contains(empThree));
-        Assert.assertEquals(3, employees.size());
-    }
-
-    @Test
-    public void testEmployeeListNoElement() throws PersistenceException {
-        Set<Employee> employees = employeePersistence.list();
-
-        Employee empOne =
-                Employee.builder()
-                        .id(10)
-                        .name("Adam")
-                        .birthday(LocalDate.parse("2010-10-10"))
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(false)
-                        .build();
-
-        Assert.assertFalse(employees.contains(empOne));
-    }
-
-    Employee validEmployee =
-            Employee.builder()
-                    .name("Testperson")
-                    .birthday(LocalDate.parse("2010-11-11"))
-                    .educationLevel(EducationLevel.NA)
-                    .isDriver(true)
-                    .isPilot(false)
-                    .build();
-
-    @Test
-    public void testAddValidEmployee_EmployeeVersion() throws Exception {
-
-        employeePersistence.add(validEmployee);
-
-        String[] excludedColumnsEmployeeVersion = new String[] {"ID"};
-        String tableEmployeeVersion = "EMPLOYEEVERSION";
-
-        // load actual and expected data set
-        IDataSet actualDataSet = getConnection().createDataSet();
-        IDataSet expectedDataSet =
-                new FlatXmlDataFileLoader().load("/testAddValidEmployee_expected.xml");
-
-        // extract employeeVersion table
-        ITable actualEmployeeVersionTable = actualDataSet.getTable(tableEmployeeVersion);
-        ITable expectedEmployeeVersionTable = expectedDataSet.getTable(tableEmployeeVersion);
-
-        // exclude 'id' column as it is an autogenerated value
-        ITable actualFilteredTable =
-                DefaultColumnFilter.excludedColumnsTable(
-                        actualEmployeeVersionTable, excludedColumnsEmployeeVersion);
-        ITable expectedFilteredTable =
-                DefaultColumnFilter.excludedColumnsTable(
-                        expectedEmployeeVersionTable, excludedColumnsEmployeeVersion);
-
-        Assertion.assertEquals(expectedFilteredTable, actualFilteredTable);
-    }
-
-    @Test
-    public void testAddValidEmployee_Employee() throws Exception {
-
-        employeePersistence.add(validEmployee);
-
-        String[] excludedColumnsEmployee = new String[] {"VERSION", "ID"};
-        String tableEmployee = "EMPLOYEE";
-
-        // load actual and expected data set
-        IDataSet actualDataSet = getConnection().createDataSet();
-        IDataSet expectedDataSet =
-                new FlatXmlDataFileLoader().load("/testAddValidEmployee_expected.xml");
-
-        // extract employee table
-        ITable actualEmployeeTable = actualDataSet.getTable(tableEmployee);
-        ITable expectedEmployeeTable = expectedDataSet.getTable(tableEmployee);
-
-        // exclude 'version' as it is an autogenerated value
-        ITable actualFilteredEmpTable =
-                DefaultColumnFilter.excludedColumnsTable(
-                        actualEmployeeTable, excludedColumnsEmployee);
-        ITable expectedFilteredEmpTable =
-                DefaultColumnFilter.excludedColumnsTable(
-                        expectedEmployeeTable, excludedColumnsEmployee);
-
-        Assertion.assertEquals(expectedFilteredEmpTable, actualFilteredEmpTable);
-    }
-
-    @Test
-    public void testAddValidEmployee_Join() throws Exception {
-
-        employeePersistence.add(validEmployee);
-
-        String[] excludedColumns = new String[] {"E_VERSION", "V_ID", "E_ID"};
-        String table = "EMP_JOIN";
-        String expectedXmlDataFileName = "testAddValidEmployeeJoin_expected.xml";
-
-        String sqlJoinEmployeeVersion =
-                "SELECT e.id AS E_ID, v.name AS V_NAME, v.birthday AS V_BIRTHDAY, "
-                        + "v.educationLevel as V_EDUCATIONLEVEL, "
-                        + "v.isDriver AS V_ISDRIVER, v.isPilot AS V_ISPILOT "
-                        + "FROM Employee e "
-                        + "JOIN EmployeeVersion v ON e.version = v.id";
-
-        ITable actualFilteredJoinData =
-                Helper.getActualFilteredQueryTableData(
-                        getConnection(), table, sqlJoinEmployeeVersion, excludedColumns);
-
-        ITable expectedFilteredJoinData =
-                Helper.getExpectedFilteredTableData(
-                        table, excludedColumns, expectedXmlDataFileName);
-
-        Assertion.assertEquals(expectedFilteredJoinData, actualFilteredJoinData);
-    }
-
-    Employee validUpdateEmployee =
-            Employee.builder()
-                    .id(3)
-                    .name("Lisa")
-                    .birthday(LocalDate.parse("1999-10-16"))
-                    .educationLevel(EducationLevel.NKA)
-                    .isDriver(true)
-                    .isPilot(true)
-                    .build();
-
-    @Test
-    public void testUpdateValidEmployee_EmployeeVersion() throws Exception {
-
-        employeePersistence.update(validUpdateEmployee);
-
-        String[] excludedColumnsEmployeeVersion = new String[] {"ID"};
-        String tableEmployeeVersion = "EMPLOYEEVERSION";
-
-        ITable actualTableData =
-                Helper.getActualFilteredTableData(
-                        getConnection(), tableEmployeeVersion, excludedColumnsEmployeeVersion);
-        ITable expedtedTableData =
-                Helper.getExpectedFilteredTableData(
-                        tableEmployeeVersion,
-                        excludedColumnsEmployeeVersion,
-                        "testUpdateValidEmployee_expected.xml");
-
-        Assertion.assertEquals(expedtedTableData, actualTableData);
-    }
-
-    @Test
-    public void testUpdateValidEmployee_Employee() throws Exception {
-
-        employeePersistence.update(validUpdateEmployee);
-
-        String[] excludedColumns = new String[] {"VERSION"};
-        String tableName = "EMPLOYEE";
-        String expectedXmlDataFileName = "testUpdateValidEmployee_expected.xml";
-
-        ITable actualTableData =
-                Helper.getActualFilteredTableData(getConnection(), tableName, excludedColumns);
-
-        ITable expectedTableData =
-                Helper.getExpectedFilteredTableData(
-                        tableName, excludedColumns, expectedXmlDataFileName);
-
-        Assertion.assertEquals(expectedTableData, actualTableData);
-    }
-
-    @Test(expected = ElementNotFoundException.class)
-    public void testUpdateNonExistingEmployee()
-            throws PersistenceException, ElementNotFoundException {
-
-        Employee nonExistentEmployee =
-                Employee.builder()
-                        .id(1000)
-                        .name("Lisa")
-                        .birthday(LocalDate.parse("1999-10-16"))
-                        .educationLevel(EducationLevel.NKA)
-                        .isDriver(true)
-                        .isPilot(true)
-                        .build();
-
-        employeePersistence.update(nonExistentEmployee);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
deleted file mode 100644
index dbe3c36..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import static org.junit.Assert.assertEquals;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.TimeZone;
-import org.dbunit.dataset.DataSetException;
-import org.dbunit.dataset.IDataSet;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class OperationDAOTest extends JdbcTestCase {
-
-    private static final String[] COMPARE_TABLES =
-            new String[] {"VehicleOperation", "Operation", "Vehicle", "VehicleVersion"};
-
-    private final OperationDAO operationDAO;
-
-    private final Operation o;
-
-    private final Operation originalOperation;
-
-    public OperationDAOTest() throws PersistenceException {
-        // TODO: fix once everything properly uses dependency injection
-        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
-        RegistrationDatabaseDAO registrationDatabaseDAO =
-                new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
-        VehicleDAO vehicleDAO =
-                new VehicleDatabaseDAO(getJdbcConnectionManager(), registrationDatabaseDAO);
-        this.operationDAO = new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO);
-
-        Vehicle v1 =
-                Vehicle.builder()
-                        .id(1)
-                        .name("RTW-1")
-                        .constructionType(Vehicle.ConstructionType.HOCHDACH)
-                        .type(Vehicle.VehicleType.RTW)
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .hasNef(true)
-                        .build();
-
-        Vehicle v2 = v1.toBuilder().id(2).build();
-        Vehicle v3 = v1.toBuilder().id(3).build();
-
-        o =
-                Operation.builder()
-                        .id(1)
-                        .opCode("RD-2B0M")
-                        .severity(Severity.B)
-                        .status(Status.ACTIVE)
-                        .vehicles(Set.of(v1, v2, v3))
-                        .created(Instant.ofEpochSecond(1514764800)) // 2018-01-01 00:00:00.0
-                        .destination("New destination")
-                        .additionalInfo("New information")
-                        .build();
-
-        Vehicle vehicle =
-                Vehicle.builder()
-                        .id(4)
-                        .name("BKTW-2")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(VehicleType.BKTW)
-                        .hasNef(false)
-                        .status(Vehicle.Status.ZUM_BERUFUNGSORT)
-                        .registrations(new LinkedList<>())
-                        .build();
-
-        originalOperation =
-                Operation.builder()
-                        .id(1)
-                        .opCode("ALP-95E7")
-                        .severity(Severity.E)
-                        .created(Instant.parse("2000-01-01T00:00:00.0Z"))
-                        .destination("Wiedner Hauptstraße 35, Wien")
-                        .additionalInfo("Additional information")
-                        .status(Status.ACTIVE)
-                        .vehicles(Set.of(vehicle))
-                        .build();
-    }
-
-    @BeforeClass
-    public static void before() {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-    }
-
-    @Override
-    protected IDataSet getDataSet() throws DataSetException {
-        return getDataSet("operationDAOUpdateSetup.xml");
-    }
-
-    @Test
-    public void testUpdateNormal() throws Exception {
-        operationDAO.update(o);
-
-        compareWith("operationDAOUpdateNormal.xml", COMPARE_TABLES);
-    }
-
-    @Test(expected = ElementNotFoundException.class)
-    public void testUpdateMissing() throws Exception {
-        Operation op = o.toBuilder().id(73).build();
-
-        operationDAO.update(op);
-    }
-
-    @Test
-    public void testUpdateRemoveVehicles() throws Exception {
-        Operation op = o.toBuilder().vehicles(Collections.emptySet()).build();
-
-        operationDAO.update(op);
-
-        compareWith("operationDAOUpdateRemoveVehicles.xml", COMPARE_TABLES);
-    }
-
-    @Test
-    public void testListOperations() throws Exception {
-        Set<Operation> operationSet = operationDAO.list(EnumSet.allOf(Status.class));
-
-        assertEquals(Set.of(originalOperation), operationSet);
-    }
-
-    @Test
-    public void testGetOperations() throws Exception {
-        Operation gotOperation = operationDAO.get(originalOperation.id());
-
-        assertEquals(originalOperation, gotOperation);
-    }
-
-    @Test
-    public void testAddOperation() throws Exception {
-        long id = operationDAO.add(o);
-        assertEquals(2, id);
-        compareWith("operationDAOAddOperation.xml", COMPARE_TABLES);
-    }
-
-    @Test(expected = PersistenceException.class)
-    public void testAddFaultyOperation() throws PersistenceException {
-        Vehicle vehicle =
-                Vehicle.builder()
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .name("BKTW_123")
-                        .hasNef(true)
-                        .type(VehicleType.BKTW)
-                        .build();
-
-        Operation operation =
-                Operation.builder()
-                        .status(Status.ACTIVE)
-                        .opCode(String.valueOf(Arrays.stream(new int[200]).map(i -> 'a')))
-                        .created(Instant.now())
-                        .destination("Wiedner Hauptstraße 35, Wien")
-                        .additionalInfo("HTU Wien")
-                        .severity(Severity.B)
-                        .vehicles(Set.of(vehicle))
-                        .build();
-        operationDAO.add(operation);
-    }
-
-    @Test(expected = PersistenceException.class)
-    public void testAddFaultyOperation2() throws PersistenceException {
-        Vehicle vehicle =
-                Vehicle.builder()
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .name("BKTW_123")
-                        .hasNef(true)
-                        .type(VehicleType.BKTW)
-                        .build();
-
-        Operation operation =
-                Operation.builder()
-                        .status(Status.ACTIVE)
-                        .opCode("ALP-95E7")
-                        .created(Instant.now())
-                        .destination(
-                                "Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien ")
-                        .additionalInfo("HTU Wien")
-                        .severity(Severity.B)
-                        .vehicles(Set.of(vehicle))
-                        .build();
-        operationDAO.add(operation);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java
deleted file mode 100644
index 2fb578b..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import static org.junit.Assert.*;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.util.HashSet;
-import java.util.Set;
-import org.dbunit.dataset.IDataSet;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class RegistrationDAOTest extends JdbcTestCase {
-
-    private RegistrationDAO registrationDAO;
-
-    public RegistrationDAOTest() throws PersistenceException {
-        this.registrationDAO =
-                new RegistrationDatabaseDAO(
-                        getJdbcConnectionManager(),
-                        new EmployeeDatabaseDAO(getJdbcConnectionManager()));
-    }
-
-    @Override
-    protected IDataSet getDataSet() throws Exception {
-        return getDataSet("registrationTestBaseData.xml");
-    }
-
-    @Rule public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void addRegistrationsShouldSucceed() throws PersistenceException {
-        Set<Registration> registrations = new HashSet<>();
-        Employee employee1 =
-                Employee.builder()
-                        .id(1)
-                        .name("John Doe")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(true)
-                        .build();
-        Employee employee2 =
-                Employee.builder()
-                        .id(2)
-                        .name("Nick \"Kage\" Verily")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.NKV)
-                        .isDriver(true)
-                        .isPilot(false)
-                        .build();
-        Employee employee3 =
-                Employee.builder()
-                        .id(3)
-                        .name("Nicht Arzt")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.NA)
-                        .isDriver(false)
-                        .isPilot(false)
-                        .build();
-        Registration registration1 =
-                Registration.builder()
-                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
-                        .end(Instant.now()) // same
-                        .employee(employee1)
-                        .build();
-        Registration registration2 =
-                Registration.builder()
-                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
-                        .end(Instant.now()) // same
-                        .employee(employee2)
-                        .build();
-        Registration registration3 =
-                Registration.builder()
-                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
-                        .end(Instant.now()) // same
-                        .employee(employee3)
-                        .build();
-        registrations.add(registration1);
-        registrations.add(registration2);
-        registrations.add(registration3);
-
-        Set<Long> returnvalues = registrationDAO.add(1, registrations);
-        assertFalse(returnvalues.isEmpty()); // can be improved...
-    }
-
-    @Test
-    public void addRegistrationToInexistentVehicleShouldFail() throws PersistenceException {
-        thrown.expect(PersistenceException.class);
-        Set<Registration> registrations = new HashSet<>();
-        Employee employee =
-                Employee.builder()
-                        .id(1)
-                        .name("John Doe")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(true)
-                        .build();
-        Registration registration =
-                Registration.builder()
-                        .start(Instant.now())
-                        .end(Instant.now())
-                        .employee(employee)
-                        .build();
-        registrations.add(registration);
-        registrationDAO.add(200, registrations);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java
deleted file mode 100644
index 1862214..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Set;
-import org.dbunit.Assertion;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.ITable;
-import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class VehicleDAOTest extends JdbcTestCase {
-
-    private VehicleDAO vehicleDAO;
-
-    private Vehicle validUpdateVehicle =
-            Vehicle.builder()
-                    .hasNef(true)
-                    .constructionType(ConstructionType.HOCHDACH)
-                    .type(VehicleType.RTW)
-                    .id(2)
-                    .name("RTW-2")
-                    .status(Status.ABGEMELDET)
-                    .build();
-
-    public VehicleDAOTest() throws PersistenceException {
-        vehicleDAO =
-                new VehicleDatabaseDAO(
-                        getJdbcConnectionManager(),
-                        new RegistrationDatabaseDAO(
-                                getJdbcConnectionManager(),
-                                new EmployeeDatabaseDAO(getJdbcConnectionManager())));
-        // TODO: use Spring Dependency Injection!
-    }
-
-    @Override
-    protected IDataSet getDataSet() throws Exception {
-        InputStream res = getClass().getClassLoader().getResourceAsStream("vehicleTestData.xml");
-        return new FlatXmlDataSetBuilder().build(res);
-    }
-
-    @Test
-    public void testListVehicle() throws PersistenceException {
-        Set<Vehicle> vehicles = vehicleDAO.list();
-
-        Vehicle v1 =
-                Vehicle.builder()
-                        .id(1)
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .name("RTW-1")
-                        .hasNef(true)
-                        .status(Status.ABGEMELDET)
-                        .type(VehicleType.RTW)
-                        .registrations(new ArrayList<>())
-                        .build();
-        Vehicle v2 =
-                Vehicle.builder()
-                        .id(2)
-                        .constructionType(ConstructionType.MITTELHOCHDACH)
-                        .name("KTW-2")
-                        .hasNef(false)
-                        .status(Status.FREI_WACHE)
-                        .type(VehicleType.KTW)
-                        .registrations(new ArrayList<>())
-                        .build();
-        Vehicle v3 =
-                Vehicle.builder()
-                        .id(3)
-                        .constructionType(ConstructionType.NORMAL)
-                        .name("NEF-3")
-                        .hasNef(false)
-                        .status(Status.FREI_FUNK)
-                        .type(VehicleType.NEF)
-                        .registrations(new ArrayList<>())
-                        .build();
-
-        Assert.assertTrue(vehicles.contains(v1));
-        Assert.assertTrue(vehicles.contains(v2));
-        Assert.assertTrue(vehicles.contains(v3));
-        Assert.assertEquals(3, vehicles.size());
-    }
-
-    @Test
-    public void testVehicleListNoElement() throws PersistenceException {
-        Set<Vehicle> vehicles = vehicleDAO.list();
-
-        Vehicle v1 =
-                Vehicle.builder()
-                        .id(30)
-                        .constructionType(ConstructionType.NORMAL)
-                        .name("NEF-3")
-                        .hasNef(false)
-                        .status(Status.FREI_FUNK)
-                        .type(VehicleType.NEF)
-                        .build();
-
-        Assert.assertFalse(vehicles.contains(v1));
-    }
-
-    @Test
-    public void testUpdateValid_VehicleVersion() throws Exception {
-        vehicleDAO.update(validUpdateVehicle);
-
-        String[] excludedColumnsVehicleVersion = new String[] {"ID", "NAME"};
-        String tableVehicleVersion = "VEHICLEVERSION";
-
-        ITable actualTableData =
-                Helper.getActualFilteredTableData(
-                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
-
-        ITable expectedTableData =
-                Helper.getExpectedFilteredTableData(
-                        tableVehicleVersion,
-                        excludedColumnsVehicleVersion,
-                        "vehicleTestUpdateExpectedData.xml");
-        Assertion.assertEquals(expectedTableData, actualTableData);
-    }
-
-    @Test
-    public void testUpdateValid_Vehicle() throws Exception {
-        vehicleDAO.update(validUpdateVehicle);
-
-        String[] excludedColumnsVehicleVersion = new String[] {"VERSION", "STATUS"};
-        String tableVehicleVersion = "VEHICLE";
-
-        ITable actualTableData =
-                Helper.getActualFilteredTableData(
-                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
-
-        ITable expectedTableData =
-                Helper.getExpectedFilteredTableData(
-                        tableVehicleVersion,
-                        excludedColumnsVehicleVersion,
-                        "vehicleTestUpdateExpectedData.xml");
-        Assertion.assertEquals(expectedTableData, actualTableData);
-    }
-
-    @Test(expected = ElementNotFoundException.class)
-    public void testUpdateNonExistingVehicle()
-            throws PersistenceException, ElementNotFoundException {
-        Vehicle nonExistentVehicle =
-                Vehicle.builder()
-                        .id(35)
-                        .constructionType(ConstructionType.NORMAL)
-                        .name("NEF-3")
-                        .hasNef(false)
-                        .status(Status.FREI_FUNK)
-                        .type(VehicleType.NEF)
-                        .build();
-        vehicleDAO.update(nonExistentVehicle);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
deleted file mode 100644
index 90f0a44..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.time.LocalDate;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class EmployeeServiceTest {
-
-    private final EmployeeDAO employeePersistence = mock(EmployeeDatabaseDAO.class);
-    private final EmployeeService employeeService = new EmployeeServiceImpl(employeePersistence);
-
-    private final Employee.Builder employeeBuilder =
-            Employee.builder()
-                    .name("Testperson")
-                    .birthday(LocalDate.parse("1996-10-10"))
-                    .educationLevel(EducationLevel.NKA)
-                    .isDriver(true)
-                    .isPilot(false);
-
-    public EmployeeServiceTest() throws PersistenceException {
-        when(employeePersistence.add(any())).thenReturn(1L);
-    }
-
-    @Test
-    public void testAddValidEmployee() throws ServiceException, InvalidEmployeeException {
-
-        Employee employee = employeeBuilder.build();
-        Assert.assertThat(employeeService.add(employee), is(1L));
-    }
-
-    @Test(expected = InvalidEmployeeException.class)
-    public void testAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
-
-        Employee employee = employeeBuilder.name("").build();
-        employeeService.add(employee);
-    }
-
-    @Test
-    public void testUpdateValidEmployee() throws ElementNotFoundException, PersistenceException {
-
-        Employee employee = employeeBuilder.build();
-        employeePersistence.update(employee);
-    }
-
-    @Test(expected = ElementNotFoundException.class)
-    public void testUpdateNonExistentEmployee()
-            throws ElementNotFoundException, PersistenceException {
-
-        doThrow(ElementNotFoundException.class).when(employeePersistence).update(any());
-        Employee employee = employeeBuilder.id(1000).build();
-        employeePersistence.update(employee);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceIntegrationTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceIntegrationTest.java
deleted file mode 100644
index 1928eff..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceIntegrationTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import static org.junit.Assert.assertEquals;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import java.util.Set;
-import org.dbunit.Assertion;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.ITable;
-import org.junit.Test;
-
-public class OperationServiceIntegrationTest extends JdbcTestCase {
-
-    private OperationService operationService;
-
-    private Operation o;
-
-    public OperationServiceIntegrationTest() throws PersistenceException {
-        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
-        RegistrationDAO registrationDAO =
-                new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
-        VehicleDAO vehicleDAO =
-                new VehicleDatabaseDAO(
-                        getJdbcConnectionManager(), (RegistrationDatabaseDAO) registrationDAO);
-        OperationDAO operationDAO =
-                new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO);
-
-        VehicleService vehicleService = new VehicleServiceImpl(vehicleDAO);
-
-        operationService = new OperationServiceImpl(operationDAO, vehicleDAO, vehicleService);
-
-        Vehicle v1 =
-                Vehicle.builder()
-                        .id(1)
-                        .name("RTW-1")
-                        .constructionType(Vehicle.ConstructionType.HOCHDACH)
-                        .type(Vehicle.VehicleType.RTW)
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .hasNef(true)
-                        .build();
-
-        Vehicle v2 = v1.toBuilder().id(2).build();
-        Vehicle v3 = v1.toBuilder().id(3).build();
-
-        o =
-                Operation.builder()
-                        .opCode("RD-2B0M")
-                        .status(Status.ACTIVE)
-                        .vehicles(Set.of(v1, v2, v3))
-                        .destination("New destination")
-                        .additionalInfo("New information")
-                        .build();
-    }
-
-    @Override
-    protected IDataSet getDataSet() throws Exception {
-        return getDataSet("operationDAOUpdateSetup.xml");
-    }
-
-    @Test
-    public void addValidOperation() throws Exception {
-
-        long id = operationService.add(o);
-        assertEquals(2, id);
-
-        String tableName = "Operation";
-        String[] excludedColumns = new String[] {"created"};
-
-        ITable actual =
-                Helper.getActualFilteredTableData(getConnection(), tableName, excludedColumns);
-        ITable expected =
-                Helper.getExpectedFilteredTableData(
-                        tableName, excludedColumns, "operationDAOAddOperation.xml");
-
-        Assertion.assertEquals(expected, actual);
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void addInvalidOperation() throws InvalidOperationException, ServiceException {
-        operationService.add(o.toBuilder().opCode("").build());
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
deleted file mode 100644
index 67fb77d..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class OperationServiceTest {
-
-    @Mock private OperationDAO operationDAO;
-
-    @Mock private VehicleDAO vehicleDAO;
-
-    @InjectMocks private OperationServiceImpl operationService;
-
-    private Set<Vehicle> vehicles;
-    private Vehicle v1, v2, v3, v4, v5;
-    private Operation baseOp, o1, o2;
-
-    @Before
-    public void setUp() throws Exception {
-        v1 =
-                Vehicle.builder()
-                        .id(1)
-                        .name("RTW-1")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(Vehicle.VehicleType.RTW)
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .hasNef(true)
-                        .build();
-
-        v2 =
-                Vehicle.builder()
-                        .id(2)
-                        .name("KTW-1")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(Vehicle.VehicleType.KTW)
-                        .status(Vehicle.Status.FREI_WACHE)
-                        .hasNef(true)
-                        .build();
-
-        v3 =
-                Vehicle.builder()
-                        .id(3)
-                        .name("KTW-2")
-                        .constructionType(ConstructionType.MITTELHOCHDACH)
-                        .type(Vehicle.VehicleType.KTW_B)
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .hasNef(false)
-                        .build();
-
-        v4 =
-                Vehicle.builder()
-                        .id(4)
-                        .name("BKTW-2")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(Vehicle.VehicleType.BKTW)
-                        .status(Vehicle.Status.FREI_FUNK)
-                        .hasNef(false)
-                        .build();
-
-        v5 =
-                Vehicle.builder()
-                        .id(5)
-                        .name("NEF-1")
-                        .constructionType(ConstructionType.NORMAL)
-                        .type(Vehicle.VehicleType.NEF)
-                        .status(Vehicle.Status.FREI_WACHE)
-                        .hasNef(true)
-                        .build();
-
-        Vehicle v6 =
-                Vehicle.builder()
-                        .id(6)
-                        .name("NAH-1")
-                        .constructionType(ConstructionType.MITTELHOCHDACH)
-                        .type(Vehicle.VehicleType.NAH)
-                        .status(Vehicle.Status.ABGEMELDET)
-                        .hasNef(true)
-                        .build();
-
-        vehicles = Set.of(v1, v2, v3, v4, v5, v6);
-
-        baseOp =
-                Operation.builder()
-                        .opCode("ALP-95E7")
-                        .severity(Severity.E)
-                        .status(Status.ACTIVE)
-                        .vehicles(Collections.singleton(v1))
-                        .destination("Wiedner Hauptstraße 35, Wien")
-                        .build();
-
-        o1 = baseOp.toBuilder().id(1).created(Instant.now()).build();
-        o2 = o1.toBuilder().id(5).status(Status.CANCELLED).build();
-
-        when(operationDAO.get(anyLong()))
-                .thenAnswer(
-                        ans -> {
-                            long arg = ans.getArgument(0);
-                            if (arg == 1L) return o1;
-                            else if (arg == 5L) return o2;
-                            else throw new ElementNotFoundException("");
-                        });
-
-        when(vehicleDAO.get(anyLong()))
-                .thenAnswer(
-                        ans -> {
-                            int arg = ((Long) ans.getArgument(0)).intValue();
-                            return vehicles.stream()
-                                    .filter(v -> v.id() == arg)
-                                    .findFirst()
-                                    .orElseThrow(() -> new ElementNotFoundException(""));
-                        });
-    }
-
-    @Test
-    public void requestNormal() throws Exception {
-        Set<Long> vehicleIds = Set.of(2L, 3L, 4L, 5L);
-        operationService.requestVehicles(1, vehicleIds);
-
-        Operation result =
-                operationDAO.get(1).toBuilder().vehicles(Set.of(v1, v2, v3, v4, v5)).build();
-        verify(operationDAO, times(1)).update(result);
-        verify(operationDAO, times(0)).get(6L);
-    }
-
-    @Test
-    public void requestExistingVehicle() throws Exception {
-        operationService.requestVehicles(1, Set.of(1L));
-
-        Operation result = operationDAO.get(1);
-        verify(operationDAO, times(0)).update(result);
-    }
-
-    @Test(expected = InvalidVehicleException.class)
-    public void requestInvalidVehicle() throws Exception {
-        operationService.requestVehicles(1, Set.of(5L, 6L));
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void requestInvalidOperation() throws Exception {
-        operationService.requestVehicles(2, Set.of(1L));
-    }
-
-    @Test(expected = InvalidVehicleException.class)
-    public void requestInactiveVehicle() throws Exception {
-        operationService.requestVehicles(1, Set.of(6L));
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void requestInactiveOperation() throws Exception {
-        operationService.requestVehicles(5, Set.of(1L));
-    }
-
-    @Test
-    public void addOperation() throws Exception {
-        operationService.add(baseOp.toBuilder().severity(null).build());
-
-        verify(operationDAO, times(1))
-                .add(baseOp.toBuilder().created(any()).status(Status.ACTIVE).build());
-        verify(vehicleDAO, times(1)).get(v1.id());
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void addWithSeverity() throws Exception {
-        operationService.add(baseOp.toBuilder().severity(Severity.E).build());
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void addWithoutVehicles() throws Exception {
-        operationService.add(baseOp.toBuilder().vehicles(Set.of()).build());
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void addInvalidOpcode() throws Exception {
-        operationService.add(baseOp.toBuilder().opCode("ABC").build());
-    }
-
-    @Test(expected = InvalidOperationException.class)
-    public void addWithSetCreated() throws Exception {
-        operationService.add(baseOp.toBuilder().created(Instant.now()).build());
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceIntegrationTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceIntegrationTest.java
deleted file mode 100644
index 51b7621..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceIntegrationTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDatabaseDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
-import org.dbunit.dataset.IDataSet;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class RegistrationServiceIntegrationTest extends JdbcTestCase {
-
-    private RegistrationDAO registrationDAO;
-    private VehicleDAO vehicleDAO;
-
-    @Rule public ExpectedException thrown = ExpectedException.none();
-
-    @Override
-    protected IDataSet getDataSet() throws Exception {
-        return getDataSet("registrationTestBaseData.xml");
-    }
-
-    @Before
-    public void prepare() throws PersistenceException {
-
-        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
-        registrationDAO = new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
-        vehicleDAO =
-                new VehicleDatabaseDAO(
-                        getJdbcConnectionManager(), (RegistrationDatabaseDAO) registrationDAO);
-    }
-
-    @Test
-    public void addValidRegistrationsShouldSucceed()
-            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
-        RegistrationServiceTest.addValidRegistrations(registrationDAO, vehicleDAO);
-    }
-
-    @Test
-    public void addOnlyOnePersonToRTWShouldFail()
-            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
-        RegistrationServiceTest.addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO);
-    }
-
-    // TODO: also test real integration, e.g. add registration and delete afterwards (feedback)
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java
deleted file mode 100644
index c6af300..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Builder;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.temporal.ChronoUnit;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-public class RegistrationServiceTest {
-
-    @Mock private RegistrationDAO registrationDAO;
-
-    @Mock private VehicleDAO vehicleDAO;
-
-    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
-
-    @Rule public ExpectedException thrown = ExpectedException.none();
-
-    @Before
-    public void setUp() throws ElementNotFoundException, PersistenceException {
-        MockitoAnnotations.initMocks(this);
-        Builder b =
-                Vehicle.builder()
-                        .name("RTW-1")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .status(Status.ABGEMELDET)
-                        .type(VehicleType.RTW)
-                        .hasNef(true);
-        when(vehicleDAO.get(anyLong())).thenAnswer(ans -> b.id(ans.getArgument(0)).build());
-    }
-
-    @Test
-    public void addValidRegistrationsShouldSucceed()
-            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
-        addValidRegistrations(registrationDAO, vehicleDAO);
-    }
-
-    @Test
-    public void addOnlyOnePersonToRTWShouldFail()
-            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
-        addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO);
-    }
-
-    static void addValidRegistrations(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
-        RegistrationService registrationService =
-                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
-        Set<Registration> registrations = new HashSet<>();
-        Vehicle vehicle =
-                Vehicle.builder()
-                        .id(1)
-                        .name("RTW-1")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(VehicleType.RTW)
-                        .status(Status.ABGEMELDET)
-                        .hasNef(true)
-                        .build();
-        Employee employee1 =
-                Employee.builder()
-                        .id(1)
-                        .name("John Doe")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(true)
-                        .build();
-        Employee employee2 =
-                Employee.builder()
-                        .id(2)
-                        .name("Nick \"Kage\" Verily")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.NKV)
-                        .isDriver(true)
-                        .isPilot(false)
-                        .build();
-        Employee employee3 =
-                Employee.builder()
-                        .id(3)
-                        .name("Nicht Arzt")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.NA)
-                        .isDriver(false)
-                        .isPilot(false)
-                        .build();
-        Instant start = Instant.now();
-        Instant end = start.plus(8, ChronoUnit.HOURS);
-        Registration registration1 =
-                Registration.builder().start(start).end(end).employee(employee1).build();
-        Registration registration2 =
-                Registration.builder().start(start).end(end).employee(employee2).build();
-        Registration registration3 =
-                Registration.builder().start(start).end(end).employee(employee3).build();
-        registrations.add(registration1);
-        registrations.add(registration2);
-        registrations.add(registration3);
-        registrationService.add(vehicle.id(), registrations);
-    }
-
-    static void addOnlyOnePersonToRTW(
-            ExpectedException thrown, RegistrationDAO registrationDAO, VehicleDAO vehicleDAO)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
-        thrown.expect(InvalidRegistrationException.class);
-        RegistrationService registrationService =
-                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
-        Set<Registration> registrations = new HashSet<>();
-        Vehicle vehicle =
-                Vehicle.builder()
-                        .id(1)
-                        .name("RTW-1")
-                        .constructionType(ConstructionType.HOCHDACH)
-                        .type(VehicleType.RTW)
-                        .status(Status.ABGEMELDET)
-                        .hasNef(true)
-                        .build();
-        Employee employee =
-                Employee.builder()
-                        .id(1)
-                        .name("John Doe")
-                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
-                        .educationLevel(EducationLevel.RS)
-                        .isDriver(true)
-                        .isPilot(true)
-                        .build();
-        Registration registration =
-                Registration.builder()
-                        .start(Instant.MIN)
-                        .end(Instant.MAX)
-                        .employee(employee)
-                        .build();
-        registrations.add(registration);
-        registrationService.add(vehicle.id(), registrations);
-    }
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeControllerTest.java
new file mode 100644
index 0000000..2b0f793
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewEmployeeControllerTest.java
@@ -0,0 +1,87 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_SUCCESS;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
+import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
+import javafx.scene.control.DialogPane;
+import javafx.scene.input.MouseButton;
+import javafx.stage.Stage;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.testfx.api.FxToolkit;
+import org.testfx.robot.Motion;
+
+public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest {
+
+    private EmployeeService employeeService;
+
+    @Before
+    public void setup() throws Exception {
+        FxToolkit.registerPrimaryStage();
+        FxToolkit.setupApplication(GuiTestApplication.class, "createNewEmployee.fxml");
+        employeeService = GuiTestApplication.context.getBean(EmployeeService.class);
+    }
+
+    @After
+    public void cleanup() throws Exception {
+        FxToolkit.cleanupStages();
+    }
+
+    @Test
+    public void testClickAddValidEmployee() throws InvalidEmployeeException, ServiceException {
+
+        when(employeeService.add(any())).thenReturn(1L);
+
+        clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
+        write("Name");
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
+    }
+
+    @Test
+    public void testClickAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
+
+        when(employeeService.add(any())).thenThrow(InvalidEmployeeException.class);
+
+        moveTo("#inputName");
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
+    }
+
+    @Test
+    public void testClickAddEmployeeWithServiceException()
+            throws InvalidEmployeeException, ServiceException {
+
+        when(employeeService.add(any())).thenThrow(ServiceException.class);
+
+        clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
+        write("Test");
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewVehicleControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewVehicleControllerTest.java
new file mode 100644
index 0000000..282c50f
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateNewVehicleControllerTest.java
@@ -0,0 +1,81 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_SERVICE_EXCEPTION;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_SUCCESS;
+import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.ALERT_TITLE_VALIDATION_ERROR;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
+import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
+import javafx.scene.control.DialogPane;
+import javafx.scene.input.MouseButton;
+import javafx.stage.Stage;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.testfx.api.FxToolkit;
+import org.testfx.robot.Motion;
+
+public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest {
+
+    private VehicleService vehicleService;
+
+    @Before
+    public void setup() throws Exception {
+        FxToolkit.registerPrimaryStage();
+        FxToolkit.setupApplication(GuiTestApplication.class, "createCar.fxml");
+        vehicleService = GuiTestApplication.context.getBean(VehicleService.class);
+    }
+
+    @After
+    public void cleanup() throws Exception {
+        FxToolkit.cleanupStages();
+    }
+
+    @Test
+    public void testClickAddValidVehicle() throws ServiceException, InvalidVehicleException {
+
+        when(vehicleService.add(any())).thenReturn(1L);
+
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
+    }
+
+    @Test
+    public void testClickInvalidVehicleEx() throws ServiceException, InvalidVehicleException {
+
+        when(vehicleService.add(any())).thenThrow(InvalidVehicleException.class);
+
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
+    }
+
+    @Test
+    public void testClickInvalidServiceEx() throws ServiceException, InvalidVehicleException {
+
+        when(vehicleService.add(any())).thenThrow(ServiceException.class);
+
+        clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
+
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
+        Assert.assertNotNull(alertDialog);
+
+        DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
+        Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/GuiTestApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/GuiTestApplication.java
new file mode 100644
index 0000000..968141e
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/GuiTestApplication.java
@@ -0,0 +1,101 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import static org.mockito.Mockito.mock;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.EmployeeServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.RegistrationService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.RegistrationServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import java.lang.invoke.MethodHandles;
+import javafx.application.Application;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Component
+@ComponentScan("at.ac.tuwien.sepm.assignment.groupphase")
+public class GuiTestApplication extends Application {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    public static AnnotationConfigApplicationContext context;
+
+    @Configuration
+    public static class ContextConfiguration {
+
+        @Bean
+        @Primary
+        public EmployeeService employeeService() {
+            return mock(EmployeeServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public VehicleService vehicleService() {
+            return mock(VehicleServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public OperationService operationService() {
+            return mock(OperationServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public RegistrationService registrationService() {
+            return mock(RegistrationServiceImpl.class);
+        }
+    }
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        // setup application
+        primaryStage.setTitle("Test window");
+        primaryStage.setWidth(1366);
+        primaryStage.setHeight(768);
+        primaryStage.centerOnScreen();
+        primaryStage.setOnCloseRequest(event -> LOG.debug("Application shutdown initiated"));
+
+        if (getParameters().getRaw().size() < 1) {
+            throw new UnsupportedOperationException("FXML file not set");
+        }
+
+        context = new AnnotationConfigApplicationContext(GuiTestApplication.class);
+        final var fxmlLoader = context.getBean(SpringFXMLLoader.class);
+        primaryStage.setScene(
+                new Scene(
+                        (Parent)
+                                fxmlLoader.load(
+                                        getClass()
+                                                .getResourceAsStream(
+                                                        "/fxml/"
+                                                                + getParameters()
+                                                                        .getRaw()
+                                                                        .get(0)))));
+
+        // show application
+        primaryStage.show();
+        primaryStage.toFront();
+        LOG.debug("Application startup complete");
+    }
+
+    @Override
+    public void stop() {
+        LOG.debug("Stopping application");
+        context.close();
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationControllerTest.java
new file mode 100644
index 0000000..97fb0e7
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationControllerTest.java
@@ -0,0 +1,22 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
+import org.junit.After;
+import org.junit.Before;
+import org.testfx.api.FxToolkit;
+
+public class RegistrationControllerTest extends HighDpiAwareApplicationTest {
+
+    @Before
+    public void setup() throws Exception {
+        FxToolkit.registerPrimaryStage();
+        FxToolkit.setupApplication(GuiTestApplication.class, "RegistrationWindow.fxml");
+    }
+
+    @After
+    public void cleanup() throws Exception {
+        FxToolkit.cleanupStages();
+    }
+
+    // TODO: implement GUI Tests
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAOTest.java
new file mode 100644
index 0000000..8485f67
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/EmployeeDAOTest.java
@@ -0,0 +1,253 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import java.io.InputStream;
+import java.time.LocalDate;
+import java.util.Set;
+import org.dbunit.Assertion;
+import org.dbunit.dataset.DataSetException;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.ITable;
+import org.dbunit.dataset.filter.DefaultColumnFilter;
+import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
+import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EmployeeDAOTest extends JdbcTestCase {
+
+    private EmployeeDAO employeePersistence;
+
+    public EmployeeDAOTest() {
+        employeePersistence = new EmployeeDatabaseDAO(getJdbcConnectionManager());
+    }
+
+    @Override
+    protected IDataSet getDataSet() throws DataSetException {
+        InputStream res =
+                getClass()
+                        .getClassLoader()
+                        .getResourceAsStream("EmployeePersistenceTestBaseData.xml");
+        return new FlatXmlDataSetBuilder().build(res);
+    }
+
+    @Test
+    public void testListEmployees() throws PersistenceException {
+        Set<Employee> employees = employeePersistence.list();
+
+        Employee empOne =
+                Employee.builder()
+                        .id(1)
+                        .name("Adam")
+                        .birthday(LocalDate.parse("2010-10-10"))
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(false)
+                        .build();
+
+        Employee empTwo =
+                Employee.builder()
+                        .id(2)
+                        .name("Max")
+                        .birthday(LocalDate.parse("1990-11-11"))
+                        .educationLevel(EducationLevel.NFS)
+                        .isDriver(false)
+                        .isPilot(false)
+                        .build();
+
+        Employee empThree =
+                Employee.builder()
+                        .id(3)
+                        .name("Lisa")
+                        .birthday(LocalDate.parse("1999-10-16"))
+                        .educationLevel(EducationLevel.NKI)
+                        .isDriver(true)
+                        .isPilot(false)
+                        .build();
+
+        Assert.assertTrue(employees.contains(empOne));
+        Assert.assertTrue(employees.contains(empTwo));
+        Assert.assertTrue(employees.contains(empThree));
+        Assert.assertEquals(3, employees.size());
+    }
+
+    @Test
+    public void testEmployeeListNoElement() throws PersistenceException {
+        Set<Employee> employees = employeePersistence.list();
+
+        Employee empOne =
+                Employee.builder()
+                        .id(10)
+                        .name("Adam")
+                        .birthday(LocalDate.parse("2010-10-10"))
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(false)
+                        .build();
+
+        Assert.assertFalse(employees.contains(empOne));
+    }
+
+    Employee validEmployee =
+            Employee.builder()
+                    .name("Testperson")
+                    .birthday(LocalDate.parse("2010-11-11"))
+                    .educationLevel(EducationLevel.NA)
+                    .isDriver(true)
+                    .isPilot(false)
+                    .build();
+
+    @Test
+    public void testAddValidEmployee_EmployeeVersion() throws Exception {
+
+        employeePersistence.add(validEmployee);
+
+        String[] excludedColumnsEmployeeVersion = new String[] {"ID"};
+        String tableEmployeeVersion = "EMPLOYEEVERSION";
+
+        // load actual and expected data set
+        IDataSet actualDataSet = getConnection().createDataSet();
+        IDataSet expectedDataSet =
+                new FlatXmlDataFileLoader().load("/testAddValidEmployee_expected.xml");
+
+        // extract employeeVersion table
+        ITable actualEmployeeVersionTable = actualDataSet.getTable(tableEmployeeVersion);
+        ITable expectedEmployeeVersionTable = expectedDataSet.getTable(tableEmployeeVersion);
+
+        // exclude 'id' column as it is an autogenerated value
+        ITable actualFilteredTable =
+                DefaultColumnFilter.excludedColumnsTable(
+                        actualEmployeeVersionTable, excludedColumnsEmployeeVersion);
+        ITable expectedFilteredTable =
+                DefaultColumnFilter.excludedColumnsTable(
+                        expectedEmployeeVersionTable, excludedColumnsEmployeeVersion);
+
+        Assertion.assertEquals(expectedFilteredTable, actualFilteredTable);
+    }
+
+    @Test
+    public void testAddValidEmployee_Employee() throws Exception {
+
+        employeePersistence.add(validEmployee);
+
+        String[] excludedColumnsEmployee = new String[] {"VERSION", "ID"};
+        String tableEmployee = "EMPLOYEE";
+
+        // load actual and expected data set
+        IDataSet actualDataSet = getConnection().createDataSet();
+        IDataSet expectedDataSet =
+                new FlatXmlDataFileLoader().load("/testAddValidEmployee_expected.xml");
+
+        // extract employee table
+        ITable actualEmployeeTable = actualDataSet.getTable(tableEmployee);
+        ITable expectedEmployeeTable = expectedDataSet.getTable(tableEmployee);
+
+        // exclude 'version' as it is an autogenerated value
+        ITable actualFilteredEmpTable =
+                DefaultColumnFilter.excludedColumnsTable(
+                        actualEmployeeTable, excludedColumnsEmployee);
+        ITable expectedFilteredEmpTable =
+                DefaultColumnFilter.excludedColumnsTable(
+                        expectedEmployeeTable, excludedColumnsEmployee);
+
+        Assertion.assertEquals(expectedFilteredEmpTable, actualFilteredEmpTable);
+    }
+
+    @Test
+    public void testAddValidEmployee_Join() throws Exception {
+
+        employeePersistence.add(validEmployee);
+
+        String[] excludedColumns = new String[] {"E_VERSION", "V_ID", "E_ID"};
+        String table = "EMP_JOIN";
+        String expectedXmlDataFileName = "testAddValidEmployeeJoin_expected.xml";
+
+        String sqlJoinEmployeeVersion =
+                "SELECT e.id AS E_ID, v.name AS V_NAME, v.birthday AS V_BIRTHDAY, "
+                        + "v.educationLevel as V_EDUCATIONLEVEL, "
+                        + "v.isDriver AS V_ISDRIVER, v.isPilot AS V_ISPILOT "
+                        + "FROM Employee e "
+                        + "JOIN EmployeeVersion v ON e.version = v.id";
+
+        ITable actualFilteredJoinData =
+                Helper.getActualFilteredQueryTableData(
+                        getConnection(), table, sqlJoinEmployeeVersion, excludedColumns);
+
+        ITable expectedFilteredJoinData =
+                Helper.getExpectedFilteredTableData(
+                        table, excludedColumns, expectedXmlDataFileName);
+
+        Assertion.assertEquals(expectedFilteredJoinData, actualFilteredJoinData);
+    }
+
+    Employee validUpdateEmployee =
+            Employee.builder()
+                    .id(3)
+                    .name("Lisa")
+                    .birthday(LocalDate.parse("1999-10-16"))
+                    .educationLevel(EducationLevel.NKA)
+                    .isDriver(true)
+                    .isPilot(true)
+                    .build();
+
+    @Test
+    public void testUpdateValidEmployee_EmployeeVersion() throws Exception {
+
+        employeePersistence.update(validUpdateEmployee);
+
+        String[] excludedColumnsEmployeeVersion = new String[] {"ID"};
+        String tableEmployeeVersion = "EMPLOYEEVERSION";
+
+        ITable actualTableData =
+                Helper.getActualFilteredTableData(
+                        getConnection(), tableEmployeeVersion, excludedColumnsEmployeeVersion);
+        ITable expedtedTableData =
+                Helper.getExpectedFilteredTableData(
+                        tableEmployeeVersion,
+                        excludedColumnsEmployeeVersion,
+                        "testUpdateValidEmployee_expected.xml");
+
+        Assertion.assertEquals(expedtedTableData, actualTableData);
+    }
+
+    @Test
+    public void testUpdateValidEmployee_Employee() throws Exception {
+
+        employeePersistence.update(validUpdateEmployee);
+
+        String[] excludedColumns = new String[] {"VERSION"};
+        String tableName = "EMPLOYEE";
+        String expectedXmlDataFileName = "testUpdateValidEmployee_expected.xml";
+
+        ITable actualTableData =
+                Helper.getActualFilteredTableData(getConnection(), tableName, excludedColumns);
+
+        ITable expectedTableData =
+                Helper.getExpectedFilteredTableData(
+                        tableName, excludedColumns, expectedXmlDataFileName);
+
+        Assertion.assertEquals(expectedTableData, actualTableData);
+    }
+
+    @Test(expected = ElementNotFoundException.class)
+    public void testUpdateNonExistingEmployee()
+            throws PersistenceException, ElementNotFoundException {
+
+        Employee nonExistentEmployee =
+                Employee.builder()
+                        .id(1000)
+                        .name("Lisa")
+                        .birthday(LocalDate.parse("1999-10-16"))
+                        .educationLevel(EducationLevel.NKA)
+                        .isDriver(true)
+                        .isPilot(true)
+                        .build();
+
+        employeePersistence.update(nonExistentEmployee);
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java
new file mode 100644
index 0000000..a4a0829
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java
@@ -0,0 +1,197 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import static org.junit.Assert.assertEquals;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.TimeZone;
+import org.dbunit.dataset.DataSetException;
+import org.dbunit.dataset.IDataSet;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class OperationDAOTest extends JdbcTestCase {
+
+    private static final String[] COMPARE_TABLES =
+            new String[] {"VehicleOperation", "Operation", "Vehicle", "VehicleVersion"};
+
+    private final OperationDAO operationDAO;
+
+    private final Operation o;
+
+    private final Operation originalOperation;
+
+    public OperationDAOTest() throws PersistenceException {
+        // TODO: fix once everything properly uses dependency injection
+        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
+        RegistrationDatabaseDAO registrationDatabaseDAO =
+                new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
+        VehicleDAO vehicleDAO =
+                new VehicleDatabaseDAO(getJdbcConnectionManager(), registrationDatabaseDAO);
+        this.operationDAO = new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO);
+
+        Vehicle v1 =
+                Vehicle.builder()
+                        .id(1)
+                        .name("RTW-1")
+                        .constructionType(Vehicle.ConstructionType.HOCHDACH)
+                        .type(Vehicle.VehicleType.RTW)
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .hasNef(true)
+                        .build();
+
+        Vehicle v2 = v1.toBuilder().id(2).build();
+        Vehicle v3 = v1.toBuilder().id(3).build();
+
+        o =
+                Operation.builder()
+                        .id(1)
+                        .opCode("RD-2B0M")
+                        .severity(Severity.B)
+                        .status(Status.ACTIVE)
+                        .vehicles(Set.of(v1, v2, v3))
+                        .created(Instant.ofEpochSecond(1514764800)) // 2018-01-01 00:00:00.0
+                        .destination("New destination")
+                        .additionalInfo("New information")
+                        .build();
+
+        Vehicle vehicle =
+                Vehicle.builder()
+                        .id(4)
+                        .name("BKTW-2")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(VehicleType.BKTW)
+                        .hasNef(false)
+                        .status(Vehicle.Status.ZUM_BERUFUNGSORT)
+                        .registrations(new LinkedList<>())
+                        .build();
+
+        originalOperation =
+                Operation.builder()
+                        .id(1)
+                        .opCode("ALP-95E7")
+                        .severity(Severity.E)
+                        .created(Instant.parse("2000-01-01T00:00:00.0Z"))
+                        .destination("Wiedner Hauptstraße 35, Wien")
+                        .additionalInfo("Additional information")
+                        .status(Status.ACTIVE)
+                        .vehicles(Set.of(vehicle))
+                        .build();
+    }
+
+    @BeforeClass
+    public static void before() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Override
+    protected IDataSet getDataSet() throws DataSetException {
+        return getDataSet("operationDAOUpdateSetup.xml");
+    }
+
+    @Test
+    public void testUpdateNormal() throws Exception {
+        operationDAO.update(o);
+
+        compareWith("operationDAOUpdateNormal.xml", COMPARE_TABLES);
+    }
+
+    @Test(expected = ElementNotFoundException.class)
+    public void testUpdateMissing() throws Exception {
+        Operation op = o.toBuilder().id(73).build();
+
+        operationDAO.update(op);
+    }
+
+    @Test
+    public void testUpdateRemoveVehicles() throws Exception {
+        Operation op = o.toBuilder().vehicles(Collections.emptySet()).build();
+
+        operationDAO.update(op);
+
+        compareWith("operationDAOUpdateRemoveVehicles.xml", COMPARE_TABLES);
+    }
+
+    @Test
+    public void testListOperations() throws Exception {
+        Set<Operation> operationSet = operationDAO.list(EnumSet.allOf(Status.class));
+
+        assertEquals(Set.of(originalOperation), operationSet);
+    }
+
+    @Test
+    public void testGetOperations() throws Exception {
+        Operation gotOperation = operationDAO.get(originalOperation.id());
+
+        assertEquals(originalOperation, gotOperation);
+    }
+
+    @Test
+    public void testAddOperation() throws Exception {
+        long id = operationDAO.add(o);
+        assertEquals(2, id);
+        compareWith("operationDAOAddOperation.xml", COMPARE_TABLES);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void testAddFaultyOperation() throws PersistenceException {
+        Vehicle vehicle =
+                Vehicle.builder()
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .name("BKTW_123")
+                        .hasNef(true)
+                        .type(VehicleType.BKTW)
+                        .build();
+
+        Operation operation =
+                Operation.builder()
+                        .status(Status.ACTIVE)
+                        .opCode(String.valueOf(Arrays.stream(new int[200]).map(i -> 'a')))
+                        .created(Instant.now())
+                        .destination("Wiedner Hauptstraße 35, Wien")
+                        .additionalInfo("HTU Wien")
+                        .severity(Severity.B)
+                        .vehicles(Set.of(vehicle))
+                        .build();
+        operationDAO.add(operation);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void testAddFaultyOperation2() throws PersistenceException {
+        Vehicle vehicle =
+                Vehicle.builder()
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .name("BKTW_123")
+                        .hasNef(true)
+                        .type(VehicleType.BKTW)
+                        .build();
+
+        Operation operation =
+                Operation.builder()
+                        .status(Status.ACTIVE)
+                        .opCode("ALP-95E7")
+                        .created(Instant.now())
+                        .destination(
+                                "Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien ")
+                        .additionalInfo("HTU Wien")
+                        .severity(Severity.B)
+                        .vehicles(Set.of(vehicle))
+                        .build();
+        operationDAO.add(operation);
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAOTest.java
new file mode 100644
index 0000000..6f7ee49
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/RegistrationDAOTest.java
@@ -0,0 +1,115 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import static org.junit.Assert.*;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.HashSet;
+import java.util.Set;
+import org.dbunit.dataset.IDataSet;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class RegistrationDAOTest extends JdbcTestCase {
+
+    private RegistrationDAO registrationDAO;
+
+    public RegistrationDAOTest() throws PersistenceException {
+        this.registrationDAO =
+                new RegistrationDatabaseDAO(
+                        getJdbcConnectionManager(),
+                        new EmployeeDatabaseDAO(getJdbcConnectionManager()));
+    }
+
+    @Override
+    protected IDataSet getDataSet() throws Exception {
+        return getDataSet("registrationTestBaseData.xml");
+    }
+
+    @Rule public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void addRegistrationsShouldSucceed() throws PersistenceException {
+        Set<Registration> registrations = new HashSet<>();
+        Employee employee1 =
+                Employee.builder()
+                        .id(1)
+                        .name("John Doe")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(true)
+                        .build();
+        Employee employee2 =
+                Employee.builder()
+                        .id(2)
+                        .name("Nick \"Kage\" Verily")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.NKV)
+                        .isDriver(true)
+                        .isPilot(false)
+                        .build();
+        Employee employee3 =
+                Employee.builder()
+                        .id(3)
+                        .name("Nicht Arzt")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.NA)
+                        .isDriver(false)
+                        .isPilot(false)
+                        .build();
+        Registration registration1 =
+                Registration.builder()
+                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
+                        .end(Instant.now()) // same
+                        .employee(employee1)
+                        .build();
+        Registration registration2 =
+                Registration.builder()
+                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
+                        .end(Instant.now()) // same
+                        .employee(employee2)
+                        .build();
+        Registration registration3 =
+                Registration.builder()
+                        .start(Instant.now()) // incorrect, but should be irrelevant to outcome
+                        .end(Instant.now()) // same
+                        .employee(employee3)
+                        .build();
+        registrations.add(registration1);
+        registrations.add(registration2);
+        registrations.add(registration3);
+
+        Set<Long> returnvalues = registrationDAO.add(1, registrations);
+        assertFalse(returnvalues.isEmpty()); // can be improved...
+    }
+
+    @Test
+    public void addRegistrationToInexistentVehicleShouldFail() throws PersistenceException {
+        thrown.expect(PersistenceException.class);
+        Set<Registration> registrations = new HashSet<>();
+        Employee employee =
+                Employee.builder()
+                        .id(1)
+                        .name("John Doe")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(true)
+                        .build();
+        Registration registration =
+                Registration.builder()
+                        .start(Instant.now())
+                        .end(Instant.now())
+                        .employee(employee)
+                        .build();
+        registrations.add(registration);
+        registrationDAO.add(200, registrations);
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAOTest.java
new file mode 100644
index 0000000..294ce10
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/VehicleDAOTest.java
@@ -0,0 +1,161 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Set;
+import org.dbunit.Assertion;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.ITable;
+import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class VehicleDAOTest extends JdbcTestCase {
+
+    private VehicleDAO vehicleDAO;
+
+    private Vehicle validUpdateVehicle =
+            Vehicle.builder()
+                    .hasNef(true)
+                    .constructionType(ConstructionType.HOCHDACH)
+                    .type(VehicleType.RTW)
+                    .id(2)
+                    .name("RTW-2")
+                    .status(Status.ABGEMELDET)
+                    .build();
+
+    public VehicleDAOTest() throws PersistenceException {
+        vehicleDAO =
+                new VehicleDatabaseDAO(
+                        getJdbcConnectionManager(),
+                        new RegistrationDatabaseDAO(
+                                getJdbcConnectionManager(),
+                                new EmployeeDatabaseDAO(getJdbcConnectionManager())));
+        // TODO: use Spring Dependency Injection!
+    }
+
+    @Override
+    protected IDataSet getDataSet() throws Exception {
+        InputStream res = getClass().getClassLoader().getResourceAsStream("vehicleTestData.xml");
+        return new FlatXmlDataSetBuilder().build(res);
+    }
+
+    @Test
+    public void testListVehicle() throws PersistenceException {
+        Set<Vehicle> vehicles = vehicleDAO.list();
+
+        Vehicle v1 =
+                Vehicle.builder()
+                        .id(1)
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .name("RTW-1")
+                        .hasNef(true)
+                        .status(Status.ABGEMELDET)
+                        .type(VehicleType.RTW)
+                        .registrations(new ArrayList<>())
+                        .build();
+        Vehicle v2 =
+                Vehicle.builder()
+                        .id(2)
+                        .constructionType(ConstructionType.MITTELHOCHDACH)
+                        .name("KTW-2")
+                        .hasNef(false)
+                        .status(Status.FREI_WACHE)
+                        .type(VehicleType.KTW)
+                        .registrations(new ArrayList<>())
+                        .build();
+        Vehicle v3 =
+                Vehicle.builder()
+                        .id(3)
+                        .constructionType(ConstructionType.NORMAL)
+                        .name("NEF-3")
+                        .hasNef(false)
+                        .status(Status.FREI_FUNK)
+                        .type(VehicleType.NEF)
+                        .registrations(new ArrayList<>())
+                        .build();
+
+        Assert.assertTrue(vehicles.contains(v1));
+        Assert.assertTrue(vehicles.contains(v2));
+        Assert.assertTrue(vehicles.contains(v3));
+        Assert.assertEquals(3, vehicles.size());
+    }
+
+    @Test
+    public void testVehicleListNoElement() throws PersistenceException {
+        Set<Vehicle> vehicles = vehicleDAO.list();
+
+        Vehicle v1 =
+                Vehicle.builder()
+                        .id(30)
+                        .constructionType(ConstructionType.NORMAL)
+                        .name("NEF-3")
+                        .hasNef(false)
+                        .status(Status.FREI_FUNK)
+                        .type(VehicleType.NEF)
+                        .build();
+
+        Assert.assertFalse(vehicles.contains(v1));
+    }
+
+    @Test
+    public void testUpdateValid_VehicleVersion() throws Exception {
+        vehicleDAO.update(validUpdateVehicle);
+
+        String[] excludedColumnsVehicleVersion = new String[] {"ID", "NAME"};
+        String tableVehicleVersion = "VEHICLEVERSION";
+
+        ITable actualTableData =
+                Helper.getActualFilteredTableData(
+                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
+
+        ITable expectedTableData =
+                Helper.getExpectedFilteredTableData(
+                        tableVehicleVersion,
+                        excludedColumnsVehicleVersion,
+                        "vehicleTestUpdateExpectedData.xml");
+        Assertion.assertEquals(expectedTableData, actualTableData);
+    }
+
+    @Test
+    public void testUpdateValid_Vehicle() throws Exception {
+        vehicleDAO.update(validUpdateVehicle);
+
+        String[] excludedColumnsVehicleVersion = new String[] {"VERSION", "STATUS"};
+        String tableVehicleVersion = "VEHICLE";
+
+        ITable actualTableData =
+                Helper.getActualFilteredTableData(
+                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
+
+        ITable expectedTableData =
+                Helper.getExpectedFilteredTableData(
+                        tableVehicleVersion,
+                        excludedColumnsVehicleVersion,
+                        "vehicleTestUpdateExpectedData.xml");
+        Assertion.assertEquals(expectedTableData, actualTableData);
+    }
+
+    @Test(expected = ElementNotFoundException.class)
+    public void testUpdateNonExistingVehicle()
+            throws PersistenceException, ElementNotFoundException {
+        Vehicle nonExistentVehicle =
+                Vehicle.builder()
+                        .id(35)
+                        .constructionType(ConstructionType.NORMAL)
+                        .name("NEF-3")
+                        .hasNef(false)
+                        .status(Status.FREI_FUNK)
+                        .type(VehicleType.NEF)
+                        .build();
+        vehicleDAO.update(nonExistentVehicle);
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceTest.java
new file mode 100644
index 0000000..7a16d3e
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/EmployeeServiceTest.java
@@ -0,0 +1,67 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.time.LocalDate;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EmployeeServiceTest {
+
+    private final EmployeeDAO employeePersistence = mock(EmployeeDatabaseDAO.class);
+    private final EmployeeService employeeService = new EmployeeServiceImpl(employeePersistence);
+
+    private final Employee.Builder employeeBuilder =
+            Employee.builder()
+                    .name("Testperson")
+                    .birthday(LocalDate.parse("1996-10-10"))
+                    .educationLevel(EducationLevel.NKA)
+                    .isDriver(true)
+                    .isPilot(false);
+
+    public EmployeeServiceTest() throws PersistenceException {
+        when(employeePersistence.add(any())).thenReturn(1L);
+    }
+
+    @Test
+    public void testAddValidEmployee() throws ServiceException, InvalidEmployeeException {
+
+        Employee employee = employeeBuilder.build();
+        Assert.assertThat(employeeService.add(employee), is(1L));
+    }
+
+    @Test(expected = InvalidEmployeeException.class)
+    public void testAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
+
+        Employee employee = employeeBuilder.name("").build();
+        employeeService.add(employee);
+    }
+
+    @Test
+    public void testUpdateValidEmployee() throws ElementNotFoundException, PersistenceException {
+
+        Employee employee = employeeBuilder.build();
+        employeePersistence.update(employee);
+    }
+
+    @Test(expected = ElementNotFoundException.class)
+    public void testUpdateNonExistentEmployee()
+            throws ElementNotFoundException, PersistenceException {
+
+        doThrow(ElementNotFoundException.class).when(employeePersistence).update(any());
+        Employee employee = employeeBuilder.id(1000).build();
+        employeePersistence.update(employee);
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceIntegrationTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceIntegrationTest.java
new file mode 100644
index 0000000..e380850
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceIntegrationTest.java
@@ -0,0 +1,97 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import static org.junit.Assert.assertEquals;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.OperationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.OperationDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import java.util.Set;
+import org.dbunit.Assertion;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.ITable;
+import org.junit.Test;
+
+public class OperationServiceIntegrationTest extends JdbcTestCase {
+
+    private OperationService operationService;
+
+    private Operation o;
+
+    public OperationServiceIntegrationTest() throws PersistenceException {
+        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
+        RegistrationDAO registrationDAO =
+                new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
+        VehicleDAO vehicleDAO =
+                new VehicleDatabaseDAO(
+                        getJdbcConnectionManager(), (RegistrationDatabaseDAO) registrationDAO);
+        OperationDAO operationDAO =
+                new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO);
+
+        VehicleService vehicleService = new VehicleServiceImpl(vehicleDAO);
+
+        operationService = new OperationServiceImpl(operationDAO, vehicleDAO, vehicleService);
+
+        Vehicle v1 =
+                Vehicle.builder()
+                        .id(1)
+                        .name("RTW-1")
+                        .constructionType(Vehicle.ConstructionType.HOCHDACH)
+                        .type(Vehicle.VehicleType.RTW)
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .hasNef(true)
+                        .build();
+
+        Vehicle v2 = v1.toBuilder().id(2).build();
+        Vehicle v3 = v1.toBuilder().id(3).build();
+
+        o =
+                Operation.builder()
+                        .opCode("RD-2B0M")
+                        .status(Status.ACTIVE)
+                        .vehicles(Set.of(v1, v2, v3))
+                        .destination("New destination")
+                        .additionalInfo("New information")
+                        .build();
+    }
+
+    @Override
+    protected IDataSet getDataSet() throws Exception {
+        return getDataSet("operationDAOUpdateSetup.xml");
+    }
+
+    @Test
+    public void addValidOperation() throws Exception {
+
+        long id = operationService.add(o);
+        assertEquals(2, id);
+
+        String tableName = "Operation";
+        String[] excludedColumns = new String[] {"created"};
+
+        ITable actual =
+                Helper.getActualFilteredTableData(getConnection(), tableName, excludedColumns);
+        ITable expected =
+                Helper.getExpectedFilteredTableData(
+                        tableName, excludedColumns, "operationDAOAddOperation.xml");
+
+        Assertion.assertEquals(expected, actual);
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void addInvalidOperation() throws InvalidOperationException, ServiceException {
+        operationService.add(o.toBuilder().opCode("").build());
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceTest.java
new file mode 100644
index 0000000..c232e78
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/OperationServiceTest.java
@@ -0,0 +1,205 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.OperationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class OperationServiceTest {
+
+    @Mock private OperationDAO operationDAO;
+
+    @Mock private VehicleDAO vehicleDAO;
+
+    @InjectMocks private OperationServiceImpl operationService;
+
+    private Set<Vehicle> vehicles;
+    private Vehicle v1, v2, v3, v4, v5;
+    private Operation baseOp, o1, o2;
+
+    @Before
+    public void setUp() throws Exception {
+        v1 =
+                Vehicle.builder()
+                        .id(1)
+                        .name("RTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(Vehicle.VehicleType.RTW)
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .hasNef(true)
+                        .build();
+
+        v2 =
+                Vehicle.builder()
+                        .id(2)
+                        .name("KTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(Vehicle.VehicleType.KTW)
+                        .status(Vehicle.Status.FREI_WACHE)
+                        .hasNef(true)
+                        .build();
+
+        v3 =
+                Vehicle.builder()
+                        .id(3)
+                        .name("KTW-2")
+                        .constructionType(ConstructionType.MITTELHOCHDACH)
+                        .type(Vehicle.VehicleType.KTW_B)
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .hasNef(false)
+                        .build();
+
+        v4 =
+                Vehicle.builder()
+                        .id(4)
+                        .name("BKTW-2")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(Vehicle.VehicleType.BKTW)
+                        .status(Vehicle.Status.FREI_FUNK)
+                        .hasNef(false)
+                        .build();
+
+        v5 =
+                Vehicle.builder()
+                        .id(5)
+                        .name("NEF-1")
+                        .constructionType(ConstructionType.NORMAL)
+                        .type(Vehicle.VehicleType.NEF)
+                        .status(Vehicle.Status.FREI_WACHE)
+                        .hasNef(true)
+                        .build();
+
+        Vehicle v6 =
+                Vehicle.builder()
+                        .id(6)
+                        .name("NAH-1")
+                        .constructionType(ConstructionType.MITTELHOCHDACH)
+                        .type(Vehicle.VehicleType.NAH)
+                        .status(Vehicle.Status.ABGEMELDET)
+                        .hasNef(true)
+                        .build();
+
+        vehicles = Set.of(v1, v2, v3, v4, v5, v6);
+
+        baseOp =
+                Operation.builder()
+                        .opCode("ALP-95E7")
+                        .severity(Severity.E)
+                        .status(Status.ACTIVE)
+                        .vehicles(Collections.singleton(v1))
+                        .destination("Wiedner Hauptstraße 35, Wien")
+                        .build();
+
+        o1 = baseOp.toBuilder().id(1).created(Instant.now()).build();
+        o2 = o1.toBuilder().id(5).status(Status.CANCELLED).build();
+
+        when(operationDAO.get(anyLong()))
+                .thenAnswer(
+                        ans -> {
+                            long arg = ans.getArgument(0);
+                            if (arg == 1L) return o1;
+                            else if (arg == 5L) return o2;
+                            else throw new ElementNotFoundException("");
+                        });
+
+        when(vehicleDAO.get(anyLong()))
+                .thenAnswer(
+                        ans -> {
+                            int arg = ((Long) ans.getArgument(0)).intValue();
+                            return vehicles.stream()
+                                    .filter(v -> v.id() == arg)
+                                    .findFirst()
+                                    .orElseThrow(() -> new ElementNotFoundException(""));
+                        });
+    }
+
+    @Test
+    public void requestNormal() throws Exception {
+        Set<Long> vehicleIds = Set.of(2L, 3L, 4L, 5L);
+        operationService.requestVehicles(1, vehicleIds);
+
+        Operation result =
+                operationDAO.get(1).toBuilder().vehicles(Set.of(v1, v2, v3, v4, v5)).build();
+        verify(operationDAO, times(1)).update(result);
+        verify(operationDAO, times(0)).get(6L);
+    }
+
+    @Test
+    public void requestExistingVehicle() throws Exception {
+        operationService.requestVehicles(1, Set.of(1L));
+
+        Operation result = operationDAO.get(1);
+        verify(operationDAO, times(0)).update(result);
+    }
+
+    @Test(expected = InvalidVehicleException.class)
+    public void requestInvalidVehicle() throws Exception {
+        operationService.requestVehicles(1, Set.of(5L, 6L));
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void requestInvalidOperation() throws Exception {
+        operationService.requestVehicles(2, Set.of(1L));
+    }
+
+    @Test(expected = InvalidVehicleException.class)
+    public void requestInactiveVehicle() throws Exception {
+        operationService.requestVehicles(1, Set.of(6L));
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void requestInactiveOperation() throws Exception {
+        operationService.requestVehicles(5, Set.of(1L));
+    }
+
+    @Test
+    public void addOperation() throws Exception {
+        operationService.add(baseOp.toBuilder().severity(null).build());
+
+        verify(operationDAO, times(1))
+                .add(baseOp.toBuilder().created(any()).status(Status.ACTIVE).build());
+        verify(vehicleDAO, times(1)).get(v1.id());
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void addWithSeverity() throws Exception {
+        operationService.add(baseOp.toBuilder().severity(Severity.E).build());
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void addWithoutVehicles() throws Exception {
+        operationService.add(baseOp.toBuilder().vehicles(Set.of()).build());
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void addInvalidOpcode() throws Exception {
+        operationService.add(baseOp.toBuilder().opCode("ABC").build());
+    }
+
+    @Test(expected = InvalidOperationException.class)
+    public void addWithSetCreated() throws Exception {
+        operationService.add(baseOp.toBuilder().created(Instant.now()).build());
+    }
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceIntegrationTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceIntegrationTest.java
new file mode 100644
index 0000000..bfe44aa
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceIntegrationTest.java
@@ -0,0 +1,55 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDatabaseDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
+import org.dbunit.dataset.IDataSet;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class RegistrationServiceIntegrationTest extends JdbcTestCase {
+
+    private RegistrationDAO registrationDAO;
+    private VehicleDAO vehicleDAO;
+
+    @Rule public ExpectedException thrown = ExpectedException.none();
+
+    @Override
+    protected IDataSet getDataSet() throws Exception {
+        return getDataSet("registrationTestBaseData.xml");
+    }
+
+    @Before
+    public void prepare() throws PersistenceException {
+
+        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
+        registrationDAO = new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
+        vehicleDAO =
+                new VehicleDatabaseDAO(
+                        getJdbcConnectionManager(), (RegistrationDatabaseDAO) registrationDAO);
+    }
+
+    @Test
+    public void addValidRegistrationsShouldSucceed()
+            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
+        RegistrationServiceTest.addValidRegistrations(registrationDAO, vehicleDAO);
+    }
+
+    @Test
+    public void addOnlyOnePersonToRTWShouldFail()
+            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
+        RegistrationServiceTest.addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO);
+    }
+
+    // TODO: also test real integration, e.g. add registration and delete afterwards (feedback)
+}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceTest.java
new file mode 100644
index 0000000..62982ac
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/service/RegistrationServiceTest.java
@@ -0,0 +1,159 @@
+package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.RegistrationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Builder;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+public class RegistrationServiceTest {
+
+    @Mock private RegistrationDAO registrationDAO;
+
+    @Mock private VehicleDAO vehicleDAO;
+
+    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
+
+    @Rule public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() throws ElementNotFoundException, PersistenceException {
+        MockitoAnnotations.initMocks(this);
+        Builder b =
+                Vehicle.builder()
+                        .name("RTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .status(Status.ABGEMELDET)
+                        .type(VehicleType.RTW)
+                        .hasNef(true);
+        when(vehicleDAO.get(anyLong())).thenAnswer(ans -> b.id(ans.getArgument(0)).build());
+    }
+
+    @Test
+    public void addValidRegistrationsShouldSucceed()
+            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
+        addValidRegistrations(registrationDAO, vehicleDAO);
+    }
+
+    @Test
+    public void addOnlyOnePersonToRTWShouldFail()
+            throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
+        addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO);
+    }
+
+    static void addValidRegistrations(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO)
+            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
+        RegistrationService registrationService =
+                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
+        Set<Registration> registrations = new HashSet<>();
+        Vehicle vehicle =
+                Vehicle.builder()
+                        .id(1)
+                        .name("RTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(VehicleType.RTW)
+                        .status(Status.ABGEMELDET)
+                        .hasNef(true)
+                        .build();
+        Employee employee1 =
+                Employee.builder()
+                        .id(1)
+                        .name("John Doe")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(true)
+                        .build();
+        Employee employee2 =
+                Employee.builder()
+                        .id(2)
+                        .name("Nick \"Kage\" Verily")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.NKV)
+                        .isDriver(true)
+                        .isPilot(false)
+                        .build();
+        Employee employee3 =
+                Employee.builder()
+                        .id(3)
+                        .name("Nicht Arzt")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.NA)
+                        .isDriver(false)
+                        .isPilot(false)
+                        .build();
+        Instant start = Instant.now();
+        Instant end = start.plus(8, ChronoUnit.HOURS);
+        Registration registration1 =
+                Registration.builder().start(start).end(end).employee(employee1).build();
+        Registration registration2 =
+                Registration.builder().start(start).end(end).employee(employee2).build();
+        Registration registration3 =
+                Registration.builder().start(start).end(end).employee(employee3).build();
+        registrations.add(registration1);
+        registrations.add(registration2);
+        registrations.add(registration3);
+        registrationService.add(vehicle.id(), registrations);
+    }
+
+    static void addOnlyOnePersonToRTW(
+            ExpectedException thrown, RegistrationDAO registrationDAO, VehicleDAO vehicleDAO)
+            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
+        thrown.expect(InvalidRegistrationException.class);
+        RegistrationService registrationService =
+                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
+        Set<Registration> registrations = new HashSet<>();
+        Vehicle vehicle =
+                Vehicle.builder()
+                        .id(1)
+                        .name("RTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .type(VehicleType.RTW)
+                        .status(Status.ABGEMELDET)
+                        .hasNef(true)
+                        .build();
+        Employee employee =
+                Employee.builder()
+                        .id(1)
+                        .name("John Doe")
+                        .birthday(LocalDate.now()) // incorrect, but should be irrelevant
+                        .educationLevel(EducationLevel.RS)
+                        .isDriver(true)
+                        .isPilot(true)
+                        .build();
+        Registration registration =
+                Registration.builder()
+                        .start(Instant.MIN)
+                        .end(Instant.MAX)
+                        .employee(employee)
+                        .build();
+        registrations.add(registration);
+        registrationService.add(vehicle.id(), registrations);
+    }
+}
-- 
cgit v1.2.3-70-g09d2


From fbc917477d106be774d9c093ac42319aeadf1eff Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Mon, 18 Jun 2018 21:30:20 +0200
Subject: RequestVehicles GUI list seperation #25953

---
 .../controller/OperationDetailsController.java     | 24 ++++++++++++++++++----
 src/main/resources/fxml/OperationDetails.fxml      | 11 +++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
index 38d3bd1..937a86a 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/OperationDetailsController.java
@@ -39,6 +39,7 @@ public class OperationDetailsController {
     private final VehicleService vehicleService;
     private final CreateOperationController createOperationController;
     @FXML private FlowPane fpVehicles;
+    @FXML private FlowPane fpAdditional;
     @FXML private ListView<Operation> lvActiveOperations;
     @FXML private Label lblChosenVehicles;
     @FXML private Button btnCloseOperation;
@@ -74,12 +75,21 @@ public class OperationDetailsController {
         try {
             fpVehicles.getChildren().clear();
             for (Vehicle vehicle : operation.vehicles()) {
+                VehiclePaneController controller = VehiclePaneController.createVehiclePane();
+                controller.setData(vehicle, true, false);
+                fpVehicles.getChildren().add(controller.getRootElement());
+            }
+
+            fpAdditional.getChildren().clear();
+            for (Vehicle vehicle : operationService.rankVehicles(operation.opCode())) {
+                if (operation.vehicles().contains(vehicle)) continue;
+
                 VehiclePaneController controller = VehiclePaneController.createVehiclePane();
                 controller.setData(vehicle, true, true);
                 controller.getBtnRequest().setOnAction(e -> requestVehicleClicked(controller));
-                fpVehicles.getChildren().add(controller.getRootElement());
+                fpAdditional.getChildren().add(controller.getRootElement());
             }
-        } catch (IOException e) {
+        } catch (IOException | ServiceException | InvalidOperationException e) {
             LOG.error("Error while updating list.", e);
             showServiceExceptionAlertAndWait("Error while updating list.");
         }
@@ -150,15 +160,21 @@ public class OperationDetailsController {
     private void requestVehicleClicked(VehiclePaneController v) {
         LOG.debug("Button \"Nachfordern\" clicked.");
 
+        Vehicle vehicle;
+
         try {
-            operationService.requestVehicles(operation.id(), Set.of(v.getData().id()));
+            vehicle = v.getData();
+            if (vehicle == null) return;
+
+            operationService.requestVehicles(operation.id(), Set.of(vehicle.id()));
         } catch (ServiceException | InvalidOperationException | InvalidVehicleException e) {
             LOG.error("Exception in requestVehicleClicked()", e);
             showServiceExceptionAlertAndWait(e.getMessage());
             return;
         }
         showSuccessAlertAndWait("Das Fahrzeug wurde erfolgreich angefordert");
-        createOperationController.updateList();
+        operation.vehicles().add(vehicle);
+        updateFlowPane();
     }
 
     public void closeWindow() {
diff --git a/src/main/resources/fxml/OperationDetails.fxml b/src/main/resources/fxml/OperationDetails.fxml
index e1a4daa..9d2fb5b 100644
--- a/src/main/resources/fxml/OperationDetails.fxml
+++ b/src/main/resources/fxml/OperationDetails.fxml
@@ -9,6 +9,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.layout.VBox?>
 <AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" 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.missioncontrol.controller.OperationDetailsController">
   <children>
     <AnchorPane prefHeight="542.0" prefWidth="1100.0" style="-fx-background-color: rgba(239,235,232,1);" />
@@ -94,7 +95,15 @@
         </AnchorPane>
             <ScrollPane layoutX="16.0" layoutY="195.0" prefHeight="345.0" prefWidth="846.0">
                <content>
-                  <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="336.0" prefWidth="840.0" vgap="12" />
+                 <VBox>
+                  <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="168.0" prefWidth="840.0" vgap="12" />
+                   <Label text="Weitere Fahrzeuge:" >
+                     <font>
+                       <Font name="System Bold" size="19.0" />
+                     </font>
+                   </Label>
+                  <FlowPane fx:id="fpAdditional" hgap="12" prefHeight="168.0" prefWidth="840.0" vgap="12" />
+                 </VBox>
                </content>
             </ScrollPane>
       </children>
-- 
cgit v1.2.3-70-g09d2


From 7e2671d0d30bf217a40fd76c5676025218091a62 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Tue, 19 Jun 2018 15:26:33 +0200
Subject: Added search to archive window [#25963]

With search, the user can look for a specific archived operation. The search considers operation-code, location, date and name of the cars
---
 .../controller/ArchiveOperationController.java     | 74 +++++++++++++++++++++-
 src/main/resources/fxml/ArchiveOperation.fxml      | 10 ++-
 2 files changed, 80 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
index 3c3a005..212dba6 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/ArchiveOperationController.java
@@ -9,6 +9,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.io.IOException;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Arrays;
@@ -21,6 +22,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
@@ -33,6 +35,7 @@ import org.springframework.stereotype.Controller;
 public class ArchiveOperationController {
 
     private static final Logger LOG = LoggerFactory.getLogger(ArchiveOperationController.class);
+    @FXML private TextField txtSearch;
 
     @FXML private ImageView imvVehicleDetail;
     @FXML private Label lblStatus;
@@ -89,13 +92,26 @@ public class ArchiveOperationController {
             showServiceExceptionAlertAndWait("Die Einsätze konnten nicht geladen werden!");
             ;
         }
-        setFlowPane();
+        setFlowPane(list);
     }
 
-    private void setFlowPane() {
+    public void update(Set<Operation> operations) {
+        long cancelledAmount = 0;
+        long completedAmount = 0;
+        for (Operation operation : operations) {
+            if (operation.status() == Status.CANCELLED) cancelledAmount++;
+            else completedAmount++;
+        }
+        lblCancelled.setText("storniert: " + cancelledAmount);
+        lblCompleted.setText("abgeschlossen: " + completedAmount);
+        lblOperations.setText("Einsätze: " + operations.size());
+        setFlowPane(operations);
+    }
+
+    private void setFlowPane(Set<Operation> operations) {
         try {
             archiveOperationFlowPane.getChildren().clear();
-            for (Operation operation : sortSet(list)) {
+            for (Operation operation : sortSet(operations)) {
                 OperationInArchiveController opInAController =
                         OperationInArchiveController.create();
                 opInAController.set(operation);
@@ -210,4 +226,56 @@ public class ArchiveOperationController {
         backApMain.setVisible(b);
         apMainDetails.setVisible(b);
     }
+
+    @FXML
+    public void searchInput() {
+        LOG.debug("Search for operations in archive detail view started.");
+        String text = txtSearch.getText();
+        Set<Operation> chosenOperations = new HashSet<>();
+        if (emptyText(text)) update();
+        else {
+            for (Operation operation : list) {
+                if (checkEquality(operation, text)) chosenOperations.add(operation);
+            }
+            update(chosenOperations);
+        }
+    }
+
+    private boolean emptyText(String text) {
+        if (text == null) return true;
+        text = text.replaceAll("\\s+", "");
+        return text.isEmpty();
+    }
+
+    private boolean checkEquality(Operation operation, String text) {
+        if (isEqual(text, operation.opCode())
+                || isEqual(text, operation.destination())
+                || isEqual(text, reformDateToString(operation.created()))) return true;
+        for (Vehicle vehicle : operation.vehicles()) {
+            if (isEqual(text, vehicle.name())) return true;
+        }
+        return false;
+    }
+
+    private String reformDateToString(Instant time) {
+        LocalDateTime dateTime =
+                LocalDateTime.ofInstant(Objects.requireNonNull(time), ZoneOffset.UTC);
+        return "am "
+                + dateTime.getDayOfMonth()
+                + "."
+                + dateTime.getMonth().getValue()
+                + "."
+                + dateTime.getYear();
+    }
+
+    private boolean isEqual(String text, String realText) {
+        for (int i = 0; (i + text.length()) < realText.length(); i++) {
+            StringBuilder result = new StringBuilder();
+            for (int j = i; j < i + text.length(); j++) {
+                result.append(realText.charAt(j));
+            }
+            if ((text.toLowerCase()).equals(result.toString().toLowerCase())) return true;
+        }
+        return false;
+    }
 }
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index e9549ae..9c22803 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -99,9 +100,10 @@
       </AnchorPane>
       <AnchorPane fx:id="apMainDetails" layoutX="82.0" layoutY="80.0" prefHeight="138.0" prefWidth="822.0" style="-fx-background-color: white;" styleClass="shadowed">
          <children>
-            <GridPane layoutY="14.0" prefHeight="113.0" prefWidth="451.0">
+            <GridPane layoutY="14.0" prefHeight="114.0" prefWidth="804.0">
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                </columnConstraints>
                <rowConstraints>
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -124,6 +126,12 @@
                         <Font size="15.0" />
                      </font>
                   </Label>
+                  <Label text="Suche:" GridPane.columnIndex="1">
+                     <font>
+                        <Font name="System Bold" size="20.0" />
+                     </font>
+                  </Label>
+                  <TextField fx:id="txtSearch" onKeyReleased="#searchInput" prefHeight="30.0" prefWidth="355.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                </children>
                <padding>
                   <Insets left="20.0" />
-- 
cgit v1.2.3-70-g09d2