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
---
 .../controller/ArchiveOperationController.java     | 11 ++++++-
 .../controller/CreateCarController.java            | 17 +++++++++-
 .../controller/CreateOperationController.java      | 36 +++++++++++++++++-----
 .../controller/ListEmployeesController.java        | 16 +++++++++-
 .../controller/RegistrationWindowController.java   | 14 ++++++++-
 5 files changed, 83 insertions(+), 11 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 80d9fc4..98616bd 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
@@ -24,6 +24,8 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 public class ArchiveOperationController {
+
+    public AnchorPane archiveOperationAP;
     @FXML private AnchorPane apDetails;
     @FXML private Label lblCodeHeader;
     @FXML private Hyperlink hypBack;
@@ -34,10 +36,13 @@ public class ArchiveOperationController {
     @FXML private FlowPane fpVehicles;
     private final OperationService operationService;
     @FXML private FlowPane archiveOperationFlowPane;
+    private final CreateOperationController createOperationController;
     private LinkedList<Operation> list = new LinkedList<>();
 
-    public ArchiveOperationController(OperationService operationService) {
+    public ArchiveOperationController(OperationService operationService,
+            CreateOperationController createOperationController) {
         this.operationService = operationService;
+        this.createOperationController = createOperationController;
     }
 
     @FXML
@@ -124,4 +129,8 @@ public class ArchiveOperationController {
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
     }
+
+    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 ce795da..0d5d13f 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
@@ -23,6 +23,7 @@ import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
+import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
@@ -32,19 +33,24 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class CreateCarController {
 
+    @FXML private AnchorPane createCarAP;
     @FXML private ChoiceBox<String> cmb_Ctyp;
     @FXML private ChoiceBox<String> cmb_typ;
     @FXML private Button btn_cancel;
     @FXML private Button btn_create;
     @FXML private CheckBox cbx_NEF;
     @FXML private FlowPane fp_vehicleList;
+    private final CreateOperationController createOperationController;
 
     private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     private final VehicleService vehicleService;
     private boolean update = false;
     private long vid = -1;
 
-    public CreateCarController(VehicleService vehicleService) {
+    public CreateCarController(
+            CreateOperationController createOperationController,
+            VehicleService vehicleService) {
+        this.createOperationController = createOperationController;
         this.vehicleService = vehicleService;
     }
 
@@ -203,4 +209,13 @@ public class CreateCarController {
     public void cancelAction(ActionEvent actionEvent) {
         setToStart();
     }
+
+    public void setVisible(boolean b){
+        createCarAP.setVisible(b);
+    }
+
+    public void cancel(){
+        this.setVisible(false);
+        createOperationController.setVisible(false);
+    }
 }
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 57759e3..e3b64c6 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,6 +58,10 @@ public class CreateOperationController {
     @FXML private Label lblChosenVehicles;
     @FXML private AnchorPane apInvisible;
     @FXML private OperationDetailsController operationDetailsController;
+    @FXML private ListEmployeesController listEmployeesController;
+    @FXML private CreateCarController createCarController;
+    @FXML private RegistrationWindowController registrationWindowController;
+    @FXML private ArchiveOperationController archiveOperationController;
     @FXML private FlowPane fpVehicles;
 
     private LinkedList<Vehicle> chosenVehicles = new LinkedList<>();
@@ -291,23 +295,23 @@ public class CreateOperationController {
     }
 
     public void onRegistrationLinkClicked(ActionEvent actionEvent) {
-        openNewWindow("RegistrationWindow.fxml");
+        openRegistrationWindow();
     }
 
     public void onEmployeeLinkClicked(ActionEvent actionEvent) {
-        openNewWindow("listEmployees.fxml");
+        openCreateNewEmployeeWindow();
     }
 
     public void onVehicleLinkClicked(ActionEvent actionEvent) {
-        openNewWindow("createCar.fxml");
+        openCreateCarWindow();
     }
 
     public void onArchivLinkClicked() {
-        openNewArchivWindow();
+        openArchivWindow();
     }
 
-    private void openNewArchivWindow() {
-        Stage stage = new Stage();
+    private void openArchivWindow() {
+        /*Stage stage = new Stage();
         try {
             stage.setScene(
                     new Scene(
@@ -322,7 +326,9 @@ public class CreateOperationController {
         stage.setTitle("Einsatz erstellen");
         stage.centerOnScreen();
         stage.show();
-        updateList();
+        */
+        archiveOperationController.setVisible(true);
+        this.setVisible(false);
     }
 
     private void openNewWindow(String fxmlFileName) {
@@ -349,6 +355,7 @@ public class CreateOperationController {
 
     void setVisible(boolean b) {
         apInvisible.setVisible(!b);
+        updateList();
     }
 
     private void openDetailsWindow(Operation operation) {
@@ -356,6 +363,21 @@ public class CreateOperationController {
         this.setVisible(false);
     }
 
+    private void openCreateNewEmployeeWindow(){
+        this.setVisible(false);
+        listEmployeesController.setVisible(true);
+    }
+
+    private void openCreateCarWindow(){
+        this.setVisible(false);
+        createCarController.setVisible(true);
+    }
+
+    private void openRegistrationWindow(){
+        this.setVisible(false);
+        registrationWindowController.setVisible(true);
+    }
+
     @FXML
     public void onOperationCodeChanged(KeyEvent keyEvent) {
         if (keyEvent.getCode() == KeyCode.ENTER) {
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 25f1263..2e46003 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
@@ -19,6 +19,7 @@ import org.springframework.stereotype.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;
@@ -26,9 +27,13 @@ public class ListEmployeesController {
     private final EmployeeService employeeService;
     private final SpringFXMLLoader fxmlLoader;
 
-    public ListEmployeesController(EmployeeService employeeService, SpringFXMLLoader fxmlLoader) {
+    private final CreateOperationController createOperationController;
+
+    public ListEmployeesController(EmployeeService employeeService, SpringFXMLLoader fxmlLoader,
+            CreateOperationController createOperationController) {
         this.employeeService = employeeService;
         this.fxmlLoader = fxmlLoader;
+        this.createOperationController = createOperationController;
     }
 
     @FXML
@@ -114,4 +119,13 @@ public class ListEmployeesController {
             LOG.error("Could not create a new EmployeeListItem: {}", e);
         }
     }
+
+    public void setVisible(boolean b){
+        listEmployeesAP.setVisible(b);
+    }
+
+    public void close(){
+        this.setVisible(false);
+        createOperationController.setVisible(true);
+    }
 }
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 4653663..a55b1d5 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
@@ -30,6 +30,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,14 +45,19 @@ public class RegistrationWindowController {
 
     private final VehicleService vehicleService;
 
+    private final CreateOperationController createOperationController;
+
     private final RegistrationService registrationService;
+    @FXML private VBox registrationWindowVB;
 
     public RegistrationWindowController(
             EmployeeService employeeService,
             VehicleService vehicleService,
+            CreateOperationController createOperationController,
             RegistrationService registrationService) {
         this.employeeService = employeeService;
         this.vehicleService = vehicleService;
+        this.createOperationController = createOperationController;
         this.registrationService = registrationService;
     }
 
@@ -142,7 +148,9 @@ public class RegistrationWindowController {
     public void cancel() {
         LOG.debug("Cancel Button clicked");
         chosenEmployees.clear();
-        ((Stage) lVehicles.getScene().getWindow()).close();
+       // ((Stage) lVehicles.getScene().getWindow()).close();
+        this.setVisible(false);
+        createOperationController.setVisible(true);
     }
 
     public void create() {
@@ -210,4 +218,8 @@ public class RegistrationWindowController {
             chosenEmployees.clear();
         }
     }
+
+    public void setVisible(boolean b){
+        this.registrationWindowVB.setVisible(b);
+    }
 }
-- 
cgit v1.2.3-70-g09d2


From 8a3d40822b0812b90c0393dead740da64bff54ed Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 26 May 2018 16:02:12 +0200
Subject: reformatted code

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java  | 5 +++--
 .../einsatzverwaltung/controller/CreateCarController.java         | 7 +++----
 .../einsatzverwaltung/controller/CreateOperationController.java   | 6 +++---
 .../einsatzverwaltung/controller/ListEmployeesController.java     | 8 +++++---
 .../controller/RegistrationWindowController.java                  | 4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 98616bd..ab4982b 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
@@ -39,7 +39,8 @@ public class ArchiveOperationController {
     private final CreateOperationController createOperationController;
     private LinkedList<Operation> list = new LinkedList<>();
 
-    public ArchiveOperationController(OperationService operationService,
+    public ArchiveOperationController(
+            OperationService operationService,
             CreateOperationController createOperationController) {
         this.operationService = operationService;
         this.createOperationController = createOperationController;
@@ -130,7 +131,7 @@ public class ArchiveOperationController {
         setDetailsVisible(false);
     }
 
-    public void setVisible(boolean b){
+    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 0d5d13f..74e699b 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
@@ -48,8 +48,7 @@ public class CreateCarController {
     private long vid = -1;
 
     public CreateCarController(
-            CreateOperationController createOperationController,
-            VehicleService vehicleService) {
+            CreateOperationController createOperationController, VehicleService vehicleService) {
         this.createOperationController = createOperationController;
         this.vehicleService = vehicleService;
     }
@@ -210,11 +209,11 @@ public class CreateCarController {
         setToStart();
     }
 
-    public void setVisible(boolean b){
+    public void setVisible(boolean b) {
         createCarAP.setVisible(b);
     }
 
-    public void cancel(){
+    public void cancel() {
         this.setVisible(false);
         createOperationController.setVisible(false);
     }
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 e3b64c6..7ceea47 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
@@ -363,17 +363,17 @@ public class CreateOperationController {
         this.setVisible(false);
     }
 
-    private void openCreateNewEmployeeWindow(){
+    private void openCreateNewEmployeeWindow() {
         this.setVisible(false);
         listEmployeesController.setVisible(true);
     }
 
-    private void openCreateCarWindow(){
+    private void openCreateCarWindow() {
         this.setVisible(false);
         createCarController.setVisible(true);
     }
 
-    private void openRegistrationWindow(){
+    private void openRegistrationWindow() {
         this.setVisible(false);
         registrationWindowController.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 2e46003..4637a80 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
@@ -29,7 +29,9 @@ public class ListEmployeesController {
 
     private final CreateOperationController createOperationController;
 
-    public ListEmployeesController(EmployeeService employeeService, SpringFXMLLoader fxmlLoader,
+    public ListEmployeesController(
+            EmployeeService employeeService,
+            SpringFXMLLoader fxmlLoader,
             CreateOperationController createOperationController) {
         this.employeeService = employeeService;
         this.fxmlLoader = fxmlLoader;
@@ -120,11 +122,11 @@ public class ListEmployeesController {
         }
     }
 
-    public void setVisible(boolean b){
+    public void setVisible(boolean b) {
         listEmployeesAP.setVisible(b);
     }
 
-    public void close(){
+    public void close() {
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
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 a55b1d5..a54d945 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
@@ -148,7 +148,7 @@ public class RegistrationWindowController {
     public void cancel() {
         LOG.debug("Cancel Button clicked");
         chosenEmployees.clear();
-       // ((Stage) lVehicles.getScene().getWindow()).close();
+        // ((Stage) lVehicles.getScene().getWindow()).close();
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
@@ -219,7 +219,7 @@ public class RegistrationWindowController {
         }
     }
 
-    public void setVisible(boolean b){
+    public void setVisible(boolean b) {
         this.registrationWindowVB.setVisible(b);
     }
 }
-- 
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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 db5594f071352329368dd2c857e1c218461a6ba7 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:09:39 +0200
Subject: removed unused logger #27033

---
 .../groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java         | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 43a5c9d..b9f2079 100644
--- 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
@@ -5,7 +5,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.Ed
 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.lang.invoke.MethodHandles;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -15,14 +14,11 @@ import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.HashSet;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class EmployeeDatabaseDAO implements EmployeeDAO {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     private static final String INSERT_EMPLOYEE_VERSION =
             "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
                     + "VALUES(?, ?, ?, ?, ?)";
-- 
cgit v1.2.3-70-g09d2


From 562838e0d6ae597c06122efb5db2a68d2e633cf2 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:40:02 +0200
Subject: removed logging for exceptions which will be logged in service #27033

---
 .../groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 13f2c0f..59f8e52 100644
--- 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
@@ -51,7 +51,6 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
             updateVehicle = connection.prepareStatement(UPDATE_VEHICLE);
             fetchRegistrations = connection.prepareStatement(FETCH_REGISTRATIONS);
         } catch (SQLException e) {
-            LOG.error("Could not get connection or preparation of statement failed");
             throw new PersistenceException(e);
         }
     }
@@ -74,7 +73,6 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
                     if (rs.next()) {
                         returnValues.add(rs.getLong(1));
                     } else {
-                        LOG.error("No ResultSet was created while adding registration");
                         throw new PersistenceException(
                                 "Anmeldung konnte nicht gespeichert werden.");
                     }
@@ -87,14 +85,10 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
             connection.commit();
             return returnValues;
         } catch (SQLException e) {
-            LOG.error(
-                    "An SQLException occurred while trying to save registrations to database. "
-                            + "Attempting a rollback. Error message: {}",
-                    e.getMessage());
             try {
                 connection.rollback();
             } catch (SQLException e1) {
-                LOG.error("Rollback failed :(");
+                LOG.error("Rollback failed! Error message: {}", e.getMessage());
             }
             throw new PersistenceException(e);
         } finally {
-- 
cgit v1.2.3-70-g09d2


From e192b737e3520d93149c44e83b35650eb333b105 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:51:19 +0200
Subject: added logging of validation errors #27033

---
 .../groupphase/einsatzverwaltung/dto/EmployeeValidator.java        | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index d7fa9aa..994be3f 100644
--- 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
@@ -1,20 +1,27 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
 
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EmployeeValidator {
 
+    private static final Logger LOG = LoggerFactory.getLogger(EmployeeValidator.class);
+
     public static boolean validate(Employee employee) throws InvalidEmployeeException {
 
         if (employee.name() == null || employee.name().trim().length() == 0) {
+            LOG.info("Invalid Employee: Name was not set");
             throw new InvalidEmployeeException("name not set");
         }
 
         if (employee.birthday() == null) {
+            LOG.info("Invalid Employee: Birthday was not set");
             throw new InvalidEmployeeException("birthday not set");
         }
 
         if (employee.educationLevel() == null) {
+            LOG.info("Invalid Employee: EducationLevel was not set");
             throw new InvalidEmployeeException("educationLevel not set");
         }
 
-- 
cgit v1.2.3-70-g09d2


From b800d7d996c4e4035eb173776d736d0fb851cf8f Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:52:48 +0200
Subject: changed messages of InvalidEmployeeExceptions to german #27033

---
 .../groupphase/einsatzverwaltung/dto/EmployeeValidator.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 994be3f..82033b9 100644
--- 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
@@ -12,17 +12,17 @@ public class EmployeeValidator {
 
         if (employee.name() == null || employee.name().trim().length() == 0) {
             LOG.info("Invalid Employee: Name was not set");
-            throw new InvalidEmployeeException("name not set");
+            throw new InvalidEmployeeException("Name darf nicht leer sein!");
         }
 
         if (employee.birthday() == null) {
             LOG.info("Invalid Employee: Birthday was not set");
-            throw new InvalidEmployeeException("birthday not set");
+            throw new InvalidEmployeeException("Geburtsdatum darf nicht leer sein!");
         }
 
         if (employee.educationLevel() == null) {
             LOG.info("Invalid Employee: EducationLevel was not set");
-            throw new InvalidEmployeeException("educationLevel not set");
+            throw new InvalidEmployeeException("Ausbildungsgrad darf nicht leer sein!");
         }
 
         return true;
-- 
cgit v1.2.3-70-g09d2


From 36f7e786ecf39d981d446ba00849c16e7707ba04 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:56:44 +0200
Subject: changed log messages to be of format "Invalid Registration: <Problem
 description>" #27033

---
 .../dto/RegistrationValidator.java                 | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 610426c..b3336b7 100644
--- 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
@@ -47,7 +47,9 @@ public class RegistrationValidator {
         for (Registration registration : registrations) {
             total++;
             if (found.put(registration.employee().id(), false) != null) {
-                LOG.info("Employee with ID {} was added twice", registration.employee().id());
+                LOG.info(
+                        "Invalid Registration: Employee with ID {} was added twice",
+                        registration.employee().id());
                 throw new InvalidRegistrationException(
                         "Person with the ID: "
                                 + registration.employee().id()
@@ -71,7 +73,7 @@ public class RegistrationValidator {
             }
         }
         if (total <= 0) {
-            LOG.info("No employees were added");
+            LOG.info("Invalid Registration: No employees were added");
             throw new InvalidRegistrationException("Kein Personal ausgewählt!");
         }
         if (vehicle.type() == VehicleType.NAH) {
@@ -83,10 +85,10 @@ public class RegistrationValidator {
             3-4 Personen
              */
             if (total < 3) {
-                LOG.info("Too few employees for NAH");
+                LOG.info("Invalid Registration: Too few employees for NAH");
                 throw new InvalidRegistrationException("Zu wenig Personal für NAH!");
             } else if (total > 4) {
-                LOG.info("Too many employees for NAH");
+                LOG.info("Invalid Registration: Too many employees for NAH");
                 throw new InvalidRegistrationException("Zu viel Personal für NAH!");
             }
             for (long pilot_id : pilotIds) {
@@ -103,7 +105,7 @@ public class RegistrationValidator {
                 }
                 found.put(pilot_id, false);
             }
-            LOG.info("No valid combination of employees found for NAH");
+            LOG.info("Invalid Registration: No valid combination of employees found for NAH");
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für NAH!");
         } else if (vehicle.type() == VehicleType.NEF) {
@@ -113,10 +115,10 @@ public class RegistrationValidator {
             1 NA
              */
             if (total < 2) {
-                LOG.info("Too few employees for NEF");
+                LOG.info("Invalid Registration: Too few employees for NEF");
                 throw new InvalidRegistrationException("Zu wenig Personal für NEF!");
             } else if (total > 3) {
-                LOG.info("Too many employees for NEF");
+                LOG.info("Invalid Registration: Too many employees for NEF");
                 throw new InvalidRegistrationException("Zu viel Personal für NEF!");
             }
             for (long driver_id : driverIds) {
@@ -130,7 +132,7 @@ public class RegistrationValidator {
                 }
                 found.put(driver_id, false);
             }
-            LOG.info("No valid combination of employees found for NEF");
+            LOG.info("Invalid Registration: No valid combination of employees found for NEF");
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für NEF!");
         } else if (vehicle.type() == VehicleType.BKTW) {
@@ -139,14 +141,14 @@ public class RegistrationValidator {
             1 Driver
              */
             if (total > 3) {
-                LOG.info("Too many employees for BKTW");
+                LOG.info("Invalid Registration: Too many employees for BKTW");
                 throw new InvalidRegistrationException("Zu viel Personal für BKTW!");
             }
             if (!driverIds.isEmpty()) {
                 LOG.info("Valid combination found for BKTW");
                 return;
             }
-            LOG.info("No driver was found for BKTW");
+            LOG.info("Invalid Registration: No driver was found for BKTW");
             throw new InvalidRegistrationException("Kein Fahrer gefunden für BKTW!");
         } else { // KTW or RTW, both have the same requirements
             /*
@@ -155,11 +157,11 @@ public class RegistrationValidator {
             1 RS
              */
             if (total < 2) {
-                LOG.info("Too few employees for {}", vehicle.type().name());
+                LOG.info("Invalid Registration: Too few employees for {}", vehicle.type().name());
                 throw new InvalidRegistrationException(
                         "Zu wenig Personal für " + vehicle.type().name() + "!");
             } else if (total > 4) {
-                LOG.info("Too many employees for {}", vehicle.type().name());
+                LOG.info("Invalid Registration: Too many employees for {}", vehicle.type().name());
                 throw new InvalidRegistrationException(
                         "Zu viel Persoanl für " + vehicle.type().name() + "!");
             }
@@ -171,7 +173,9 @@ public class RegistrationValidator {
                     return;
                 }
             }
-            LOG.info("No valid combination of employees found for {}", vehicle.type().name());
+            LOG.info(
+                    "Invalid Registration: No valid combination of employees found for {}",
+                    vehicle.type().name());
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für " + vehicle.type().name() + "!");
         }
-- 
cgit v1.2.3-70-g09d2


From 309480b1d4edef5a0f8762ee1d18aeb58ec0fe90 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 20:58:18 +0200
Subject: changed expection message to be german #27033

---
 .../groupphase/einsatzverwaltung/dto/RegistrationValidator.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index b3336b7..805e306 100644
--- 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
@@ -51,9 +51,9 @@ public class RegistrationValidator {
                         "Invalid Registration: Employee with ID {} was added twice",
                         registration.employee().id());
                 throw new InvalidRegistrationException(
-                        "Person with the ID: "
+                        "Person mit der ID: "
                                 + registration.employee().id()
-                                + " was added more than once!");
+                                + " wurde mehrmals hinzugefügt!");
             }
             if (registration.employee().isPilot()) {
                 pilotIds.add(registration.employee().id());
-- 
cgit v1.2.3-70-g09d2


From 31ff057168d2651fef3013fd58fa2c9c92c10238 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 21:03:21 +0200
Subject: added logging of all persistence errors #27033

---
 .../einsatzverwaltung/service/EmployeeServiceImpl.java           | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 31b5acd..700a5de 100644
--- 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
@@ -8,11 +8,15 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeExceptio
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class EmployeeServiceImpl implements EmployeeService {
 
+    private static final Logger LOG = LoggerFactory.getLogger(EmployeeServiceImpl.class);
+
     private final EmployeeDAO employeePersistence;
 
     public EmployeeServiceImpl(EmployeeDAO employeePersistence) {
@@ -26,6 +30,7 @@ public class EmployeeServiceImpl implements EmployeeService {
         try {
             return employeePersistence.add(employee);
         } catch (PersistenceException e) {
+            LOG.error("PersistenceException while adding Employee. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -38,6 +43,9 @@ public class EmployeeServiceImpl implements EmployeeService {
             employeePersistence.update(employee);
             return employee;
         } catch (ElementNotFoundException | PersistenceException e) {
+            LOG.error(
+                    "ElementNotFoundException or PersistenceException while updating Employee. Message: {}",
+                    e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -48,6 +56,7 @@ public class EmployeeServiceImpl implements EmployeeService {
         try {
             return employeePersistence.list();
         } catch (PersistenceException e) {
+            LOG.error("PersistenceException while listing Employees. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
-- 
cgit v1.2.3-70-g09d2


From dc9955610a07f5522237f14d18798e98eaec7850 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 21:42:53 +0200
Subject: added logging to all thrown exceptions #27033

---
 .../service/OperationServiceImpl.java              | 90 ++++++++++++++++------
 1 file changed, 68 insertions(+), 22 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index d07f46f..3c3b91c 100644
--- 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
@@ -12,7 +12,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationExcepti
 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.lang.invoke.MethodHandles;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -34,7 +33,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class OperationServiceImpl implements OperationService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(OperationServiceImpl.class);
 
     private final OperationDAO operationDAO;
     private final VehicleDAO vehicleDAO;
@@ -49,11 +48,20 @@ public class OperationServiceImpl implements OperationService {
 
     @Override
     public long add(Operation o) throws InvalidOperationException, ServiceException {
-        if (o.created() != null) throw new InvalidOperationException("Created must not be set");
+        if (o.created() != null) {
+            LOG.info("Invalid Operation: Created must be null");
+            throw new InvalidOperationException("Created must not be set");
+        }
 
-        if (o.severity() != null) throw new InvalidOperationException("Severity must not be set");
+        if (o.severity() != null) {
+            LOG.info("Invalid Operation: Severity must be null");
+            throw new InvalidOperationException("Severity must not be set");
+        }
 
-        if (o.id() != 0) throw new InvalidOperationException("Id must be 0");
+        if (o.id() != 0) {
+            LOG.info("Invalid Operation: OperationId must be 0");
+            throw new InvalidOperationException("Id must be 0");
+        }
 
         if (o.status() != Status.ACTIVE)
             LOG.warn("Status was set but will be overridden"); // TODO: nullable instead??
@@ -73,11 +81,14 @@ public class OperationServiceImpl implements OperationService {
                             .status(Status.ACTIVE)
                             .build());
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while adding operation: {}", e);
+            LOG.error("PersistenceException while adding Operation. Message: {}", e.getMessage());
             throw new ServiceException(e);
         } catch (InvalidVehicleException e) {
+            // already logged as invalid vehicle
             throw new InvalidOperationException("Enthaltenes Fahrzeug ist invalid", e);
         } catch (ElementNotFoundException e) {
+            LOG.error(
+                    "ElementNotFoundException while adding Operation. Message: {}", e.getMessage());
             throw new InvalidOperationException("Enthaltenes Fahrzeug existiert nicht", e);
         }
     }
@@ -88,32 +99,47 @@ public class OperationServiceImpl implements OperationService {
         Set<Vehicle> vs = new HashSet<>();
 
         try {
-            if (operationId <= 0) throw new InvalidOperationException("OperationId ist invalid");
+            if (operationId <= 0) {
+                LOG.info("Invalid Operation: OperationId is invalid (<= 0)");
+                throw new InvalidOperationException("OperationId ist invalid");
+            }
             Operation o = operationDAO.get(operationId);
             validateOperation(o);
 
             if (o.opCode().trim().isEmpty()
-                    || extractSeverityFromOpCode(o.opCode()) != o.severity())
+                    || extractSeverityFromOpCode(o.opCode()) != o.severity()) {
+                LOG.info("Invalid Operation: OpCode does not match Severity");
                 throw new InvalidOperationException("Einsatzcode ist invalid");
+            }
 
-            if (o.status() != Status.ACTIVE)
+            if (o.status() != Status.ACTIVE) {
+                LOG.info("Invalid Operation: Operation is not active");
                 throw new InvalidOperationException("Einsatz ist inaktiv");
+            }
 
-            if (o.created() == null)
+            if (o.created() == null) {
+                LOG.info("Invalid Operation: Created field is null");
                 throw new InvalidOperationException("Created darf nicht leer sein");
+            }
 
             for (Long id : vehicleIds) {
-                if (id <= 0) throw new InvalidVehicleException("VehicleId ist invalid");
+                if (id <= 0) {
+                    LOG.info("Invalid Vehicle: VehicleId is not valid");
+                    throw new InvalidVehicleException("VehicleId ist invalid");
+                }
 
                 try {
                     Vehicle v = vehicleDAO.get(id);
                     VehicleServiceImpl.validateVehicle(v);
-                    if (v.status() == Vehicle.Status.ABGEMELDET)
+                    if (v.status() == Vehicle.Status.ABGEMELDET) {
+                        LOG.info("Invalid Vehicle: Requested vehicle is not active");
                         throw new InvalidVehicleException(
                                 "Kann keine inaktiven Fahrzeuge anfordern");
+                    }
 
                     vs.add(v);
                 } catch (ElementNotFoundException e) {
+                    LOG.info("Invalid Vehicle: VehicleId is not valid");
                     throw new InvalidVehicleException("VehicleId ist invalid");
                 }
             }
@@ -123,9 +149,13 @@ public class OperationServiceImpl implements OperationService {
 
             operationDAO.update(o.toBuilder().vehicles(vs).build());
         } catch (ElementNotFoundException e) {
+            LOG.error(
+                    "ElementNotFoundException while requesting Vehicles. Message: {}",
+                    e.getMessage());
             throw new InvalidOperationException("Kein Einsatz mit dieser id existiert");
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while requesting vehicles: {}", e);
+            LOG.error(
+                    "PersistenceException while requesting vehicles. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -137,9 +167,13 @@ public class OperationServiceImpl implements OperationService {
             Operation o = operationDAO.get(operationId);
             operationDAO.update(o.toBuilder().status(status).build());
         } catch (ElementNotFoundException e) {
+            LOG.error(
+                    "ElementNotFoundException while completing operation. Message: {}",
+                    e.getMessage());
             throw new InvalidOperationException(e);
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while completing operation: {}", e);
+            LOG.error(
+                    "PersistenceException while completing operation. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -214,40 +248,49 @@ public class OperationServiceImpl implements OperationService {
 
             return operations;
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing operations", e);
+            LOG.error("PersistenceException while listing operations. Message: {}", e.getMessage());
             throw new ServiceException(e);
         } catch (InvalidOperationException e) {
             // database returned invalid values
-            LOG.error("DB returned invalid operation: {}", e);
+            LOG.error("DB returned invalid operation. Message: {}", e.getMessage());
             throw new ServiceException("DB returned invalid operation", e);
         }
     }
 
     private static void validateOperation(Operation o) throws InvalidOperationException {
-        if (o.vehicles().isEmpty())
+        if (o.vehicles().isEmpty()) {
+            LOG.info("Invalid Operation: No vehicle was added");
             throw new InvalidOperationException(
                     "Es muss mindestens ein Fahrzeug ausgewählt werden!");
+        }
 
         for (Vehicle v : o.vehicles()) {
             try {
                 VehicleServiceImpl.validateVehicle(v);
             } catch (InvalidVehicleException e) {
+                LOG.info("Invalid Operation: Vehicle \"{}\" is invalid", v.name());
                 throw new InvalidOperationException("Fahrzeug " + v.name() + " ist invalid" + e);
             }
 
-            if (v.status() != Vehicle.Status.FREI_FUNK && v.status() != Vehicle.Status.FREI_WACHE)
+            if (v.status() != Vehicle.Status.FREI_FUNK && v.status() != Vehicle.Status.FREI_WACHE) {
+                LOG.info("Invalid Operation: Vehicle \"{}\" not available", v.name());
                 throw new InvalidOperationException(
                         "Fahrzeug nicht verfügbar (" + v.status() + ")");
+            }
 
             // TODO: validate if NEF/RTW/NAH conditions?
         }
 
         Instant created = o.created();
-        if (created != null && created.isAfter(Instant.now()))
-            throw new InvalidOperationException("Fahrzeug wurde in der Zukunft erstellt");
+        if (created != null && created.isAfter(Instant.now())) {
+            LOG.info("Invalid Operation: Operation was created in the future");
+            throw new InvalidOperationException("Einsatz wurde in der Zukunft erstellt");
+        }
 
-        if (o.destination().trim().isEmpty())
+        if (o.destination().trim().isEmpty()) {
+            LOG.info("Invalid Operation: Adress must not be empty");
             throw new InvalidOperationException("Adresse darf nicht leer sein");
+        }
     }
 
     private static final Pattern opCodePattern =
@@ -257,7 +300,10 @@ public class OperationServiceImpl implements OperationService {
             throws InvalidOperationException {
         Matcher m = opCodePattern.matcher(opCode);
 
-        if (!m.matches()) throw new InvalidOperationException("Einsatzcode ist invalid");
+        if (!m.matches()) {
+            LOG.info("Invalid Operation: OpCode is invalid");
+            throw new InvalidOperationException("Einsatzcode ist invalid");
+        }
 
         return Severity.valueOf(m.group(1));
     }
-- 
cgit v1.2.3-70-g09d2


From 247b0bf9f2b5f503d6bd494df7c4c18db5ead7e4 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 21:55:39 +0200
Subject: changed InvalidXExceptions to return a valid german message #27033

---
 .../service/OperationServiceImpl.java                | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 3c3b91c..853e499 100644
--- 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
@@ -50,17 +50,17 @@ public class OperationServiceImpl implements OperationService {
     public long add(Operation o) throws InvalidOperationException, ServiceException {
         if (o.created() != null) {
             LOG.info("Invalid Operation: Created must be null");
-            throw new InvalidOperationException("Created must not be set");
+            throw new InvalidOperationException("Erstellungszeitpunkt darf nicht gesetzt sein");
         }
 
         if (o.severity() != null) {
             LOG.info("Invalid Operation: Severity must be null");
-            throw new InvalidOperationException("Severity must not be set");
+            throw new InvalidOperationException("Der Schweregrad darf nicht gesetzt sein");
         }
 
         if (o.id() != 0) {
             LOG.info("Invalid Operation: OperationId must be 0");
-            throw new InvalidOperationException("Id must be 0");
+            throw new InvalidOperationException("Einsatz-ID muss 0 sein");
         }
 
         if (o.status() != Status.ACTIVE)
@@ -85,7 +85,7 @@ public class OperationServiceImpl implements OperationService {
             throw new ServiceException(e);
         } catch (InvalidVehicleException e) {
             // already logged as invalid vehicle
-            throw new InvalidOperationException("Enthaltenes Fahrzeug ist invalid", e);
+            throw new InvalidOperationException("Enthaltenes Fahrzeug ist ungültig", e);
         } catch (ElementNotFoundException e) {
             LOG.error(
                     "ElementNotFoundException while adding Operation. Message: {}", e.getMessage());
@@ -101,7 +101,7 @@ public class OperationServiceImpl implements OperationService {
         try {
             if (operationId <= 0) {
                 LOG.info("Invalid Operation: OperationId is invalid (<= 0)");
-                throw new InvalidOperationException("OperationId ist invalid");
+                throw new InvalidOperationException("Einsatz-ID ist ungültig");
             }
             Operation o = operationDAO.get(operationId);
             validateOperation(o);
@@ -109,23 +109,23 @@ public class OperationServiceImpl implements OperationService {
             if (o.opCode().trim().isEmpty()
                     || extractSeverityFromOpCode(o.opCode()) != o.severity()) {
                 LOG.info("Invalid Operation: OpCode does not match Severity");
-                throw new InvalidOperationException("Einsatzcode ist invalid");
+                throw new InvalidOperationException("Einsatzcode ist ungültig");
             }
 
             if (o.status() != Status.ACTIVE) {
                 LOG.info("Invalid Operation: Operation is not active");
-                throw new InvalidOperationException("Einsatz ist inaktiv");
+                throw new InvalidOperationException("Einsatz ist ungültig");
             }
 
             if (o.created() == null) {
                 LOG.info("Invalid Operation: Created field is null");
-                throw new InvalidOperationException("Created darf nicht leer sein");
+                throw new InvalidOperationException("Erstellungszeitpunkt darf nicht leer sein");
             }
 
             for (Long id : vehicleIds) {
                 if (id <= 0) {
                     LOG.info("Invalid Vehicle: VehicleId is not valid");
-                    throw new InvalidVehicleException("VehicleId ist invalid");
+                    throw new InvalidVehicleException("Fahrzeug-ID ist ungültig");
                 }
 
                 try {
@@ -152,7 +152,7 @@ public class OperationServiceImpl implements OperationService {
             LOG.error(
                     "ElementNotFoundException while requesting Vehicles. Message: {}",
                     e.getMessage());
-            throw new InvalidOperationException("Kein Einsatz mit dieser id existiert");
+            throw new InvalidOperationException("Kein Einsatz mit dieser ID existiert");
         } catch (PersistenceException e) {
             LOG.error(
                     "PersistenceException while requesting vehicles. Message: {}", e.getMessage());
-- 
cgit v1.2.3-70-g09d2


From fad30d89e86cb9e72b4a3ee52027888ff245364d Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 22:06:55 +0200
Subject: added appropriate logging for persistence errors #27033

---
 .../einsatzverwaltung/service/RegistrationServiceImpl.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 54d46e7..007a2e7 100644
--- 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
@@ -43,9 +43,13 @@ public class RegistrationServiceImpl implements RegistrationService {
 
             return registrationDAO.add(vehicle.id(), registrations);
         } catch (PersistenceException e) {
-            LOG.warn("PersistenceException caught, throwing matching ServiceException");
+            LOG.error(
+                    "PersistenceException while adding Registration. Message: {}", e.getMessage());
             throw new ServiceException(e);
         } catch (ElementNotFoundException e) {
+            LOG.error(
+                    "ElementNotFoundException while getting vehicle for Registration. Message: {}",
+                    e.getMessage());
             throw new InvalidVehicleException(e);
         }
     }
-- 
cgit v1.2.3-70-g09d2


From b49423c1bc9e29f2066a74bb6f4fdb745a6db1b3 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 22:26:57 +0200
Subject: add info messages for failed validations #27033

---
 .../einsatzverwaltung/service/VehicleServiceImpl.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 61a24e5..4e90582 100644
--- 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
@@ -11,12 +11,16 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 @Service
 public class VehicleServiceImpl implements VehicleService {
 
+    private static final Logger LOG = LoggerFactory.getLogger(VehicleServiceImpl.class);
+
     private VehicleDAO vehiclePersistence;
 
     public VehicleServiceImpl(VehicleDAO vehiclePersistence) {
@@ -24,8 +28,10 @@ public class VehicleServiceImpl implements VehicleService {
     }
 
     public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
-        if (!CollectionUtils.isEmpty(vehicle.registrations()))
+        if (!CollectionUtils.isEmpty(vehicle.registrations())) {
+            LOG.info("Invalid Vehicle: Vehicle cannot be created with registrations");
             throw new InvalidVehicleException("Vehicle can't be created with registrations");
+        }
 
         validateVehicle(vehicle);
         try {
@@ -52,32 +58,40 @@ public class VehicleServiceImpl implements VehicleService {
         switch (vehicle.type()) {
             case RTW:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    LOG.info("Invalid Vehicle: RTW cannot have a normal roof");
                     throw new InvalidVehicleException("RTW darf kein Normales Dach haben");
                 } else if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    LOG.info("Invalid Vehicle: RTW cannot have a medium roof");
                     throw new InvalidVehicleException("RTW darf kein Mittelhochdach haben");
                 }
                 break;
             case KTW:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    LOG.info("Invalid Vehicle: KTW cannot have a normal roof");
                     throw new InvalidVehicleException("KTW darf kein Normales Dach haben");
                 }
                 break;
             case KTW_B:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
+                    LOG.info("Invalid Vehicle: KTW-B cannot have a normal roof");
                     throw new InvalidVehicleException("KTW-B darf kein Normales Dach haben");
                 }
                 break;
             case NEF:
                 if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    LOG.info("Invalid Vehicle: NEF cannot have a medium roof");
                     throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
                 } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
+                    LOG.info("Invalid Vehicle: NEF cannot have a high roof");
                     throw new InvalidVehicleException("NEF darf kein Hochdach haben");
                 }
                 break;
             case NAH:
                 if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    LOG.info("Invalid Vehicle: NAH cannot have a medium roof");
                     throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
                 } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
+                    LOG.info("Invalid Vehicle: NAH cannot have a high roof");
                     throw new InvalidVehicleException("NEF darf kein Hochdach haben");
                 }
                 break;
-- 
cgit v1.2.3-70-g09d2


From 9d1b39f1ef912b1f148c990b4d34ed953f6fa64a Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 22:28:30 +0200
Subject: changed message to be german #27033

---
 .../groupphase/einsatzverwaltung/service/VehicleServiceImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 4e90582..4010df3 100644
--- 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
@@ -30,7 +30,8 @@ public class VehicleServiceImpl implements VehicleService {
     public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
         if (!CollectionUtils.isEmpty(vehicle.registrations())) {
             LOG.info("Invalid Vehicle: Vehicle cannot be created with registrations");
-            throw new InvalidVehicleException("Vehicle can't be created with registrations");
+            throw new InvalidVehicleException(
+                    "Fahrzeug kann nicht mit Anmeldungen erstellt werden");
         }
 
         validateVehicle(vehicle);
-- 
cgit v1.2.3-70-g09d2


From 93d09d05cf7b0b32e3e16de3b2c2fa2266cf9abd Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 25 May 2018 22:33:34 +0200
Subject: added logging before throwing ServiceException #27033

---
 .../groupphase/einsatzverwaltung/service/VehicleServiceImpl.java    | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 4010df3..026bca6 100644
--- 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
@@ -38,6 +38,7 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehiclePersistence.add(vehicle);
         } catch (PersistenceException e) {
+            LOG.error("PersistenceException while adding Vehicle. Message : {}", e.getMessage());
             throw new ServiceException(e);
         }
         return 0;
@@ -48,8 +49,11 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehiclePersistence.update(vehicle);
         } catch (ElementNotFoundException e) {
+            LOG.error(
+                    "ElementNotFoundException while updating Vehicle. Message: {}", e.getMessage());
             throw new ServiceException("Element not found");
         } catch (PersistenceException e) {
+            LOG.error("PersistenceException while updating Vehicle. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
         return vehicle;
@@ -106,6 +110,7 @@ public class VehicleServiceImpl implements VehicleService {
     @Override
     public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException {
         if (statuses == null) {
+            LOG.error("Statuses may not be null");
             throw new ServiceException("statuses may not be null");
         }
 
@@ -114,6 +119,7 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehicles = vehiclePersistence.list();
         } catch (PersistenceException e) {
+            LOG.error("PersistenceException while listing Vehicles. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
 
-- 
cgit v1.2.3-70-g09d2


From 406d99c083f9840d47722d3e52b521dc8c89e359 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Wed, 30 May 2018 18:06:12 +0200
Subject: Fix VehicleDAO.update() version update mechanic

Before, it would update and insert a new VehicleVersion every time, even
if only the status of the vehicle changed.
---
 .../einsatzverwaltung/dao/VehicleDatabaseDAO.java  | 91 +++++++++-------------
 1 file changed, 38 insertions(+), 53 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 6d50588..535987f 100644
--- 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
@@ -88,70 +88,55 @@ public class VehicleDatabaseDAO implements VehicleDAO {
     }
 
     @Override
-    public void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException {
-        String query = "SELECT * FROM vehicle WHERE id=?";
+    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 vehicleID = -1;
-        long vehicleVersion = -1;
-        try {
-            Connection connection = jdbcConnectionManager.getConnection();
-            connection.setAutoCommit(false);
-            try (PreparedStatement p =
-                    connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS)) {
-
-                p.setLong(1, vehicle.id());
-                p.executeQuery();
-                try (ResultSet rs = p.getResultSet()) {
-                    while (rs.next()) {
-                        vehicleID = rs.getLong("id");
-                    }
-                }
-            }
-            if (vehicleID == -1) {
-                throw new ElementNotFoundException("Vehicle don´t found");
-            }
-
-            query =
-                    "INSERT INTO VehicleVersion (name,hasNef,constructionType,type) VALUES (?,?,?,?)";
-            String name = "";
-            try (PreparedStatement p =
-                    connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS)) {
-                p.setString(1, name);
-                p.setBoolean(2, vehicle.hasNef());
-                p.setString(3, vehicle.constructionType().name());
+        long versionId;
 
-                p.setString(4, vehicle.type().name());
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
 
-                p.executeUpdate();
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, v.id());
 
-                try (ResultSet keyResultSet = p.getGeneratedKeys()) {
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    if (!rs.next()) throw new ElementNotFoundException("No such vehicleId exists");
 
-                    if (keyResultSet.next()) {
-                        vehicleVersion = keyResultSet.getInt(1);
-                    }
-                }
-                if (vehicleVersion == -1) {
-                    throw new ElementNotFoundException("Vehicle don´t found");
+                    versionId = rs.getLong(1);
                 }
             }
-            name = vehicle.type().name() + "-" + vehicleID;
 
-            query = "UPDATE VehicleVersion SET name=? WHERE id=?";
-            try (PreparedStatement p = connection.prepareStatement(query)) {
-
-                p.setString(1, name);
-                p.setLong(2, vehicleVersion);
-                p.executeUpdate();
+            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);
+                        System.out.println("DEBUG: Changed version to " + versionId);
+                    } else System.out.println("Version stayed the same");
+                }
             }
-            query = "UPDATE Vehicle SET version=? WHERE id=?";
-            try (PreparedStatement p = connection.prepareStatement(query)) {
 
-                p.setLong(1, vehicleVersion);
-                p.setLong(2, vehicleID);
-                p.executeUpdate();
+            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
+                pstmt.setLong(1, versionId);
+                pstmt.setString(2, v.status().name());
+                pstmt.setLong(3, v.id());
+                pstmt.executeUpdate();
             }
-            connection.commit();
-            connection.setAutoCommit(true);
+
+            con.commit();
+            con.setAutoCommit(true);
         } catch (SQLException e) {
             throw new PersistenceException(e);
         }
-- 
cgit v1.2.3-70-g09d2


From cad736b1bad936589cd6341d5e204dad5bf0588d Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Wed, 30 May 2018 18:08:32 +0200
Subject: Work around H2 bug in OperationDAO.list()

---
 .../groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 0a465f2..1989764 100644
--- 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
@@ -150,11 +150,14 @@ public class OperationDatabaseDAO implements OperationDAO {
         // 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(Enum::name)
-                        .map(s -> "'" + s + "'")
+                        .map(e -> Integer.toString(e.ordinal()))
                         .collect(Collectors.joining(","));
+
         String sql = "SELECT * FROM Operation WHERE status IN (" + str + ")";
         Set<Operation> operations = new HashSet<>();
 
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 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/java/at/ac/tuwien/sepm/assignment')

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 38e4a1e7a3bd97b75cd20b5e781dd2feb8aa51b4 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sat, 2 Jun 2018 00:14:55 +0200
Subject: Remove debug statements from VehicleDAO.update()

---
 .../groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 535987f..ef963d4 100644
--- 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
@@ -123,8 +123,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                     if (rs.next()) {
                         // version changed, update it
                         versionId = rs.getLong(1);
-                        System.out.println("DEBUG: Changed version to " + versionId);
-                    } else System.out.println("Version stayed the same");
+                    }
                 }
             }
 
-- 
cgit v1.2.3-70-g09d2


From c7254f1c1f9509c6b9888e97838864eff2ebaaa2 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 31 May 2018 16:51:01 +0200
Subject: Fixed a bug where archive page would only be reloaded once after
 start of application

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java    | 6 ++++++
 .../einsatzverwaltung/controller/CreateOperationController.java     | 1 +
 2 files changed, 7 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 04f1dde..86a14f9 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
@@ -56,6 +56,12 @@ public class ArchiveOperationController {
 
     @FXML
     private void initialize() {
+        update();
+    }
+
+    public void update() {
+        archiveOperationFlowPane.getChildren().clear();
+        list.clear();
         try {
             list.addAll(operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED)));
         } catch (ServiceException e) {
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 7ee1f37..d2657b6 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
@@ -308,6 +308,7 @@ public class CreateOperationController {
     }
 
     public void onArchivLinkClicked() {
+        archiveOperationController.update();
         openArchivWindow();
     }
 
-- 
cgit v1.2.3-70-g09d2


From bc5cca601df4443d9a9d3e93343c0b93ae918429 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Sat, 2 Jun 2018 23:18:40 +0200
Subject: change DAO to work with new database schema #27844

---
 .../groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 1989764..b526d36 100644
--- 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
@@ -11,10 +11,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.springframework.lang.NonNull;
@@ -46,7 +46,7 @@ public class OperationDatabaseDAO implements OperationDAO {
             try (PreparedStatement pstmt = con.prepareStatement(sql)) {
                 pstmt.setString(1, o.opCode());
                 pstmt.setInt(2, o.severity().ordinal());
-                pstmt.setTimestamp(3, Timestamp.from(Objects.requireNonNull(o.created())));
+                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());
@@ -188,7 +188,7 @@ public class OperationDatabaseDAO implements OperationDAO {
                 .severity(Severity.valueOf(rs.getString("severity")))
                 .status(Status.valueOf(rs.getString("status")))
                 .vehicles(getVehiclesFromOperationId(operationId))
-                .created(rs.getTimestamp("created").toInstant())
+                .created((rs.getObject("created", OffsetDateTime.class)).toInstant())
                 .destination(rs.getString("destination"))
                 .additionalInfo(rs.getString("additionalInfo"))
                 .build();
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 91566c9a1e80c47ef93f8158df59564d2cdfdfdc Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Tue, 5 Jun 2018 11:33:53 +0200
Subject: Status display is only show if parameter is true.

---
 .../controller/VehiclePaneController.java          | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 35a4b4a..8a0bba3 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
@@ -56,10 +56,10 @@ public class VehiclePaneController {
      * * Set the displayed data of this VehiclePane.
      *
      * @param vehicle The data to display.
-     * @param showQualification If true, the most recent registration of vehicle will be searched
-     *     for the highest qualification.
+     * @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 showQualification) {
+    public void setData(Vehicle vehicle, boolean showStatusInfo) {
         txtType.setText(vehicle.type().name());
         String constrType = vehicle.constructionType().name();
         txtRooftype.setText(
@@ -72,7 +72,7 @@ public class VehiclePaneController {
             ivNEF.setImage(new Image("images/NotNEF.png"));
             txtNEF.setText("keine NEF-Halterung");
         }
-        if (showQualification) {
+        if (showStatusInfo) {
 
             Instant now = Instant.now();
             List<Registration> regs = vehicle.registrations();
@@ -92,18 +92,20 @@ public class VehiclePaneController {
             }
 
             txtQualification.setText(edu.get().name());
+
+            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");
+            }
         } else {
             txtQualification.setVisible(false);
             txtQualification.setManaged(false);
             ivQualification.setVisible(false);
             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");
+            txtStatus.setVisible(false);
         }
 
         this.data = vehicle;
-- 
cgit v1.2.3-70-g09d2


From ed3d2bf854baf673373e31330010265ef33d7e74 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 21:03:33 +0200
Subject: Extract code into CustomListItemController [#25963]

Code of VehiclePaneController and EmployeeListItemController
---
 .../controller/CustomListItemController.java       | 24 ++++++++++++++++++++++
 .../controller/EmployeeListItemController.java     |  7 +------
 .../controller/VehiclePaneController.java          | 19 +----------------
 3 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
new file mode 100644
index 0000000..79cf243
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java
@@ -0,0 +1,24 @@
+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/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
index 11b5626..47fbe80 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
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 @Scope("prototype")
-public class EmployeeListItemController {
+public class EmployeeListItemController extends CustomListItemController {
 
     @FXML private Label lblName;
     @FXML private Label lblQualification;
@@ -25,7 +25,6 @@ public class EmployeeListItemController {
     @FXML private ImageView imgDriver;
     @FXML private ImageView imgQualification;
 
-    private Node rootElement;
     private Employee employee;
 
     private Consumer<Employee> consumerEditEmployeeClicked;
@@ -69,10 +68,6 @@ public class EmployeeListItemController {
         return controller;
     }
 
-    public Node getRootElement() {
-        return rootElement;
-    }
-
     public Employee getEmployee() {
         return employee;
     }
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 8a0bba3..0981f3f 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
@@ -18,7 +18,7 @@ import javafx.scene.text.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class VehiclePaneController {
+public class VehiclePaneController extends CustomListItemController {
 
     private static Logger LOG = LoggerFactory.getLogger(VehiclePaneController.class);
 
@@ -41,13 +41,8 @@ public class VehiclePaneController {
     @FXML private Text txtQualification;
     @FXML private Text txtRooftype;
 
-    private Node rootElement;
     private Vehicle data;
 
-    public Node getRootElement() {
-        return rootElement;
-    }
-
     public Vehicle getData() {
         return data;
     }
@@ -110,16 +105,4 @@ public class VehiclePaneController {
 
         this.data = vehicle;
     }
-
-    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");
-        }
-    }
 }
-- 
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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 6cb6f7a17b7755a7442d38ae31113c2f37d98289 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:40:23 +0200
Subject: Return controller instead of employee only [#25963]

---
 .../einsatzverwaltung/controller/EmployeeListItemController.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 151dcae..ff5bf59 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,7 +30,7 @@ public class EmployeeListItemController extends CustomListItemController {
     private Employee employee;
 
     private Consumer<Employee> consumerEditEmployeeClicked;
-    private Consumer<Employee> consumerEmployeeClicked;
+    private Consumer<EmployeeListItemController> consumerEmployeeClicked;
 
     @FXML
     private void onEditEmployeeClicked() {
@@ -42,7 +42,7 @@ public class EmployeeListItemController extends CustomListItemController {
     @FXML
     private void onEmployeeClicked() {
         if (consumerEmployeeClicked != null) {
-            consumerEmployeeClicked.accept(employee);
+            consumerEmployeeClicked.accept(this);
         }
     }
 
@@ -94,7 +94,7 @@ public class EmployeeListItemController extends CustomListItemController {
         this.consumerEditEmployeeClicked = consumerEditEmployeeClicked;
     }
 
-    public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) {
+    public void setConsumerEmployeeClicked(Consumer<EmployeeListItemController> consumerEmployeeClicked) {
         this.consumerEmployeeClicked = consumerEmployeeClicked;
     }
 }
-- 
cgit v1.2.3-70-g09d2


From e7a77667e4f822058b6be15c7bb18b735e2d6755 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:43:20 +0200
Subject: Add onEmployeeClicked callback and select/deselect methods [#25963]

---
 .../controller/EmployeeListController.java         | 41 ++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 993735e..6d37379 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
@@ -5,6 +5,7 @@ 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.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import javafx.fxml.FXML;
@@ -22,19 +23,24 @@ public class EmployeeListController {
 
     @FXML private FlowPane flowPaneEmployeeList;
 
+    private Consumer<Employee> onEmployeeClicked;
+
     private final SpringFXMLLoader fxmlLoader;
     private Node rootElement;
+    private List<EmployeeListItemController> employeeListItemControllers;
 
     public EmployeeListController(SpringFXMLLoader fxmlLoader) {
         this.fxmlLoader = fxmlLoader;
+        this.employeeListItemControllers = new ArrayList<>();
     }
 
     public void setData(
             List<Employee> employeeList,
             Consumer<Employee> onEditEmployeeClicked,
-            Consumer<Employee> onEmployeeClicked) {
+            Consumer<EmployeeListItemController> onEmployeeClicked) {
 
         flowPaneEmployeeList.getChildren().clear();
+        employeeListItemControllers.clear();
         employeeList.forEach(
                 employee ->
                         addEmployeeToFlowPane(employee, onEditEmployeeClicked, onEmployeeClicked));
@@ -43,7 +49,7 @@ public class EmployeeListController {
     private void addEmployeeToFlowPane(
             Employee employee,
             Consumer<Employee> onEditEmployeeClicked,
-            Consumer<Employee> onEmployeeClicked) {
+            Consumer<EmployeeListItemController> onEmployeeClicked) {
         Insets listItemMargins = new Insets(0, 5, 10, 5);
 
         try {
@@ -52,18 +58,43 @@ public class EmployeeListController {
                             fxmlLoader, employee);
             Node rootElement = controller.getRootElement();
             flowPaneEmployeeList.getChildren().add(rootElement);
+            employeeListItemControllers.add(controller);
             FlowPane.setMargin(rootElement, listItemMargins);
             if (onEditEmployeeClicked != null) {
                 controller.setConsumerEditEmployeeClicked(onEditEmployeeClicked);
             }
             if (onEmployeeClicked != null) {
-                controller.setConsumerEmployeeClicked(onEmployeeClicked);
+                controller.setConsumerEmployeeClicked(
+                        employeeListItemController -> {
+                            onEmployeeClicked.accept(employeeListItemController);
+                            if (this.onEmployeeClicked != null) {
+                                this.onEmployeeClicked.accept(
+                                        employeeListItemController.getEmployee());
+                            }
+                        });
             }
         } catch (IOException e) {
             LOG.error("Could not create a new EmployeeListItem: {}", e);
         }
     }
 
+    private void setEmployeeSelected(Employee employee, boolean selected) {
+        employeeListItemControllers.forEach(
+                employeeListItemController -> {
+                    if (employeeListItemController.getEmployee().equals(employee)) {
+                        employeeListItemController.setSelected(selected);
+                    }
+                });
+    }
+
+    public void selectEmployee(Employee employee) {
+        setEmployeeSelected(employee, true);
+    }
+
+    public void deselectEmployee(Employee employee) {
+        setEmployeeSelected(employee, false);
+    }
+
     public static EmployeeListController createEmployeeListController(SpringFXMLLoader loader)
             throws IOException {
         FXMLWrapper<Object, EmployeeListController> wrapper =
@@ -77,4 +108,8 @@ public class EmployeeListController {
     public Node getRootElement() {
         return rootElement;
     }
+
+    public void setOnEmployeeClicked(Consumer<Employee> onEmployeeClicked) {
+        this.onEmployeeClicked = onEmployeeClicked;
+    }
 }
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 3cf1c09d69b3dbaa8e00d56641373d29663ca347 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:56:52 +0200
Subject: Rename callback names [#25963]

---
 .../controller/EmployeeListController.java          | 21 +++++++++++----------
 .../controller/EmployeeListItemController.java      |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 6d37379..19aa177 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
@@ -36,20 +36,21 @@ public class EmployeeListController {
 
     public void setData(
             List<Employee> employeeList,
-            Consumer<Employee> onEditEmployeeClicked,
-            Consumer<EmployeeListItemController> onEmployeeClicked) {
+            Consumer<Employee> onEmployeeClicked,
+            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
 
         flowPaneEmployeeList.getChildren().clear();
         employeeListItemControllers.clear();
         employeeList.forEach(
                 employee ->
-                        addEmployeeToFlowPane(employee, onEditEmployeeClicked, onEmployeeClicked));
+                        addEmployeeToFlowPane(
+                                employee, onEmployeeClicked, onEmployeeListItemClicked));
     }
 
     private void addEmployeeToFlowPane(
             Employee employee,
-            Consumer<Employee> onEditEmployeeClicked,
-            Consumer<EmployeeListItemController> onEmployeeClicked) {
+            Consumer<Employee> onEmployeeClicked,
+            Consumer<EmployeeListItemController> onEmployeeListItemClicked) {
         Insets listItemMargins = new Insets(0, 5, 10, 5);
 
         try {
@@ -60,13 +61,13 @@ public class EmployeeListController {
             flowPaneEmployeeList.getChildren().add(rootElement);
             employeeListItemControllers.add(controller);
             FlowPane.setMargin(rootElement, listItemMargins);
-            if (onEditEmployeeClicked != null) {
-                controller.setConsumerEditEmployeeClicked(onEditEmployeeClicked);
-            }
             if (onEmployeeClicked != null) {
-                controller.setConsumerEmployeeClicked(
+                controller.setConsumerEmployeeClicked(onEmployeeClicked);
+            }
+            if (onEmployeeListItemClicked != null) {
+                controller.setConsumerEmployeeListItemClicked(
                         employeeListItemController -> {
-                            onEmployeeClicked.accept(employeeListItemController);
+                            onEmployeeListItemClicked.accept(employeeListItemController);
                             if (this.onEmployeeClicked != null) {
                                 this.onEmployeeClicked.accept(
                                         employeeListItemController.getEmployee());
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 6fd0824..cf7644d 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
@@ -90,7 +90,7 @@ public class EmployeeListItemController extends CustomListItemController {
         this.consumerEmployeeClicked = consumerEmployeeClicked;
     }
 
-    public void setConsumerListItemEmployeeClicked(
+    public void setConsumerEmployeeListItemClicked(
             Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) {
         this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked;
     }
-- 
cgit v1.2.3-70-g09d2


From d4b4268764d855dbc4cf28827e704eaded5453c9 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 22:57:22 +0200
Subject: Overload setData method for only setting employeeClick callback
 [#25963]

---
 .../einsatzverwaltung/controller/EmployeeListController.java          | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 19aa177..9e097ce 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
@@ -34,6 +34,10 @@ public class EmployeeListController {
         this.employeeListItemControllers = new ArrayList<>();
     }
 
+    public void setData(List<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
+        setData(employeeList, onEmployeeClicked, null);
+    }
+
     public void setData(
             List<Employee> employeeList,
             Consumer<Employee> onEmployeeClicked,
-- 
cgit v1.2.3-70-g09d2


From e3b223975f7d455cf5444c959a10d8c05fb6e145 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:22:24 +0200
Subject: Refactor setEmployeeSelected and add deselectAllEmployees [#25963]

---
 .../controller/EmployeeListController.java                | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 9e097ce..c636edc 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
@@ -84,12 +84,10 @@ public class EmployeeListController {
     }
 
     private void setEmployeeSelected(Employee employee, boolean selected) {
-        employeeListItemControllers.forEach(
-                employeeListItemController -> {
-                    if (employeeListItemController.getEmployee().equals(employee)) {
-                        employeeListItemController.setSelected(selected);
-                    }
-                });
+        employeeListItemControllers
+                .stream()
+                .filter(controller -> controller.getEmployee().equals(employee))
+                .forEach(controller -> controller.setSelected(selected));
     }
 
     public void selectEmployee(Employee employee) {
@@ -100,6 +98,11 @@ public class EmployeeListController {
         setEmployeeSelected(employee, false);
     }
 
+    public void deselectAllEmployees() {
+        employeeListItemControllers.forEach(
+                employeeListItemController -> employeeListItemController.setSelected(false));
+    }
+
     public static EmployeeListController createEmployeeListController(SpringFXMLLoader loader)
             throws IOException {
         FXMLWrapper<Object, EmployeeListController> wrapper =
-- 
cgit v1.2.3-70-g09d2


From 896df03b0891aa1e7cf8fa4759ebea1dce2225e8 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:24:11 +0200
Subject: Call select/deselect on click actions in ManageEmployeesCtrl [#25963]

---
 .../einsatzverwaltung/controller/ManageEmployeesController.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 655c7da..ed43c13 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
@@ -48,7 +48,6 @@ public class ManageEmployeesController {
             containerHeader.getChildren().add(filterEmployeesController.getRootElement());
             filterEmployeesController.setOnFilterTextChangedListener(this::updateEmployeeList);
             filterEmployeesController.setOnAddEmployeeClickedListener(this::openAddEmployee);
-
             updateEmployeeList();
 
         } catch (IOException e) {
@@ -57,10 +56,13 @@ public class ManageEmployeesController {
     }
 
     private void openAddEmployee() {
+        employeeListController.deselectAllEmployees();
         openEmployee(null);
     }
 
     private void openEditEmployee(Employee employee) {
+        employeeListController.deselectAllEmployees();
+        employeeListController.selectEmployee(employee);
         openEmployee(employee);
     }
 
@@ -99,8 +101,7 @@ public class ManageEmployeesController {
                                                             .toLowerCase()
                                                             .contains(searchString.toLowerCase()))
                             .collect(Collectors.toList()),
-                    this::openEditEmployee,
-                    null);
+                    this::openEditEmployee);
 
         } catch (ServiceException e) {
             LOG.error("Could not fetch employee list: {}", e);
-- 
cgit v1.2.3-70-g09d2


From d1b11683696847ac0588aabc5a9d57b732ebbfed Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:30:22 +0200
Subject: Overload setData to make specifying callbacks optional [#25963]

---
 .../einsatzverwaltung/controller/EmployeeListController.java          | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 c636edc..77b368c 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
@@ -34,6 +34,10 @@ public class EmployeeListController {
         this.employeeListItemControllers = new ArrayList<>();
     }
 
+    public void setData(List<Employee> employeeList) {
+        setData(employeeList, null, null);
+    }
+
     public void setData(List<Employee> employeeList, Consumer<Employee> onEmployeeClicked) {
         setData(employeeList, onEmployeeClicked, null);
     }
-- 
cgit v1.2.3-70-g09d2


From b1e9fe01fa3f60ee2469cba8068c9e65a56402ba Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:37:29 +0200
Subject: Remove unused isEditButtonVisible flag and corresponding code
 [#25963]

---
 .../einsatzverwaltung/controller/EmployeeListItemController.java | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 cf7644d..a4aa091 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
@@ -25,7 +25,6 @@ public class EmployeeListItemController extends CustomListItemController {
     @FXML private ImageView imgPilot;
     @FXML private ImageView imgDriver;
     @FXML private ImageView imgQualification;
-    @FXML private Button btnEdit;
 
     private Employee employee;
 
@@ -43,10 +42,6 @@ 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());
@@ -59,10 +54,6 @@ 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(
-- 
cgit v1.2.3-70-g09d2


From e3334f6ff75ab3e3fc69d91e1599fd63edac11bd Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:49:21 +0200
Subject: Change scope to prototype as multiple EmployeeLists can occur
 [#25963]

---
 .../groupphase/einsatzverwaltung/controller/EmployeeListController.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 77b368c..dc808a4 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
@@ -14,9 +14,11 @@ 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(MethodHandles.lookup().lookupClass());
-- 
cgit v1.2.3-70-g09d2


From a6f0ea18954cd7ce74a874ef9919dd89d828883c Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 6 Jun 2018 23:55:23 +0200
Subject: Remove unused import statement [#25963]

---
 .../einsatzverwaltung/controller/EmployeeListItemController.java         | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 a4aa091..7b5910a 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,7 +7,6 @@ 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;
-- 
cgit v1.2.3-70-g09d2


From db0ad8c930f80a424cd8ff281aa7f0bb0a0968ac Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Mon, 11 Jun 2018 23:47:12 +0200
Subject: fix whole program being closed upon successful registration #25963

---
 .../einsatzverwaltung/controller/RegistrationWindowController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 a54d945..6768162 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
@@ -31,7 +31,6 @@ import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -181,8 +180,9 @@ public class RegistrationWindowController {
 
             registrationService.add(chosenVehicle.id(), registrations);
             chosenEmployees.clear();
-            ((Stage) lVehicles.getScene().getWindow()).close();
-
+            // ((Stage) lVehicles.getScene().getWindow()).close();
+            this.setVisible(false);
+            createOperationController.setVisible(true);
         } catch (InvalidVehicleException e) {
             // NOT THROWN ANYWHERE RIGHT NOW
             LOG.info(
-- 
cgit v1.2.3-70-g09d2


From f66e6b22e3d31d56fe92d03281de12731956f51e Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Mon, 11 Jun 2018 23:47:54 +0200
Subject: fix update only occurring on program startup #25963

---
 .../controller/RegistrationWindowController.java              | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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..33c77af 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
@@ -110,6 +110,7 @@ public class RegistrationWindowController {
                     if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) {
                         chosenVehicle = tvVehicles.getSelectionModel().getSelectedItem();
                         if (chosenVehicle == null) {
+                            lVehicles.setText("");
                             return;
                         }
                         lVehicles.setText(chosenVehicle.name());
@@ -220,6 +221,16 @@ public class RegistrationWindowController {
     }
 
     public void setVisible(boolean b) {
+        if (b) {
+            try {
+                tvVehicles.setItems(
+                        FXCollections.observableArrayList(
+                                vehicleService.list(EnumSet.of(Status.ABGEMELDET))));
+                tvEmployees.setItems(FXCollections.observableArrayList(employeeService.list()));
+            } catch (ServiceException e) {
+                LOG.error("ServiceException while getting employees and vehicles ", e);
+            }
+        }
         this.registrationWindowVB.setVisible(b);
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 74ddaa7804eb5721ef9cbe641f01ff39b904017d Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Tue, 12 Jun 2018 13:42:09 +0200
Subject: Hotfix: Status was not displayed if the vehicle had no registrations.

---
 .../einsatzverwaltung/controller/VehiclePaneController.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 0981f3f..e0ce007 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
@@ -68,6 +68,12 @@ public class VehiclePaneController extends CustomListItemController {
             txtNEF.setText("keine NEF-Halterung");
         }
         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();
@@ -87,13 +93,6 @@ public class VehiclePaneController extends CustomListItemController {
             }
 
             txtQualification.setText(edu.get().name());
-
-            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");
-            }
         } else {
             txtQualification.setVisible(false);
             txtQualification.setManaged(false);
-- 
cgit v1.2.3-70-g09d2


From f1ec6a222ac82275fb2aaaaa7e93764fa9500b38 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 12 Jun 2018 19:19:46 +0200
Subject: Add TODO comments as feedback which occurred during JourFixe [#28535]

---
 .../sepm/assignment/groupphase/application/MainApplication.java     | 2 ++
 .../einsatzverwaltung/controller/CreateCarController.java           | 3 ++-
 .../einsatzverwaltung/controller/CreateNewEmployeeController.java   | 6 ++++--
 .../groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java       | 3 +++
 .../groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java   | 1 +
 .../groupphase/einsatzverwaltung/service/VehicleServiceImpl.java    | 1 +
 .../service/RegistrationServiceIntegrationTest.java                 | 2 ++
 7 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 d8365a7..d1569f6 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
@@ -27,6 +27,8 @@ public class MainApplication extends Application {
         primaryStage.centerOnScreen();
         primaryStage.setOnCloseRequest(event -> 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/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
index 7e964cb..bc6b0bc 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
@@ -128,7 +128,8 @@ public class CreateCarController {
                 vehicleService.update(vehicle);
                 setToStart();
             } catch (InvalidVehicleException e) {
-                LOG.error("Invalid Vehicle: {}", e);
+                // TODO: Validation-Errors should be logged with log level debug only (like here)
+                LOG.debug("Invalid Vehicle: {}", e);
                 createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
                 setToStart();
                 return;
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
index 15282cc..ecca44b 100644
--- 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
@@ -104,7 +104,8 @@ public class CreateNewEmployeeController {
                 employeeService.add(employee);
             }
         } catch (InvalidEmployeeException e) {
-            LOG.error("Invalid Employee: {}", e);
+            // TODO: on validation errors, only log at debug level (feedback)
+            LOG.debug("Invalid Employee: {}", e);
 
             showModalDialogWithOkButton(
                     AlertType.ERROR,
@@ -112,7 +113,8 @@ public class CreateNewEmployeeController {
                     "Mindestens eines der Eingabefelder haben einen ungültigen Wert!");
             return;
         } catch (ServiceException e) {
-            LOG.error("Employee could not be saved: {}", e);
+            // TODO: when errors occur, exceptions should be logged. Do not use "{}" (feedback)
+            LOG.error("Employee could not be saved: ", e);
 
             showModalDialogWithOkButton(
                     AlertType.ERROR,
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
index b9f2079..8c8d8b2 100644
--- 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
@@ -19,6 +19,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class EmployeeDatabaseDAO implements EmployeeDAO {
 
+    // TODO [optional] either implement own interface or use spring disposable
+    // bean to close prepared statements (feedback)
+
     private static final String INSERT_EMPLOYEE_VERSION =
             "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
                     + "VALUES(?, ?, ?, ?, ?)";
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
index 700a5de..81261ee 100644
--- 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
@@ -30,6 +30,7 @@ public class EmployeeServiceImpl implements EmployeeService {
         try {
             return employeePersistence.add(employee);
         } catch (PersistenceException e) {
+            // TODO: Do not practice "log and rethrow"! (feedback)
             LOG.error("PersistenceException while adding Employee. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
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
index 026bca6..527825e 100644
--- 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
@@ -93,6 +93,7 @@ public class VehicleServiceImpl implements VehicleService {
                 break;
             case NAH:
                 if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
+                    // TODO: eventually change to LOG.debug (feedback)
                     LOG.info("Invalid Vehicle: NAH cannot have a medium roof");
                     throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
                 } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
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
index 0e8004c..51b7621 100644
--- 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
@@ -50,4 +50,6 @@ public class RegistrationServiceIntegrationTest extends JdbcTestCase {
             throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
         RegistrationServiceTest.addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO);
     }
+
+    // TODO: also test real integration, e.g. add registration and delete afterwards (feedback)
 }
-- 
cgit v1.2.3-70-g09d2


From 195745e68723a40c7bc1e93f049a8c511ce817ff Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 12 Jun 2018 13:54:38 +0200
Subject: Close database connection when program terminates

---
 .../sepm/assignment/groupphase/application/MainApplication.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 d1569f6..87daea4 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,7 @@
 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.util.JDBCConnectionManager;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -25,7 +26,13 @@ public class MainApplication extends Application {
     public void start(Stage primaryStage) throws Exception {
         primaryStage.setTitle("Einsatz erstellen");
         primaryStage.centerOnScreen();
-        primaryStage.setOnCloseRequest(event -> Platform.exit());
+        primaryStage.setOnCloseRequest(
+                event -> {
+                    final var jdbcConnectionManager =
+                            configApplicationContext.getBean(JDBCConnectionManager.class);
+                    jdbcConnectionManager.closeConnection();
+                    Platform.exit();
+                });
 
         // TODO: close connection on program exit (feedback)
 
-- 
cgit v1.2.3-70-g09d2


From cd26f62a3997fdc6b3ad622c65a57a1977275d27 Mon Sep 17 00:00:00 2001
From: Andreas Weninger <e01526989@student.tuwien.ac.at>
Date: Wed, 13 Jun 2018 17:24:30 +0200
Subject: Small fixes.

---
 .../einsatzverwaltung/controller/CreateOperationController.java        | 3 +++
 .../groupphase/einsatzverwaltung/service/OperationServiceImpl.java     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 57d9611..9648d8a 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
@@ -162,6 +162,9 @@ public class CreateOperationController {
                                     }
                                 });
 
+                if (chosenVehicles.stream().anyMatch(v -> v.id() == vehicle.id()))
+                    controller.setSelected(true);
+
                 fpVehicles.getChildren().add(controller.getRootElement());
             }
         } catch (ServiceException | IOException | InvalidOperationException e) {
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
index 853e499..d84da3d 100644
--- 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
@@ -248,7 +248,7 @@ public class OperationServiceImpl implements OperationService {
 
             return operations;
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing operations. Message: {}", e.getMessage());
+            LOG.error("PersistenceException while listing operations. Message: {}", e);
             throw new ServiceException(e);
         } catch (InvalidOperationException e) {
             // database returned invalid values
-- 
cgit v1.2.3-70-g09d2


From 8e9d7d1cb5ffd184ee63706350fa664aa9007fa6 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Wed, 13 Jun 2018 18:07:34 +0200
Subject: Fix Vehicle status validation in OperationService

---
 .../service/OperationServiceImpl.java                 | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index d84da3d..4c71414 100644
--- 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
@@ -70,6 +70,10 @@ public class OperationServiceImpl implements OperationService {
             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);
@@ -131,11 +135,10 @@ public class OperationServiceImpl implements OperationService {
                 try {
                     Vehicle v = vehicleDAO.get(id);
                     VehicleServiceImpl.validateVehicle(v);
-                    if (v.status() == Vehicle.Status.ABGEMELDET) {
-                        LOG.info("Invalid Vehicle: Requested vehicle is not active");
-                        throw new InvalidVehicleException(
-                                "Kann keine inaktiven Fahrzeuge anfordern");
-                    }
+                    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) {
@@ -272,12 +275,6 @@ public class OperationServiceImpl implements OperationService {
                 throw new InvalidOperationException("Fahrzeug " + v.name() + " ist invalid" + e);
             }
 
-            if (v.status() != Vehicle.Status.FREI_FUNK && v.status() != Vehicle.Status.FREI_WACHE) {
-                LOG.info("Invalid Operation: Vehicle \"{}\" not available", v.name());
-                throw new InvalidOperationException(
-                        "Fahrzeug nicht verfügbar (" + v.status() + ")");
-            }
-
             // TODO: validate if NEF/RTW/NAH conditions?
         }
 
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 9ae0fabd9ea805ea7a9d112b7769d7163b7e550b Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 3 Jun 2018 12:51:43 +0200
Subject: Resolved some warnings {#27299]

---
 .../DetailArchiveOperationController.java          | 36 ++++------------------
 .../controller/OperationInArchiveController.java   |  2 +-
 2 files changed, 7 insertions(+), 31 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 3c50c65..0376579 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
@@ -6,6 +6,7 @@ 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.Objects;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
@@ -26,8 +27,7 @@ public class DetailArchiveOperationController {
         this.fxmlLoader = fxmlLoader;
     }
 
-    public static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader)
-            throws IOException {
+    static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader) throws IOException {
         FXMLWrapper<Object, DetailArchiveOperationController> wrapper =
                 fxmlLoader.loadAndWrap(
                         "/fxml/DetailArchiveOperation.fxml",
@@ -47,7 +47,7 @@ public class DetailArchiveOperationController {
     private Node rootElement;
 
     public void set(Vehicle vehicle) {
-        VehiclePaneController controller = null;
+        VehiclePaneController controller;
         try {
             controller = VehiclePaneController.createVehiclePane();
             controller.setData(vehicle, false);
@@ -61,8 +61,9 @@ public class DetailArchiveOperationController {
             alert.showAndWait();
         }
         try {
-            for (int i = 0; i < vehicle.registrations().size(); i++) {
-                Employee employee = vehicle.registrations().get(i).employee();
+            for (int i = 0; i < Objects.requireNonNull(vehicle.registrations()).size(); i++) {
+                Employee employee =
+                        Objects.requireNonNull(vehicle.registrations()).get(i).employee();
 
                 EmployeeListItemController employeeListItemController =
                         EmployeeListItemController.createEmployeeListItemController(
@@ -78,29 +79,4 @@ public class DetailArchiveOperationController {
             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/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
index 935b2fe..d1b325c 100644
--- 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
@@ -20,7 +20,7 @@ public class OperationInArchiveController {
     @FXML private Text txtDate;
     @FXML private Text txtOpCode;
 
-    public static OperationInArchiveController create() throws IOException {
+    static OperationInArchiveController create() throws IOException {
         FXMLLoader fxmlLoader =
                 new FXMLLoader(
                         OperationInArchiveController.class.getResource(
-- 
cgit v1.2.3-70-g09d2


From 5459e92f39c02fa0162902ee8b37defdf324c543 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Wed, 13 Jun 2018 19:21:49 +0200
Subject: Revert "fix update only occurring on program startup #25963"

This reverts commit f66e6b22e3d31d56fe92d03281de12731956f51e.
---
 .../controller/RegistrationWindowController.java              | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 33c77af..6768162 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
@@ -110,7 +110,6 @@ public class RegistrationWindowController {
                     if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) {
                         chosenVehicle = tvVehicles.getSelectionModel().getSelectedItem();
                         if (chosenVehicle == null) {
-                            lVehicles.setText("");
                             return;
                         }
                         lVehicles.setText(chosenVehicle.name());
@@ -221,16 +220,6 @@ public class RegistrationWindowController {
     }
 
     public void setVisible(boolean b) {
-        if (b) {
-            try {
-                tvVehicles.setItems(
-                        FXCollections.observableArrayList(
-                                vehicleService.list(EnumSet.of(Status.ABGEMELDET))));
-                tvEmployees.setItems(FXCollections.observableArrayList(employeeService.list()));
-            } catch (ServiceException e) {
-                LOG.error("ServiceException while getting employees and vehicles ", e);
-            }
-        }
         this.registrationWindowVB.setVisible(b);
     }
 }
-- 
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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 212651960f181afe277817f6ea9204c7576416d6 Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Tue, 5 Jun 2018 12:29:25 +0200
Subject: implement vehicle pane for detail view of vehicles #27301

---
 .../controller/CreateCarController.java            | 143 +++++++++++++--------
 1 file changed, 86 insertions(+), 57 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 bc6b0bc..141661d 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
@@ -5,15 +5,20 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Con
 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.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.lang.invoke.MethodHandles;
 import java.util.EnumSet;
+import java.util.EventListener;
+import java.util.LinkedList;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
+import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.geometry.HPos;
 import javafx.geometry.Orientation;
@@ -23,6 +28,7 @@ import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 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 javafx.stage.Stage;
@@ -34,12 +40,12 @@ import org.springframework.stereotype.Controller;
 public class CreateCarController {
 
     @FXML private AnchorPane createCarAP;
-    @FXML private ChoiceBox<String> cmb_Ctyp;
-    @FXML private ChoiceBox<String> cmb_typ;
-    @FXML private Button btn_cancel;
-    @FXML private Button btn_create;
-    @FXML private CheckBox cbx_NEF;
-    @FXML private FlowPane fp_vehicleList;
+    @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(MethodHandles.lookup().lookupClass());
@@ -47,6 +53,8 @@ public class CreateCarController {
     private boolean update = false;
     private long vid = -1;
 
+    private Vehicle chooseVehicle;
+
     public CreateCarController(
             CreateOperationController createOperationController, VehicleService vehicleService) {
         this.createOperationController = createOperationController;
@@ -55,7 +63,7 @@ public class CreateCarController {
 
     @FXML
     private void initialize() {
-        cmb_Ctyp.setItems(
+        cmbCtype.setItems(
                 FXCollections.observableArrayList(
                         Stream.of(
                                         ConstructionType.NORMAL,
@@ -63,8 +71,8 @@ public class CreateCarController {
                                         ConstructionType.HOCHDACH)
                                 .map(Enum::toString)
                                 .collect(Collectors.toList())));
-        cmb_Ctyp.setValue(ConstructionType.NORMAL.toString());
-        cmb_typ.setItems(
+        cmbCtype.setValue(ConstructionType.NORMAL.toString());
+        cmbTyp.setItems(
                 FXCollections.observableArrayList(
                         Stream.of(
                                         VehicleType.BKTW,
@@ -75,13 +83,10 @@ public class CreateCarController {
                                         VehicleType.NAH)
                                 .map(Enum::toString)
                                 .collect(Collectors.toList())));
-        cmb_typ.setValue(VehicleType.BKTW.toString());
-        vehicleListFP();
-    }
+        cmbTyp.setValue(VehicleType.BKTW.toString());
+        // vehicleListFP();
 
-    @FXML
-    private void onCancelClicked() {
-        ((Stage) btn_cancel.getScene().getWindow()).close();
+        updateVehiclePane();
     }
 
     @FXML
@@ -94,7 +99,7 @@ public class CreateCarController {
                             .type(parseType())
                             .name("")
                             .status(Status.ABGEMELDET)
-                            .hasNef(cbx_NEF.isSelected())
+                            .hasNef(cbxNEF.isSelected())
                             .build();
             try {
                 vehicleService.add(vehicle);
@@ -123,10 +128,11 @@ public class CreateCarController {
                                 .type(parseType())
                                 .name("")
                                 .status(Status.ABGEMELDET)
-                                .hasNef(cbx_NEF.isSelected())
+                                .hasNef(cbxNEF.isSelected())
                                 .build();
                 vehicleService.update(vehicle);
                 setToStart();
+                chooseVehicle=null;
             } catch (InvalidVehicleException e) {
                 // TODO: Validation-Errors should be logged with log level debug only (like here)
                 LOG.debug("Invalid Vehicle: {}", e);
@@ -144,21 +150,22 @@ public class CreateCarController {
                     "Bearbiten Erfolgreich",
                     "Auto wurde erfolgreich bearbeitet");
         }
-        vehicleListFP();
+
+        updateVehiclePane();
     }
 
     private ConstructionType parseConstructionType() {
-        if (cmb_Ctyp.getSelectionModel().getSelectedItem() == null) {
+        if (cmbCtype.getSelectionModel().getSelectedItem() == null) {
             return ConstructionType.NORMAL;
         }
-        return ConstructionType.valueOf(cmb_Ctyp.getSelectionModel().getSelectedItem().toString());
+        return ConstructionType.valueOf(cmbCtype.getSelectionModel().getSelectedItem().toString());
     }
 
     private VehicleType parseType() {
-        if (cmb_typ.getSelectionModel().getSelectedItem() == null) {
+        if (cmbTyp.getSelectionModel().getSelectedItem() == null) {
             return VehicleType.BKTW;
         }
-        return VehicleType.valueOf(cmb_typ.getSelectionModel().getSelectedItem().toString());
+        return VehicleType.valueOf(cmbTyp.getSelectionModel().getSelectedItem().toString());
     }
 
     private void createComplete(AlertType alertType, String headerText, String contentText) {
@@ -167,55 +174,77 @@ public class CreateCarController {
         alert.showAndWait();
     }
 
-    private void vehicleListFP() {
-        Set<Vehicle> vehicleList = null;
-        fp_vehicleList.getChildren().clear();
-        try {
-            vehicleList = vehicleService.list(EnumSet.range(Status.ABGEMELDET, Status.FREI_FUNK));
-        } catch (ServiceException e) {
-            e.printStackTrace();
-        }
-
-        fp_vehicleList.setOrientation(Orientation.HORIZONTAL);
-        fp_vehicleList.setColumnHalignment(HPos.LEFT); // align labels on left
-        fp_vehicleList.setPrefWrapLength(200); // preferred height = 200
-
-        for (Vehicle v : vehicleList) {
-            Button b = new Button(v.name());
-            b.setOnAction(event -> updateVehicle(v));
-            fp_vehicleList.getChildren().add(b);
-        }
-        fp_vehicleList.setVisible(true);
-    }
 
     private void setToStart() {
-        btn_create.setText("Erstellen");
-        cbx_NEF.setSelected(false);
-        cmb_typ.setValue(VehicleType.BKTW.name());
-        cmb_Ctyp.setValue(ConstructionType.NORMAL.name());
+        btnCreate.setText("Erstellen");
+        cbxNEF.setSelected(false);
+        cmbTyp.setValue(VehicleType.BKTW.name());
+        cmbCtype.setValue(ConstructionType.NORMAL.name());
         update = false;
     }
 
     private void updateVehicle(Vehicle vehicle) {
-        cmb_Ctyp.setValue(vehicle.constructionType().name());
-        cmb_typ.setValue(vehicle.type().name());
-        cbx_NEF.setSelected(vehicle.hasNef());
-        btn_create.setText("Speichern");
+
+        cmbCtype.setValue(vehicle.constructionType().name());
+        cmbTyp.setValue(vehicle.type().name());
+        cbxNEF.setSelected(vehicle.hasNef());
+        btnCreate.setText("Speichern");
         vid = vehicle.id();
         update = true;
-    }
-
-    @FXML
-    public void cancelAction(ActionEvent actionEvent) {
-        setToStart();
+        chooseVehicle = vehicle;
     }
 
     public void setVisible(boolean b) {
         createCarAP.setVisible(b);
     }
-
-    public void backToMain() {
+    @FXML
+    private void backToMain() {
         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);
+                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("Error while updating list.", e);
+
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText(e.getMessage());
+            alert.showAndWait();
+        }
+    }
 }
-- 
cgit v1.2.3-70-g09d2


From 5933cecd44bf56e51a51eb67527d173151aeb3aa Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Thu, 14 Jun 2018 14:19:30 +0200
Subject: space between Vehicles #27301

---
 .../einsatzverwaltung/controller/CreateCarController.java   | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 141661d..5c55a95 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
@@ -5,23 +5,17 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Con
 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.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.lang.invoke.MethodHandles;
 import java.util.EnumSet;
-import java.util.EventListener;
-import java.util.LinkedList;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
-import javafx.event.Event;
 import javafx.fxml.FXML;
-import javafx.geometry.HPos;
-import javafx.geometry.Orientation;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
@@ -31,7 +25,6 @@ import javafx.scene.control.ChoiceBox;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
-import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -63,6 +56,7 @@ public class CreateCarController {
 
     @FXML
     private void initialize() {
+        fpVehicleList.setHgap(5);
         cmbCtype.setItems(
                 FXCollections.observableArrayList(
                         Stream.of(
@@ -84,7 +78,6 @@ public class CreateCarController {
                                 .map(Enum::toString)
                                 .collect(Collectors.toList())));
         cmbTyp.setValue(VehicleType.BKTW.toString());
-        // vehicleListFP();
 
         updateVehiclePane();
     }
@@ -132,7 +125,7 @@ public class CreateCarController {
                                 .build();
                 vehicleService.update(vehicle);
                 setToStart();
-                chooseVehicle=null;
+                chooseVehicle = null;
             } catch (InvalidVehicleException e) {
                 // TODO: Validation-Errors should be logged with log level debug only (like here)
                 LOG.debug("Invalid Vehicle: {}", e);
@@ -174,7 +167,6 @@ public class CreateCarController {
         alert.showAndWait();
     }
 
-
     private void setToStart() {
         btnCreate.setText("Erstellen");
         cbxNEF.setSelected(false);
@@ -197,6 +189,7 @@ public class CreateCarController {
     public void setVisible(boolean b) {
         createCarAP.setVisible(b);
     }
+
     @FXML
     private void backToMain() {
         this.setVisible(false);
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 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/java/at/ac/tuwien/sepm/assignment')

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 6aa57486a2e34f76e88d403fe8363c6f45b68130 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 14:48:58 +0200
Subject: Remove finally block, reset autocommit in EmployeeDatabaseDAO
 [#27305]

---
 .../einsatzverwaltung/dao/EmployeeDatabaseDAO.java | 31 +++++++---------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 8c8d8b2..74e407f 100644
--- 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
@@ -85,6 +85,7 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
                     try (ResultSet resultSetEmployee = insertEmployee.getGeneratedKeys()) {
                         if (resultSetEmployee.next()) {
                             connection.commit();
+                            connection.setAutoCommit(true);
                             return resultSetEmployee.getLong(1);
                         }
                     }
@@ -94,20 +95,8 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
             throw new PersistenceException("Employee was not updated");
 
         } catch (SQLException e) {
-            try {
-                if (savepoint != null) {
-                    connection.rollback(savepoint);
-                }
-            } catch (SQLException e1) {
-                throw new PersistenceException(e);
-            }
+            rollbackAndEnableAutoCommit(savepoint);
             throw new PersistenceException(e);
-        } finally {
-            try {
-                connection.setAutoCommit(true);
-            } catch (SQLException e) {
-                throw new PersistenceException(e);
-            }
         }
     }
 
@@ -137,6 +126,7 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
 
                     if (affectedRows == 1) {
                         connection.commit();
+                        connection.setAutoCommit(true);
                     } else {
                         throw new ElementNotFoundException(
                                 "element not found with id: " + employee.id());
@@ -145,16 +135,15 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
             }
 
         } catch (SQLException e) {
-            try {
-                if (savepoint != null) {
-                    connection.rollback(savepoint);
-                }
-            } catch (SQLException e1) {
-                throw new PersistenceException(e);
-            }
+            rollbackAndEnableAutoCommit(savepoint);
             throw new PersistenceException(e);
-        } finally {
+        }
+    }
+
+    private void rollbackAndEnableAutoCommit(Savepoint savepoint) throws PersistenceException {
+        if (savepoint != null) {
             try {
+                connection.rollback(savepoint);
                 connection.setAutoCommit(true);
             } catch (SQLException e) {
                 throw new PersistenceException(e);
-- 
cgit v1.2.3-70-g09d2


From d5e8f8559f59a43b6d5907ee2143713d37ae68b4 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 14:49:30 +0200
Subject: Remove finally block, reset autocommit in RegistrationDB-DAO [#27305]

---
 .../einsatzverwaltung/dao/RegistrationDatabaseDAO.java        | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 59f8e52..c3b1227 100644
--- 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
@@ -83,23 +83,16 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
             updateVehicle.executeUpdate();
 
             connection.commit();
+            connection.setAutoCommit(true);
             return returnValues;
         } catch (SQLException e) {
             try {
                 connection.rollback();
+                connection.setAutoCommit(true);
             } catch (SQLException e1) {
                 LOG.error("Rollback failed! Error message: {}", e.getMessage());
             }
             throw new PersistenceException(e);
-        } finally {
-            try {
-                connection.setAutoCommit(true);
-            } catch (SQLException e) {
-                LOG.error(
-                        "Setting back AutoCommit to false failed! Error message: {}",
-                        e.getMessage());
-                // SonarLint insists on me not throwing anything here...
-            }
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 7165549f2e8be44e4e367df4761e0a33eb140e92 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 14:49:57 +0200
Subject: Remove finally block, reset autocommit in VehicleDatabaseDAO [#27305]

---
 .../einsatzverwaltung/dao/VehicleDatabaseDAO.java  | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index ef963d4..96703b1 100644
--- 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
@@ -11,6 +11,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Savepoint;
 import java.sql.Statement;
 import java.util.HashSet;
 import java.util.Set;
@@ -37,9 +38,12 @@ public class VehicleDatabaseDAO implements VehicleDAO {
         String name = "";
         int id = -1;
         int version = -1;
+        Connection connection = null;
+        Savepoint savepoint = null;
         try {
-            Connection connection = jdbcConnectionManager.getConnection();
+            connection = jdbcConnectionManager.getConnection();
             connection.setAutoCommit(false);
+            savepoint = connection.setSavepoint();
             try (PreparedStatement p1 =
                     connection.prepareStatement(query1, PreparedStatement.RETURN_GENERATED_KEYS)) {
 
@@ -82,11 +86,26 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             connection.commit();
             connection.setAutoCommit(true);
         } catch (SQLException e) {
+            rollbackAndEnableAutoCommit(connection, savepoint);
             throw new PersistenceException(e);
         }
         return id;
     }
 
+    private void rollbackAndEnableAutoCommit(Connection connection, Savepoint savepoint)
+            throws PersistenceException {
+        try {
+            if (connection != null) {
+                if (savepoint != null) {
+                    connection.rollback(savepoint);
+                }
+                connection.setAutoCommit(true);
+            }
+        } catch (SQLException e1) {
+            throw new PersistenceException(e1);
+        }
+    }
+
     @Override
     public void update(Vehicle v) throws ElementNotFoundException, PersistenceException {
         String sql = "SELECT version FROM Vehicle WHERE id = ?";
@@ -97,10 +116,12 @@ public class VehicleDatabaseDAO implements VehicleDAO {
 
         long versionId;
 
+        Connection con = null;
+        Savepoint savepoint = null;
         try {
-            Connection con = jdbcConnectionManager.getConnection();
+            con = jdbcConnectionManager.getConnection();
             con.setAutoCommit(false);
-
+            savepoint = con.setSavepoint();
             try (PreparedStatement pstmt = con.prepareStatement(sql)) {
                 pstmt.setLong(1, v.id());
 
@@ -137,6 +158,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             con.commit();
             con.setAutoCommit(true);
         } catch (SQLException e) {
+            rollbackAndEnableAutoCommit(con, savepoint);
             throw new PersistenceException(e);
         }
     }
-- 
cgit v1.2.3-70-g09d2


From 7a07f16351069a980f66ebfeca10c589c11aa527 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:03:30 +0200
Subject: Remove all logging from EmployeeServiceImpl #27033

---
 .../einsatzverwaltung/service/EmployeeServiceImpl.java         | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 81261ee..31b5acd 100644
--- 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
@@ -8,15 +8,11 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeExceptio
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class EmployeeServiceImpl implements EmployeeService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(EmployeeServiceImpl.class);
-
     private final EmployeeDAO employeePersistence;
 
     public EmployeeServiceImpl(EmployeeDAO employeePersistence) {
@@ -30,8 +26,6 @@ public class EmployeeServiceImpl implements EmployeeService {
         try {
             return employeePersistence.add(employee);
         } catch (PersistenceException e) {
-            // TODO: Do not practice "log and rethrow"! (feedback)
-            LOG.error("PersistenceException while adding Employee. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -44,9 +38,6 @@ public class EmployeeServiceImpl implements EmployeeService {
             employeePersistence.update(employee);
             return employee;
         } catch (ElementNotFoundException | PersistenceException e) {
-            LOG.error(
-                    "ElementNotFoundException or PersistenceException while updating Employee. Message: {}",
-                    e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -57,7 +48,6 @@ public class EmployeeServiceImpl implements EmployeeService {
         try {
             return employeePersistence.list();
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing Employees. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
-- 
cgit v1.2.3-70-g09d2


From 0a5113970030210c7fbb66f47df9b85caead7a60 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:03:50 +0200
Subject: Add UnsupportedOperationException() for unsupported operation #27033

---
 .../groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 31b5acd..cf054c3 100644
--- 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
@@ -53,5 +53,7 @@ public class EmployeeServiceImpl implements EmployeeService {
     }
 
     @Override
-    public void remove(long id) throws InvalidEmployeeException, ServiceException {}
+    public void remove(long id) throws InvalidEmployeeException, ServiceException {
+        throw new UnsupportedOperationException();
+    }
 }
-- 
cgit v1.2.3-70-g09d2


From dc6f5a0fdd481fe6934c6aebe3636060582fb8bc Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:23:32 +0200
Subject: Remove all occurrences of "log and rethrow" #27033

---
 .../einsatzverwaltung/service/OperationServiceImpl.java | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 4c71414..497c6bc 100644
--- 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
@@ -85,14 +85,11 @@ public class OperationServiceImpl implements OperationService {
                             .status(Status.ACTIVE)
                             .build());
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while adding Operation. Message: {}", e.getMessage());
             throw new ServiceException(e);
         } catch (InvalidVehicleException e) {
             // already logged as invalid vehicle
             throw new InvalidOperationException("Enthaltenes Fahrzeug ist ungültig", e);
         } catch (ElementNotFoundException e) {
-            LOG.error(
-                    "ElementNotFoundException while adding Operation. Message: {}", e.getMessage());
             throw new InvalidOperationException("Enthaltenes Fahrzeug existiert nicht", e);
         }
     }
@@ -142,7 +139,6 @@ public class OperationServiceImpl implements OperationService {
 
                     vs.add(v);
                 } catch (ElementNotFoundException e) {
-                    LOG.info("Invalid Vehicle: VehicleId is not valid");
                     throw new InvalidVehicleException("VehicleId ist invalid");
                 }
             }
@@ -152,13 +148,8 @@ public class OperationServiceImpl implements OperationService {
 
             operationDAO.update(o.toBuilder().vehicles(vs).build());
         } catch (ElementNotFoundException e) {
-            LOG.error(
-                    "ElementNotFoundException while requesting Vehicles. Message: {}",
-                    e.getMessage());
             throw new InvalidOperationException("Kein Einsatz mit dieser ID existiert");
         } catch (PersistenceException e) {
-            LOG.error(
-                    "PersistenceException while requesting vehicles. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -170,13 +161,8 @@ public class OperationServiceImpl implements OperationService {
             Operation o = operationDAO.get(operationId);
             operationDAO.update(o.toBuilder().status(status).build());
         } catch (ElementNotFoundException e) {
-            LOG.error(
-                    "ElementNotFoundException while completing operation. Message: {}",
-                    e.getMessage());
             throw new InvalidOperationException(e);
         } catch (PersistenceException e) {
-            LOG.error(
-                    "PersistenceException while completing operation. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
     }
@@ -251,11 +237,9 @@ public class OperationServiceImpl implements OperationService {
 
             return operations;
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing operations. Message: {}", e);
             throw new ServiceException(e);
         } catch (InvalidOperationException e) {
             // database returned invalid values
-            LOG.error("DB returned invalid operation. Message: {}", e.getMessage());
             throw new ServiceException("DB returned invalid operation", e);
         }
     }
@@ -271,7 +255,6 @@ public class OperationServiceImpl implements OperationService {
             try {
                 VehicleServiceImpl.validateVehicle(v);
             } catch (InvalidVehicleException e) {
-                LOG.info("Invalid Operation: Vehicle \"{}\" is invalid", v.name());
                 throw new InvalidOperationException("Fahrzeug " + v.name() + " ist invalid" + e);
             }
 
-- 
cgit v1.2.3-70-g09d2


From 2a8dfff0948ca196d9a4fc4e6a8c45759e9f7dca Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:45:58 +0200
Subject: Removed redundant logs of InvalidXExceptions #27033

---
 .../einsatzverwaltung/service/OperationServiceImpl.java      | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 497c6bc..20a3106 100644
--- 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
@@ -49,17 +49,14 @@ public class OperationServiceImpl implements OperationService {
     @Override
     public long add(Operation o) throws InvalidOperationException, ServiceException {
         if (o.created() != null) {
-            LOG.info("Invalid Operation: Created must be null");
             throw new InvalidOperationException("Erstellungszeitpunkt darf nicht gesetzt sein");
         }
 
         if (o.severity() != null) {
-            LOG.info("Invalid Operation: Severity must be null");
             throw new InvalidOperationException("Der Schweregrad darf nicht gesetzt sein");
         }
 
         if (o.id() != 0) {
-            LOG.info("Invalid Operation: OperationId must be 0");
             throw new InvalidOperationException("Einsatz-ID muss 0 sein");
         }
 
@@ -101,7 +98,6 @@ public class OperationServiceImpl implements OperationService {
 
         try {
             if (operationId <= 0) {
-                LOG.info("Invalid Operation: OperationId is invalid (<= 0)");
                 throw new InvalidOperationException("Einsatz-ID ist ungültig");
             }
             Operation o = operationDAO.get(operationId);
@@ -109,23 +105,19 @@ public class OperationServiceImpl implements OperationService {
 
             if (o.opCode().trim().isEmpty()
                     || extractSeverityFromOpCode(o.opCode()) != o.severity()) {
-                LOG.info("Invalid Operation: OpCode does not match Severity");
                 throw new InvalidOperationException("Einsatzcode ist ungültig");
             }
 
             if (o.status() != Status.ACTIVE) {
-                LOG.info("Invalid Operation: Operation is not active");
                 throw new InvalidOperationException("Einsatz ist ungültig");
             }
 
             if (o.created() == null) {
-                LOG.info("Invalid Operation: Created field is null");
                 throw new InvalidOperationException("Erstellungszeitpunkt darf nicht leer sein");
             }
 
             for (Long id : vehicleIds) {
                 if (id <= 0) {
-                    LOG.info("Invalid Vehicle: VehicleId is not valid");
                     throw new InvalidVehicleException("Fahrzeug-ID ist ungültig");
                 }
 
@@ -246,7 +238,6 @@ public class OperationServiceImpl implements OperationService {
 
     private static void validateOperation(Operation o) throws InvalidOperationException {
         if (o.vehicles().isEmpty()) {
-            LOG.info("Invalid Operation: No vehicle was added");
             throw new InvalidOperationException(
                     "Es muss mindestens ein Fahrzeug ausgewählt werden!");
         }
@@ -263,12 +254,10 @@ public class OperationServiceImpl implements OperationService {
 
         Instant created = o.created();
         if (created != null && created.isAfter(Instant.now())) {
-            LOG.info("Invalid Operation: Operation was created in the future");
             throw new InvalidOperationException("Einsatz wurde in der Zukunft erstellt");
         }
 
         if (o.destination().trim().isEmpty()) {
-            LOG.info("Invalid Operation: Adress must not be empty");
             throw new InvalidOperationException("Adresse darf nicht leer sein");
         }
     }
@@ -281,7 +270,6 @@ public class OperationServiceImpl implements OperationService {
         Matcher m = opCodePattern.matcher(opCode);
 
         if (!m.matches()) {
-            LOG.info("Invalid Operation: OpCode is invalid");
             throw new InvalidOperationException("Einsatzcode ist invalid");
         }
 
-- 
cgit v1.2.3-70-g09d2


From a3c1248abbe94e0e0a0b2710741c54104a738462 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:48:16 +0200
Subject: Corrected german errors #27033

---
 .../groupphase/einsatzverwaltung/service/OperationServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 20a3106..5f5d017 100644
--- 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
@@ -246,7 +246,7 @@ public class OperationServiceImpl implements OperationService {
             try {
                 VehicleServiceImpl.validateVehicle(v);
             } catch (InvalidVehicleException e) {
-                throw new InvalidOperationException("Fahrzeug " + v.name() + " ist invalid" + e);
+                throw new InvalidOperationException("Fahrzeug " + v.name() + " ist ungültig", e);
             }
 
             // TODO: validate if NEF/RTW/NAH conditions?
@@ -270,7 +270,7 @@ public class OperationServiceImpl implements OperationService {
         Matcher m = opCodePattern.matcher(opCode);
 
         if (!m.matches()) {
-            throw new InvalidOperationException("Einsatzcode ist invalid");
+            throw new InvalidOperationException("Einsatzcode ist ungültig");
         }
 
         return Severity.valueOf(m.group(1));
-- 
cgit v1.2.3-70-g09d2


From 4f1945c786a2a5643430e5912c954e0f3ed3c50b Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:54:09 +0200
Subject: Choose appropriate logging level #27033

---
 .../groupphase/einsatzverwaltung/service/OperationServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 5f5d017..598fd2c 100644
--- 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
@@ -61,7 +61,7 @@ public class OperationServiceImpl implements OperationService {
         }
 
         if (o.status() != Status.ACTIVE)
-            LOG.warn("Status was set but will be overridden"); // TODO: nullable instead??
+            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) {
-- 
cgit v1.2.3-70-g09d2


From 36ba8a9585d95cfe609f44cd11f7ed0ba2e08bee Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:55:37 +0200
Subject: Remove all logging from RegistrationServiceImpl #27033

---
 .../einsatzverwaltung/service/RegistrationServiceImpl.java       | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 007a2e7..1d92644 100644
--- 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
@@ -11,16 +11,12 @@ 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class RegistrationServiceImpl implements RegistrationService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RegistrationServiceImpl.class);
-
     private final RegistrationDAO registrationDAO;
     private final VehicleDAO vehicleDAO;
 
@@ -43,13 +39,8 @@ public class RegistrationServiceImpl implements RegistrationService {
 
             return registrationDAO.add(vehicle.id(), registrations);
         } catch (PersistenceException e) {
-            LOG.error(
-                    "PersistenceException while adding Registration. Message: {}", e.getMessage());
             throw new ServiceException(e);
         } catch (ElementNotFoundException e) {
-            LOG.error(
-                    "ElementNotFoundException while getting vehicle for Registration. Message: {}",
-                    e.getMessage());
             throw new InvalidVehicleException(e);
         }
     }
-- 
cgit v1.2.3-70-g09d2


From 15235663357cce554fa190a9df40002aa1626ca0 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 21:59:22 +0200
Subject: Remove all occurrences of "log and rethrow" #27033

---
 .../groupphase/einsatzverwaltung/service/VehicleServiceImpl.java     | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 527825e..d5caead 100644
--- 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
@@ -38,7 +38,6 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehiclePersistence.add(vehicle);
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while adding Vehicle. Message : {}", e.getMessage());
             throw new ServiceException(e);
         }
         return 0;
@@ -49,11 +48,8 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehiclePersistence.update(vehicle);
         } catch (ElementNotFoundException e) {
-            LOG.error(
-                    "ElementNotFoundException while updating Vehicle. Message: {}", e.getMessage());
             throw new ServiceException("Element not found");
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while updating Vehicle. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
         return vehicle;
@@ -120,7 +116,6 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehicles = vehiclePersistence.list();
         } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing Vehicles. Message: {}", e.getMessage());
             throw new ServiceException(e);
         }
 
-- 
cgit v1.2.3-70-g09d2


From 67125feeac997e84bcdbdfffa0614716ed6fcd16 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 22:00:40 +0200
Subject: Add original exception as argument to new exception #27033

---
 .../groupphase/einsatzverwaltung/service/VehicleServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index d5caead..929856e 100644
--- 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
@@ -48,7 +48,7 @@ public class VehicleServiceImpl implements VehicleService {
         try {
             vehiclePersistence.update(vehicle);
         } catch (ElementNotFoundException e) {
-            throw new ServiceException("Element not found");
+            throw new ServiceException("Element not found", e);
         } catch (PersistenceException e) {
             throw new ServiceException(e);
         }
-- 
cgit v1.2.3-70-g09d2


From 2d153b8b34ad6e7523471645ca7c348cad0196cd Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 22:07:16 +0200
Subject: Remove redundant logging of validation errors #27033

---
 .../einsatzverwaltung/service/VehicleServiceImpl.java   | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 929856e..0bf4aa6 100644
--- 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
@@ -11,16 +11,12 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 @Service
 public class VehicleServiceImpl implements VehicleService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(VehicleServiceImpl.class);
-
     private VehicleDAO vehiclePersistence;
 
     public VehicleServiceImpl(VehicleDAO vehiclePersistence) {
@@ -29,7 +25,6 @@ public class VehicleServiceImpl implements VehicleService {
 
     public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
         if (!CollectionUtils.isEmpty(vehicle.registrations())) {
-            LOG.info("Invalid Vehicle: Vehicle cannot be created with registrations");
             throw new InvalidVehicleException(
                     "Fahrzeug kann nicht mit Anmeldungen erstellt werden");
         }
@@ -59,41 +54,32 @@ public class VehicleServiceImpl implements VehicleService {
         switch (vehicle.type()) {
             case RTW:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    LOG.info("Invalid Vehicle: RTW cannot have a normal roof");
                     throw new InvalidVehicleException("RTW darf kein Normales Dach haben");
                 } else if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    LOG.info("Invalid Vehicle: RTW cannot have a medium roof");
                     throw new InvalidVehicleException("RTW darf kein Mittelhochdach haben");
                 }
                 break;
             case KTW:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    LOG.info("Invalid Vehicle: KTW cannot have a normal roof");
                     throw new InvalidVehicleException("KTW darf kein Normales Dach haben");
                 }
                 break;
             case KTW_B:
                 if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    LOG.info("Invalid Vehicle: KTW-B cannot have a normal roof");
                     throw new InvalidVehicleException("KTW-B darf kein Normales Dach haben");
                 }
                 break;
             case NEF:
                 if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    LOG.info("Invalid Vehicle: NEF cannot have a medium roof");
                     throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
                 } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    LOG.info("Invalid Vehicle: NEF cannot have a high roof");
                     throw new InvalidVehicleException("NEF darf kein Hochdach haben");
                 }
                 break;
             case NAH:
                 if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    // TODO: eventually change to LOG.debug (feedback)
-                    LOG.info("Invalid Vehicle: NAH cannot have a medium roof");
                     throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
                 } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    LOG.info("Invalid Vehicle: NAH cannot have a high roof");
                     throw new InvalidVehicleException("NEF darf kein Hochdach haben");
                 }
                 break;
@@ -107,8 +93,7 @@ public class VehicleServiceImpl implements VehicleService {
     @Override
     public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException {
         if (statuses == null) {
-            LOG.error("Statuses may not be null");
-            throw new ServiceException("statuses may not be null");
+            throw new ServiceException("Statuses may not be null");
         }
 
         Set<Vehicle> vehicles;
-- 
cgit v1.2.3-70-g09d2


From 8017a70c703107dccef7f752c89052d3469db993 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 23:26:06 +0200
Subject: Remove all logging from EmployeeValidator #27033

---
 .../groupphase/einsatzverwaltung/dto/EmployeeValidator.java        | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 82033b9..36d8003 100644
--- 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
@@ -1,27 +1,20 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
 
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class EmployeeValidator {
 
-    private static final Logger LOG = LoggerFactory.getLogger(EmployeeValidator.class);
-
     public static boolean validate(Employee employee) throws InvalidEmployeeException {
 
         if (employee.name() == null || employee.name().trim().length() == 0) {
-            LOG.info("Invalid Employee: Name was not set");
             throw new InvalidEmployeeException("Name darf nicht leer sein!");
         }
 
         if (employee.birthday() == null) {
-            LOG.info("Invalid Employee: Birthday was not set");
             throw new InvalidEmployeeException("Geburtsdatum darf nicht leer sein!");
         }
 
         if (employee.educationLevel() == null) {
-            LOG.info("Invalid Employee: EducationLevel was not set");
             throw new InvalidEmployeeException("Ausbildungsgrad darf nicht leer sein!");
         }
 
-- 
cgit v1.2.3-70-g09d2


From 09627fad95846e7d1fdba91bcee7e46030ba13a9 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 23:31:36 +0200
Subject: Remove all logging from RegistrationValidator #27033

---
 .../dto/RegistrationValidator.java                 | 25 ----------------------
 1 file changed, 25 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 805e306..3456534 100644
--- 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
@@ -8,13 +8,9 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class RegistrationValidator {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RegistrationValidator.class);
-
     private RegistrationValidator() {}
 
     public static void validate(Vehicle vehicle, Set<Registration> registrations)
@@ -47,9 +43,6 @@ public class RegistrationValidator {
         for (Registration registration : registrations) {
             total++;
             if (found.put(registration.employee().id(), false) != null) {
-                LOG.info(
-                        "Invalid Registration: Employee with ID {} was added twice",
-                        registration.employee().id());
                 throw new InvalidRegistrationException(
                         "Person mit der ID: "
                                 + registration.employee().id()
@@ -73,7 +66,6 @@ public class RegistrationValidator {
             }
         }
         if (total <= 0) {
-            LOG.info("Invalid Registration: No employees were added");
             throw new InvalidRegistrationException("Kein Personal ausgewählt!");
         }
         if (vehicle.type() == VehicleType.NAH) {
@@ -85,10 +77,8 @@ public class RegistrationValidator {
             3-4 Personen
              */
             if (total < 3) {
-                LOG.info("Invalid Registration: Too few employees for NAH");
                 throw new InvalidRegistrationException("Zu wenig Personal für NAH!");
             } else if (total > 4) {
-                LOG.info("Invalid Registration: Too many employees for NAH");
                 throw new InvalidRegistrationException("Zu viel Personal für NAH!");
             }
             for (long pilot_id : pilotIds) {
@@ -98,14 +88,12 @@ public class RegistrationValidator {
                     found.put(na_id, true);
                     for (long nfs_id : nfsIds) {
                         if (found.get(nfs_id)) continue;
-                        LOG.info("Valid combination found for NAH");
                         return;
                     }
                     found.put(na_id, false);
                 }
                 found.put(pilot_id, false);
             }
-            LOG.info("Invalid Registration: No valid combination of employees found for NAH");
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für NAH!");
         } else if (vehicle.type() == VehicleType.NEF) {
@@ -115,10 +103,8 @@ public class RegistrationValidator {
             1 NA
              */
             if (total < 2) {
-                LOG.info("Invalid Registration: Too few employees for NEF");
                 throw new InvalidRegistrationException("Zu wenig Personal für NEF!");
             } else if (total > 3) {
-                LOG.info("Invalid Registration: Too many employees for NEF");
                 throw new InvalidRegistrationException("Zu viel Personal für NEF!");
             }
             for (long driver_id : driverIds) {
@@ -127,12 +113,10 @@ public class RegistrationValidator {
                 found.put(driver_id, true);
                 for (long na_id : naIds) {
                     if (found.get(na_id)) continue;
-                    LOG.info("Valid combinaion found for NEF");
                     return;
                 }
                 found.put(driver_id, false);
             }
-            LOG.info("Invalid Registration: No valid combination of employees found for NEF");
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für NEF!");
         } else if (vehicle.type() == VehicleType.BKTW) {
@@ -141,14 +125,11 @@ public class RegistrationValidator {
             1 Driver
              */
             if (total > 3) {
-                LOG.info("Invalid Registration: Too many employees for BKTW");
                 throw new InvalidRegistrationException("Zu viel Personal für BKTW!");
             }
             if (!driverIds.isEmpty()) {
-                LOG.info("Valid combination found for BKTW");
                 return;
             }
-            LOG.info("Invalid Registration: No driver was found for BKTW");
             throw new InvalidRegistrationException("Kein Fahrer gefunden für BKTW!");
         } else { // KTW or RTW, both have the same requirements
             /*
@@ -157,11 +138,9 @@ public class RegistrationValidator {
             1 RS
              */
             if (total < 2) {
-                LOG.info("Invalid Registration: Too few employees for {}", vehicle.type().name());
                 throw new InvalidRegistrationException(
                         "Zu wenig Personal für " + vehicle.type().name() + "!");
             } else if (total > 4) {
-                LOG.info("Invalid Registration: Too many employees for {}", vehicle.type().name());
                 throw new InvalidRegistrationException(
                         "Zu viel Persoanl für " + vehicle.type().name() + "!");
             }
@@ -169,13 +148,9 @@ public class RegistrationValidator {
                 found.put(driver_id, true);
                 for (long rs_id : rsIds) {
                     if (found.get(rs_id)) continue;
-                    LOG.info("Valid combination found for {}", vehicle.type().name());
                     return;
                 }
             }
-            LOG.info(
-                    "Invalid Registration: No valid combination of employees found for {}",
-                    vehicle.type().name());
             throw new InvalidRegistrationException(
                     "Keine gültige Kombination von Personen für " + vehicle.type().name() + "!");
         }
-- 
cgit v1.2.3-70-g09d2


From 5446cc6b355eaf8838ebc3a8ba2f4a01fa9058d4 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Thu, 14 Jun 2018 23:39:11 +0200
Subject: Added logging of improved setAutoCommit(true) #27033

---
 .../einsatzverwaltung/dao/VehicleDatabaseDAO.java      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 96703b1..37915ea 100644
--- 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
@@ -15,11 +15,15 @@ import java.sql.Savepoint;
 import java.sql.Statement;
 import java.util.HashSet;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class VehicleDatabaseDAO implements VehicleDAO {
 
+    private static final Logger LOG = LoggerFactory.getLogger(VehicleDatabaseDAO.class);
+
     private final JDBCConnectionManager jdbcConnectionManager;
     private RegistrationDatabaseDAO registrationDatabaseDao;
 
@@ -84,10 +88,15 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             }
 
             connection.commit();
-            connection.setAutoCommit(true);
         } catch (SQLException e) {
             rollbackAndEnableAutoCommit(connection, savepoint);
             throw new PersistenceException(e);
+        } finally {
+            try {
+                jdbcConnectionManager.getConnection().setAutoCommit(true);
+            } catch (SQLException e) {
+                LOG.error("Setting AutoCommit to true failed! ", e);
+            }
         }
         return id;
     }
@@ -156,10 +165,15 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             }
 
             con.commit();
-            con.setAutoCommit(true);
         } catch (SQLException e) {
             rollbackAndEnableAutoCommit(con, savepoint);
             throw new PersistenceException(e);
+        } finally {
+            try {
+                jdbcConnectionManager.getConnection().setAutoCommit(true);
+            } catch (SQLException e) {
+                LOG.error("Setting AutoCommit to true failed! ", e);
+            }
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 1c894ed21f6cb99aaef1fe6f6dc4e76a2047ca39 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:20:30 +0200
Subject: Added logging to all caught Exceptions #27033

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java   | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 5e89b66..74f9f57 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,11 +25,15 @@ 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;
@@ -81,6 +85,7 @@ public class ArchiveOperationController {
             lblCompleted.setText("abgeschlossen: " + completedAmount);
             lblOperations.setText("Einsätze: " + list.size());
         } catch (ServiceException e) {
+            LOG.error("ServiceException in update().", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -112,6 +117,7 @@ public class ArchiveOperationController {
                 archiveOperationFlowPane.getChildren().add(opInAController.getRoot());
             }
         } catch (IOException e) {
+            LOG.error("IOException in setFlowPane(). ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -182,6 +188,7 @@ public class ArchiveOperationController {
                 fpVehicles.getChildren().add(controller.getRoot());
             }
         } catch (IOException e) {
+            LOG.error("IOException in setOperation(). ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-- 
cgit v1.2.3-70-g09d2


From e0bf9302755c7446920578975ae86c9925cfe978 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:27:52 +0200
Subject: Added logging for user input #27033

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java        | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 74f9f57..af58162 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
@@ -207,6 +207,7 @@ public class ArchiveOperationController {
     }
 
     public void backClicked() {
+        LOG.debug("Button \"Zurück\" in archive detail view clicked.");
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
         backApDetails.setVisible(false);
@@ -215,6 +216,7 @@ public class ArchiveOperationController {
     }
 
     public void backToMain() {
+        LOG.debug("Button \"Zurück\" in archive main view clicked.");
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
-- 
cgit v1.2.3-70-g09d2


From 67a454028d17b3561dab03d0b23a4a5343a4b9ad Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:45:14 +0200
Subject: Added/Corrected logging of all caught Exceptions #27033

---
 .../einsatzverwaltung/controller/CreateCarController.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 9272050..37699df 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
@@ -8,7 +8,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Vehicle
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -41,7 +40,7 @@ public class CreateCarController {
     @FXML private FlowPane fpVehicleList;
     private final CreateOperationController createOperationController;
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(CreateCarController.class);
     private final VehicleService vehicleService;
     private boolean update = false;
     private long vid = -1;
@@ -100,12 +99,12 @@ public class CreateCarController {
                 vehicleService.add(vehicle);
                 setToStart();
             } catch (InvalidVehicleException e) {
-                LOG.error("Invalid Vehicle: {}", e);
+                LOG.debug("Validation of Vehicle failed");
                 createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
                 setToStart();
                 return;
             } catch (ServiceException e) {
-                LOG.error("Exception: {}", e);
+                LOG.error("ServiceException in createCar(). ", e);
                 createComplete(AlertType.ERROR, "Fehler", e.getMessage());
                 setToStart();
                 return;
@@ -129,13 +128,12 @@ public class CreateCarController {
                 setToStart();
                 chooseVehicle = null;
             } catch (InvalidVehicleException e) {
-                // TODO: Validation-Errors should be logged with log level debug only (like here)
-                LOG.debug("Invalid Vehicle: {}", e);
+                LOG.debug("Validation of Vehicle failed");
                 createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
                 setToStart();
                 return;
             } catch (ServiceException e) {
-                LOG.error("Exception: {}", e);
+                LOG.error("ServiceException in createCar(). ", e);
                 createComplete(AlertType.ERROR, "Fehler", e.getMessage());
                 setToStart();
                 return;
@@ -233,7 +231,7 @@ public class CreateCarController {
                 fpVehicleList.getChildren().add(controller.getRootElement());
             }
         } catch (ServiceException | IOException e) {
-            LOG.error("Error while updating list.", e);
+            LOG.error("Exception in updateVehiclePane(). ", e);
 
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
-- 
cgit v1.2.3-70-g09d2


From 0ac9377da7d03d182c4aa76308ef89d6c16aa9bc Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:45:48 +0200
Subject: Added logging of user actions #27033

---
 .../groupphase/einsatzverwaltung/controller/CreateCarController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 37699df..f2a04d5 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
@@ -87,6 +87,7 @@ public class CreateCarController {
     private void createCar(ActionEvent actionEvent) {
 
         if (!update) {
+            LOG.debug("Button \"Erstellen\" clicked.");
             Vehicle vehicle =
                     Vehicle.builder()
                             .constructionType(parseConstructionType())
@@ -114,6 +115,7 @@ public class CreateCarController {
                     "Speichern Erfolgreich",
                     "Auto wurde erfolgreich angelegt");
         } else {
+            LOG.debug("Button \"Speichern\" clicked.");
             try {
                 Vehicle vehicle =
                         Vehicle.builder()
@@ -140,7 +142,7 @@ public class CreateCarController {
             }
             createComplete(
                     AlertType.CONFIRMATION,
-                    "Bearbiten Erfolgreich",
+                    "Bearbeiten Erfolgreich",
                     "Auto wurde erfolgreich bearbeitet");
         }
 
-- 
cgit v1.2.3-70-g09d2


From 4200ac219ad67f24baf9e7a26a22184aa0c7667e Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:58:08 +0200
Subject: Changed logging of caught Exceptions #27033

---
 .../einsatzverwaltung/controller/CreateNewEmployeeController.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index ecca44b..5bce758 100644
--- 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
@@ -104,8 +104,7 @@ public class CreateNewEmployeeController {
                 employeeService.add(employee);
             }
         } catch (InvalidEmployeeException e) {
-            // TODO: on validation errors, only log at debug level (feedback)
-            LOG.debug("Invalid Employee: {}", e);
+            LOG.debug("Validation for Employee failed");
 
             showModalDialogWithOkButton(
                     AlertType.ERROR,
@@ -113,8 +112,7 @@ public class CreateNewEmployeeController {
                     "Mindestens eines der Eingabefelder haben einen ungültigen Wert!");
             return;
         } catch (ServiceException e) {
-            // TODO: when errors occur, exceptions should be logged. Do not use "{}" (feedback)
-            LOG.error("Employee could not be saved: ", e);
+            LOG.error("ServiceException in onCreateClicked(). ", e);
 
             showModalDialogWithOkButton(
                     AlertType.ERROR,
-- 
cgit v1.2.3-70-g09d2


From b6a29ddc6965976d31f8ce08b843770b41936e0b Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 13:58:36 +0200
Subject: Added logging of user actions #27033

---
 .../einsatzverwaltung/controller/CreateNewEmployeeController.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 5bce758..343ad1d 100644
--- 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
@@ -8,7 +8,6 @@ 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.lang.invoke.MethodHandles;
 import java.time.LocalDate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -32,7 +31,7 @@ import org.springframework.stereotype.Controller;
 @Scope("prototype")
 public class CreateNewEmployeeController {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(CreateNewEmployeeController.class);
     private final EmployeeService employeeService;
 
     @FXML private Label lblHeader;
@@ -80,6 +79,7 @@ public class CreateNewEmployeeController {
 
     @FXML
     private void onCancelClicked() {
+        LOG.debug("Button \"abbrechen\" clicked.");
         if (consumerCancelClicked != null) {
             consumerCancelClicked.run();
         }
@@ -87,6 +87,7 @@ public class CreateNewEmployeeController {
 
     @FXML
     private void onCreateClicked() {
+        LOG.debug("Button {} clicked.", btnCreate.getText());
 
         employee =
                 employee.toBuilder()
@@ -110,6 +111,8 @@ public class CreateNewEmployeeController {
                     AlertType.ERROR,
                     "Ungültige Eingabe",
                     "Mindestens eines der Eingabefelder haben einen ungültigen Wert!");
+            // TODO: could just display e.getMessage, which will show the cause of the failed
+            // validation in german
             return;
         } catch (ServiceException e) {
             LOG.error("ServiceException in onCreateClicked(). ", e);
-- 
cgit v1.2.3-70-g09d2


From 826d46ba36707fc7ba630848326295761a555a76 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:06:27 +0200
Subject: Added/Changed logging of caught Exceptions #27033

---
 .../controller/CreateOperationController.java             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 edc56e7..d1c31f3 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
@@ -11,7 +11,6 @@ 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.lang.invoke.MethodHandles;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -47,7 +46,7 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class CreateOperationController {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(CreateOperationController.class);
 
     public AnchorPane apCreateOperation;
     @FXML private GridPane grdWindowContainer;
@@ -174,7 +173,7 @@ public class CreateOperationController {
                 fpVehicles.getChildren().add(controller.getRootElement());
             }
         } catch (ServiceException | IOException | InvalidOperationException e) {
-            LOG.error("Error while updating list.", e);
+            LOG.error("Exception in updateList(). ", e);
 
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
@@ -187,6 +186,7 @@ public class CreateOperationController {
                     FXCollections.observableArrayList(
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
+            LOG.error("ServiceException in updateList(). ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler - Einsätze");
             alert.setHeaderText("Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten.");
@@ -217,7 +217,7 @@ public class CreateOperationController {
                             vehicleService.update(data.toBuilder().status(status).build());
                             this.updateList();
                         } catch (InvalidVehicleException | ServiceException e) {
-                            LOG.error("Error while setting status.", e);
+                            LOG.error("Exception in createContextMenu(). (mi.setOnAction) ", e);
                             Alert a = new Alert(AlertType.ERROR, e.getMessage());
                             a.show();
                         }
@@ -257,7 +257,7 @@ public class CreateOperationController {
 
                         this.updateList();
                     } catch (InvalidVehicleException | ServiceException e) {
-                        LOG.error("Error while unregistering.", e);
+                        LOG.error("Exception in createContextMenu(). (abmelden.setOnAction) ", e);
                         Alert a = new Alert(AlertType.ERROR, e.getMessage());
                         a.show();
                     }
@@ -284,6 +284,7 @@ public class CreateOperationController {
         try {
             operationService.add(operation);
         } catch (ServiceException | InvalidOperationException e) {
+            LOG.error("Exception in createOperationClicked(). ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -332,7 +333,7 @@ public class CreateOperationController {
                                                     .getResourceAsStream(
                                                             "/fxml/ArchiveOperation.fxml"))));
         } catch (IOException e) {
-            LOG.error("Could not open new window: {}", e);
+            LOG.error("IOException in openArchivWindow(). ", e);
         }
         stage.setTitle("Einsatz erstellen");
         stage.centerOnScreen();
@@ -354,7 +355,7 @@ public class CreateOperationController {
                                                     .getResourceAsStream(
                                                             "/fxml/" + fxmlFileName))));
         } catch (IOException e) {
-            LOG.error("Could not open new window: {}", e);
+            LOG.error("IOException in openNewWindow(). ", e);
         }
 
         stage.setTitle("Ressourcenverwaltung");
-- 
cgit v1.2.3-70-g09d2


From 66f9209070927d425b79eaf0a999f109ac8031bd Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:12:22 +0200
Subject: Added logging to all onAction methods #27033

---
 .../einsatzverwaltung/controller/CreateOperationController.java      | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 d1c31f3..0f2b4f5 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
@@ -269,6 +269,7 @@ public class CreateOperationController {
 
     @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);
@@ -306,18 +307,22 @@ public class CreateOperationController {
     }
 
     public void onRegistrationLinkClicked(ActionEvent actionEvent) {
+        LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
         openRegistrationWindow();
     }
 
     public void onEmployeeLinkClicked(ActionEvent actionEvent) {
+        LOG.debug("Hyperlink \"Personen\" clicked.");
         openCreateNewEmployeeWindow();
     }
 
     public void onVehicleLinkClicked(ActionEvent actionEvent) {
+        LOG.debug("Hyperlink \"Fahrzeuge\" clicked.");
         openCreateCarWindow();
     }
 
     public void onArchivLinkClicked() {
+        LOG.debug("Hyperlink \"Archiv\" clicked.");
         archiveOperationController.update();
         openArchivWindow();
     }
-- 
cgit v1.2.3-70-g09d2


From 25c67a720823bc376b1c9860887c79ebd4cbecb0 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:14:03 +0200
Subject: Corrected mislabeled logging statements #27033

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 af58162..72b3b91 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
@@ -207,7 +207,7 @@ public class ArchiveOperationController {
     }
 
     public void backClicked() {
-        LOG.debug("Button \"Zurück\" in archive detail view clicked.");
+        LOG.debug("Hyperlink \"Zurück\" in archive detail view clicked.");
         fpVehicles.getChildren().clear();
         setDetailsVisible(false);
         backApDetails.setVisible(false);
@@ -216,7 +216,7 @@ public class ArchiveOperationController {
     }
 
     public void backToMain() {
-        LOG.debug("Button \"Zurück\" in archive main view clicked.");
+        LOG.debug("Hyperlink \"Zurück\" in archive main view clicked.");
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
-- 
cgit v1.2.3-70-g09d2


From 92111d8231b54be631a3dc3123e03a815478282a Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:15:07 +0200
Subject: Added missing onAction log #27033

---
 .../groupphase/einsatzverwaltung/controller/CreateCarController.java     | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 f2a04d5..1c74d2d 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
@@ -194,6 +194,7 @@ public class CreateCarController {
 
     @FXML
     private void backToMain() {
+        LOG.debug("Hyperlink \"zurück\" clicked.");
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
-- 
cgit v1.2.3-70-g09d2


From 8cce6acca2285d74bec8b0c16b4e7f2956d458a6 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:15:51 +0200
Subject: Corrected log statement #27033

---
 .../einsatzverwaltung/controller/CreateNewEmployeeController.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 343ad1d..45cca66 100644
--- 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
@@ -79,7 +79,7 @@ public class CreateNewEmployeeController {
 
     @FXML
     private void onCancelClicked() {
-        LOG.debug("Button \"abbrechen\" clicked.");
+        LOG.debug("Hyperlink \"abbrechen\" clicked.");
         if (consumerCancelClicked != null) {
             consumerCancelClicked.run();
         }
-- 
cgit v1.2.3-70-g09d2


From 80f8aa6edef71d1e5ad919122b3e894c000039fc Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:22:33 +0200
Subject: Changed log statements of caught IOExceptions #27033

---
 .../controller/DetailArchiveOperationController.java              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 0376579..22eb243 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
@@ -5,7 +5,6 @@ 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 java.util.Objects;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -17,7 +16,8 @@ import org.springframework.stereotype.Controller;
 
 @Controller
 public class DetailArchiveOperationController {
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG =
+            LoggerFactory.getLogger(DetailArchiveOperationController.class);
 
     @FXML private VBox vBoxVehicle;
     @FXML private VBox vBoxPeople;
@@ -53,7 +53,7 @@ public class DetailArchiveOperationController {
             controller.setData(vehicle, false);
             vBoxVehicle.getChildren().add(controller.getRootElement());
         } catch (IOException e) {
-            LOG.error("Error while updating list.", e);
+            LOG.error("IOException in set(Vehicle). (vBoxVehicle) ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -71,7 +71,7 @@ public class DetailArchiveOperationController {
                 vBoxPeople.getChildren().add(employeeListItemController.getRootElement());
             }
         } catch (IOException e) {
-            LOG.error("Error while updating list.", e);
+            LOG.error("IOException in set(Vehicle). (vBoxPeople) ", e);
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-- 
cgit v1.2.3-70-g09d2


From f574624cd59ad2ef35de97517e9eaf41f0f66d5d Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:23:08 +0200
Subject: Replaced e.getMessage with generic german error message #27033

---
 .../controller/DetailArchiveOperationController.java                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 22eb243..1859605 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
@@ -57,7 +57,8 @@ public class DetailArchiveOperationController {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
+            alert.setContentText(
+                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
             alert.showAndWait();
         }
         try {
@@ -75,7 +76,8 @@ public class DetailArchiveOperationController {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
+            alert.setContentText(
+                    "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
             alert.showAndWait();
         }
     }
-- 
cgit v1.2.3-70-g09d2


From f2ecba52fcc2be7334d16b118f8498b2bec49954 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:25:45 +0200
Subject: Changed log message #27033

---
 .../einsatzverwaltung/controller/EmployeeListController.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 f7496c7..6e1159a 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
@@ -4,7 +4,6 @@ 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.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -22,7 +21,7 @@ import org.springframework.stereotype.Controller;
 @Scope("prototype")
 public class EmployeeListController {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(EmployeeListController.class);
 
     @FXML private FlowPane flowPaneEmployeeList;
 
@@ -90,7 +89,7 @@ public class EmployeeListController {
                         });
             }
         } catch (IOException e) {
-            LOG.error("Could not create a new EmployeeListItem: {}", e);
+            LOG.error("IOException in addEmployeeToFlowPane. ", e);
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 93f290e01d9f99d2714850a5b9d52a8ec3f73f25 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:29:55 +0200
Subject: Added logging of user actions #27033

---
 .../einsatzverwaltung/controller/FilterEmployeesController.java      | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 6d6214d..a1d1f70 100644
--- 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
@@ -7,12 +7,15 @@ 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;
 
@@ -23,6 +26,7 @@ public class FilterEmployeesController {
 
     @FXML
     private void onAddEmployeeClicked() {
+        LOG.debug("Button \"Person hinzufügen\" clicked.");
         if (consumerAddEmployeeClicked != null) {
             consumerAddEmployeeClicked.run();
         }
@@ -30,6 +34,7 @@ public class FilterEmployeesController {
 
     @FXML
     private void onFilterTextChanged() {
+        LOG.debug("Filter text changed.");
         if (consumerFilterTextChanged != null) {
             consumerFilterTextChanged.accept(inputFilterString.getText());
         }
-- 
cgit v1.2.3-70-g09d2


From 278a98cafe081a8d48817d674054b85f789cf861 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:32:52 +0200
Subject: Changed statements of caught Exceptions #27033

---
 .../einsatzverwaltung/controller/ManageEmployeesController.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 67cf7fa..7a71ba8 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
@@ -52,7 +52,7 @@ public class ManageEmployeesController {
             updateEmployeeList();
 
         } catch (IOException e) {
-            LOG.error("Could not initialize controller: {}", e);
+            LOG.error("IOException in openFilter().", e);
         }
     }
 
@@ -80,7 +80,7 @@ public class ManageEmployeesController {
             createNewEmployeeController.setConsumerCancelClicked(this::openFilter);
             createNewEmployeeController.setConsumerCreateClicked(this::openFilter);
         } catch (IOException e) {
-            LOG.error("Could not prepare UI for adding employee: {}", e);
+            LOG.error("IOException in openEmployee(). ", e);
         }
     }
 
@@ -105,7 +105,7 @@ public class ManageEmployeesController {
                     this::openEditEmployee);
 
         } catch (ServiceException e) {
-            LOG.error("Could not fetch employee list: {}", e);
+            LOG.error("ServiceException in updateEmployeeList(). ", e);
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 2e555feddd334f4ed29179330b19458960b35b9b Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:33:26 +0200
Subject: Added logging to user action #27033

---
 .../einsatzverwaltung/controller/ManageEmployeesController.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 7a71ba8..3aaf040 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
@@ -5,7 +5,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Employe
 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;
@@ -17,7 +16,7 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class ManageEmployeesController {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final Logger LOG = LoggerFactory.getLogger(ManageEmployeesController.class);
     @FXML private AnchorPane listEmployeesAP;
     @FXML private AnchorPane containerHeader;
     @FXML private EmployeeListController employeeListController;
@@ -114,6 +113,7 @@ public class ManageEmployeesController {
     }
 
     public void backToMain() {
+        LOG.debug("Hyperlink \"Zurück\" clicked.");
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
-- 
cgit v1.2.3-70-g09d2


From f2a2885d7534f283f4999a32c7ccaadae55a419a Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:40:06 +0200
Subject: Added logging to caught Exceptions #27033

---
 .../einsatzverwaltung/controller/OperationDetailsController.java    | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 dc7e969..a32c5ac 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
@@ -19,10 +19,13 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.AnchorPane;
+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;
@@ -106,6 +109,7 @@ public class OperationDetailsController {
                     FXCollections.observableArrayList(
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
+            LOG.error("ServiceException in fillActiveList(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -119,6 +123,7 @@ public class OperationDetailsController {
         try {
             operationService.complete(operation.id(), Status.COMPLETED);
         } catch (InvalidOperationException | ServiceException e) {
+            LOG.error("Exception in closeOperationClicked(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
@@ -139,6 +144,7 @@ public class OperationDetailsController {
         try {
             operationService.complete(operation.id(), Status.CANCELLED);
         } catch (InvalidOperationException | ServiceException e) {
+            LOG.error("Exception in cancelOperationClicked(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-- 
cgit v1.2.3-70-g09d2


From cbb743cac97ab06a1c980f0c9b6d916eeb2b4975 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:40:26 +0200
Subject: Added logging to onAction methods #27033

---
 .../einsatzverwaltung/controller/OperationDetailsController.java       | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 a32c5ac..7694b95 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
@@ -120,6 +120,7 @@ public class OperationDetailsController {
 
     @FXML
     public void closeOperationClicked() {
+        LOG.debug("Button \"Abschließen\" clicked.");
         try {
             operationService.complete(operation.id(), Status.COMPLETED);
         } catch (InvalidOperationException | ServiceException e) {
@@ -141,6 +142,7 @@ public class OperationDetailsController {
     }
 
     public void cancelOperationClicked() {
+        LOG.debug("Button \"Stornieren\" clicked.");
         try {
             operationService.complete(operation.id(), Status.CANCELLED);
         } catch (InvalidOperationException | ServiceException e) {
@@ -162,6 +164,7 @@ public class OperationDetailsController {
     }
 
     public void closeWindow() {
+        LOG.debug("Hyperlink \"Zurück\" clicked.");
         operationDetailsAP.setVisible(false);
         this.createOperationController.setVisible(true);
     }
-- 
cgit v1.2.3-70-g09d2


From 3a82ac0d42d57c57a27f65f518f51b72ce008dc3 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:46:55 +0200
Subject: Added logging to caught Exceptions #27033

---
 .../controller/RegistrationWindowController.java   | 24 ++++++----------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 1a4a4e9..8b1e069 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
@@ -146,9 +146,7 @@ public class RegistrationWindowController {
                         if (chosenEmployees.contains(e)) employeeListController.selectEmployee(e);
                     });
         } catch (ServiceException e) {
-            LOG.warn(
-                    "Caught ServiceException while getting employees. Showing it to user. Error message: {}",
-                    e.getMessage());
+            LOG.error("ServiceException in updateEmplList(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Personal - Fehler!");
             alert.setHeaderText("Beim Auflisten des Personals ist ein Fehler aufgetreten.");
@@ -195,17 +193,14 @@ public class RegistrationWindowController {
                 vbVehicles.getChildren().add(vp.getRootElement());
             }
         } catch (ServiceException e) {
-            LOG.warn(
-                    "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
-                    e);
+            LOG.error("ServiceException in updateVehList(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             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());
+            LOG.error("IOException in updateVehList(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setContentText(e.getMessage());
@@ -264,28 +259,21 @@ public class RegistrationWindowController {
             createOperationController.setVisible(true);
             reset();
         } catch (InvalidVehicleException e) {
-            LOG.info(
-                    "Caught InvalidVehicleException. Showing it to user. Error message: {}",
-                    e.getClass().toString(),
-                    e.getMessage());
+            LOG.debug("Validation of Vehicle in Registration failed.");
             Alert alert = new Alert(AlertType.WARNING);
             alert.setTitle("Ungültiges Fahrzeug");
             alert.setHeaderText("Das spezifizierte Fahrzeug ist nicht gültig.");
             alert.setContentText(e.getMessage());
             alert.show();
         } catch (ServiceException e) {
-            LOG.warn(
-                    "Caught ServiceException while getting vehicles. Showing it to user. Error message: {}",
-                    e.getMessage());
+            LOG.error("ServiceException in create(). ", e);
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Anmeldung - Fehler!");
             alert.setHeaderText("Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
             alert.setContentText(e.getMessage());
             alert.show();
         } catch (InvalidRegistrationException e) {
-            LOG.info(
-                    "Caught InvalidRegistrationException. Showing it to user. Error message: {}",
-                    e.getMessage());
+            LOG.debug("Validation of Registration failed.");
             Alert alert = new Alert(AlertType.WARNING);
             alert.setTitle("Ungültige Eingabe");
             alert.setHeaderText(
-- 
cgit v1.2.3-70-g09d2


From 250c2153cdc1a329f577294618ffd3e52352cd38 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:47:18 +0200
Subject: Added logging to onMouseClicked methods #27033

---
 .../einsatzverwaltung/controller/RegistrationWindowController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 8b1e069..e6c35a1 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
@@ -209,7 +209,7 @@ public class RegistrationWindowController {
     }
 
     public void cancel() {
-        LOG.debug("Cancel Button clicked");
+        LOG.debug("Hyperlink \"schließen\" clicked");
         reset();
         this.setVisible(false);
         createOperationController.setVisible(true);
@@ -227,7 +227,7 @@ public class RegistrationWindowController {
     }
 
     public void create() {
-        LOG.debug("Create Button clicked");
+        LOG.debug("Button \"ERSTELLEN\" clicked");
 
         Set<Registration> registrations = new HashSet<>();
         try {
-- 
cgit v1.2.3-70-g09d2


From 4099c183bb0c7e67c7dbe98d8620ca35e8897969 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Fri, 15 Jun 2018 14:49:15 +0200
Subject: Removed unused logger #27033

---
 .../einsatzverwaltung/controller/VehiclePaneController.java           | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 e0ce007..ed6e1a6 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
@@ -15,13 +15,9 @@ import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class VehiclePaneController extends CustomListItemController {
 
-    private static Logger LOG = LoggerFactory.getLogger(VehiclePaneController.class);
-
     public static VehiclePaneController createVehiclePane() throws IOException {
         FXMLLoader fxmlLoader =
                 new FXMLLoader(VehiclePaneController.class.getResource("/fxml/vehiclePane.fxml"));
-- 
cgit v1.2.3-70-g09d2


From f80a69e941f0949dbec476755abfd373c26846ce Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sat, 16 Jun 2018 20:18:14 +0200
Subject: Rework EmployeeDao to use pstmts directly #27305

---
 .../einsatzverwaltung/dao/EmployeeDatabaseDAO.java | 193 ++++++++-------------
 .../einsatzverwaltung/dao/EmployeeDAOTest.java     |   3 +-
 2 files changed, 71 insertions(+), 125 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 74e407f..f384937 100644
--- 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
@@ -9,9 +9,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Savepoint;
 import java.sql.Statement;
-import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.Set;
 import org.springframework.stereotype.Repository;
@@ -19,164 +18,112 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class EmployeeDatabaseDAO implements EmployeeDAO {
 
-    // TODO [optional] either implement own interface or use spring disposable
-    // bean to close prepared statements (feedback)
+    private JDBCConnectionManager jdbcConnectionManager;
 
-    private static final String INSERT_EMPLOYEE_VERSION =
-            "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
-                    + "VALUES(?, ?, ?, ?, ?)";
-    private static final String INSERT_EMPLOYEE = "INSERT INTO Employee(version) VALUES(?)";
-    private static final String LIST_EMPLOYEE =
-            "SELECT emp.id, v.name, v.birthday, v.educationLevel, v.isDriver, v.isPilot "
-                    + "FROM employee emp "
-                    + "JOIN EmployeeVersion v ON v.id = emp.version";
-    private static final String UPDATE_EMPLOYEE = "UPDATE Employee SET version = ? WHERE id = ?";
-
-    private final PreparedStatement insertEmployeeVersion,
-            insertEmployee,
-            listEmployee,
-            updateEmployee;
-
-    private final Connection connection;
-
-    public EmployeeDatabaseDAO(JDBCConnectionManager connectionManager)
-            throws PersistenceException {
-
-        try {
+    public EmployeeDatabaseDAO(JDBCConnectionManager jdbcConnectionManager) {
+        this.jdbcConnectionManager = jdbcConnectionManager;
+    }
 
-            connection = connectionManager.getConnection();
-            insertEmployeeVersion =
-                    connection.prepareStatement(
-                            INSERT_EMPLOYEE_VERSION, Statement.RETURN_GENERATED_KEYS);
-            insertEmployee =
-                    connection.prepareStatement(INSERT_EMPLOYEE, Statement.RETURN_GENERATED_KEYS);
+    private long createEmployeeVersion(Connection con, Employee e)
+            throws PersistenceException, SQLException {
+        String sql =
+                "INSERT INTO EmployeeVersion(name, birthday, educationLevel, isDriver, isPilot) "
+                        + "VALUES(?, ?, ?, ?, ?)";
 
-            listEmployee = connection.prepareStatement(LIST_EMPLOYEE);
+        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();
 
-            updateEmployee = connection.prepareStatement(UPDATE_EMPLOYEE);
+            try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                if (!rs.next()) throw new PersistenceException("Failed to insert EmployeeVersion");
 
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
+                return rs.getLong(1);
+            }
         }
     }
 
     @Override
     public long add(Employee employee) throws PersistenceException {
+        String sql = "INSERT INTO Employee(version) VALUES(?)";
 
-        // Assumption: the given employee is already validated (from service)
-        Savepoint savepoint = null;
         try {
-            savepoint = connection.setSavepoint();
-            connection.setAutoCommit(false);
-            insertEmployeeVersion.setString(1, employee.name());
-            insertEmployeeVersion.setTimestamp(
-                    2, Timestamp.valueOf(employee.birthday().atStartOfDay()));
-            insertEmployeeVersion.setString(3, employee.educationLevel().toString());
-            insertEmployeeVersion.setBoolean(4, employee.isDriver());
-            insertEmployeeVersion.setBoolean(5, employee.isPilot());
-            insertEmployeeVersion.executeUpdate();
-            try (ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys()) {
-                if (resultSetEmployeeVersion.next()) {
-                    long versionId = resultSetEmployeeVersion.getLong(1);
-
-                    insertEmployee.setLong(1, versionId);
-                    insertEmployee.executeUpdate();
-
-                    try (ResultSet resultSetEmployee = insertEmployee.getGeneratedKeys()) {
-                        if (resultSetEmployee.next()) {
-                            connection.commit();
-                            connection.setAutoCommit(true);
-                            return resultSetEmployee.getLong(1);
-                        }
-                    }
-                }
-            }
+            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();
 
-            throw new PersistenceException("Employee was not updated");
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next()) throw new PersistenceException("Failed to insert Employee");
 
+                    con.commit();
+                    con.setAutoCommit(true);
+                    return rs.getLong(1);
+                }
+            }
         } catch (SQLException e) {
-            rollbackAndEnableAutoCommit(savepoint);
             throw new PersistenceException(e);
         }
     }
 
     @Override
     public void update(Employee employee) throws ElementNotFoundException, PersistenceException {
+        String sql = "UPDATE Employee SET version = ? WHERE id = ?";
 
-        Savepoint savepoint = null;
         try {
-            savepoint = connection.setSavepoint();
-            connection.setAutoCommit(false);
-
-            insertEmployeeVersion.setString(1, employee.name());
-            insertEmployeeVersion.setTimestamp(
-                    2, Timestamp.valueOf(employee.birthday().atStartOfDay()));
-            insertEmployeeVersion.setString(3, employee.educationLevel().toString());
-            insertEmployeeVersion.setBoolean(4, employee.isDriver());
-            insertEmployeeVersion.setBoolean(5, employee.isPilot());
-            insertEmployeeVersion.executeUpdate();
-            try (ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys()) {
-
-                if (resultSetEmployeeVersion.next()) {
-                    long versionId = resultSetEmployeeVersion.getLong(1);
-
-                    updateEmployee.setLong(1, versionId);
-                    updateEmployee.setLong(2, employee.id());
-                    int affectedRows = updateEmployee.executeUpdate();
-
-                    if (affectedRows == 1) {
-                        connection.commit();
-                        connection.setAutoCommit(true);
-                    } else {
-                        throw new ElementNotFoundException(
-                                "element not found with id: " + employee.id());
-                    }
-                }
-            }
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
 
-        } catch (SQLException e) {
-            rollbackAndEnableAutoCommit(savepoint);
-            throw new PersistenceException(e);
-        }
-    }
+            long versionId = createEmployeeVersion(con, employee);
 
-    private void rollbackAndEnableAutoCommit(Savepoint savepoint) throws PersistenceException {
-        if (savepoint != null) {
-            try {
-                connection.rollback(savepoint);
-                connection.setAutoCommit(true);
-            } catch (SQLException e) {
-                throw new PersistenceException(e);
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setLong(1, versionId);
+                pstmt.setLong(2, employee.id());
+
+                if (pstmt.executeUpdate() != 1)
+                    throw new ElementNotFoundException("No such employeeId exists");
             }
+        } catch (SQLException e) {
+            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 {
-            Set<Employee> employees;
-            try (ResultSet rs = listEmployee.executeQuery()) {
-
-                employees = new HashSet<>();
-                while (rs.next()) {
-
-                    Employee employee =
-                            Employee.builder()
-                                    .id(rs.getLong(1))
-                                    .name(rs.getString(2))
-                                    .birthday(rs.getTimestamp(3).toLocalDateTime().toLocalDate())
-                                    .educationLevel(EducationLevel.valueOf(rs.getString(4)))
-                                    .isDriver(rs.getBoolean(5))
-                                    .isPilot(rs.getBoolean(6))
-                                    .build();
-
-                    employees.add(employee);
+            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);
         }
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
index 585e5ea..dfee5f0 100644
--- 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
@@ -23,7 +23,7 @@ public class EmployeeDAOTest extends JdbcTestCase {
 
     private EmployeeDAO employeePersistence;
 
-    public EmployeeDAOTest() throws PersistenceException {
+    public EmployeeDAOTest() {
         employeePersistence = new EmployeeDatabaseDAO(getJdbcConnectionManager());
     }
 
@@ -40,7 +40,6 @@ public class EmployeeDAOTest extends JdbcTestCase {
     public void testListEmployees() throws PersistenceException {
         Set<Employee> employees = employeePersistence.list();
 
-        System.out.println(LocalDate.parse("2010-10-10"));
         Employee empOne =
                 Employee.builder()
                         .id(1)
-- 
cgit v1.2.3-70-g09d2


From b023e81778c61d7ee6a6774544704e6b43b24311 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sat, 16 Jun 2018 21:58:50 +0200
Subject: Rollback when on getConnection() #27305

---
 .../groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java     | 5 ++++-
 .../groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java    | 4 ++--
 .../sepm/assignment/groupphase/util/JDBCConnectionManager.java    | 8 ++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index f384937..a58c8c7 100644
--- 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
@@ -65,11 +65,11 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
                     if (!rs.next()) throw new PersistenceException("Failed to insert Employee");
 
                     con.commit();
-                    con.setAutoCommit(true);
                     return rs.getLong(1);
                 }
             }
         } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
         }
     }
@@ -91,7 +91,10 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
                 if (pstmt.executeUpdate() != 1)
                     throw new ElementNotFoundException("No such employeeId exists");
             }
+
+            con.commit();
         } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
         }
     }
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
index b526d36..0b6ce08 100644
--- 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
@@ -70,9 +70,9 @@ public class OperationDatabaseDAO implements OperationDAO {
                 pstmt.executeBatch();
             }
             con.commit();
-            con.setAutoCommit(true);
             return operationId;
         } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
         }
     }
@@ -117,8 +117,8 @@ public class OperationDatabaseDAO implements OperationDAO {
                 pstmt.executeBatch();
             }
             con.commit();
-            con.setAutoCommit(true);
         } catch (SQLException e) {
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
         }
     }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/util/JDBCConnectionManager.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/util/JDBCConnectionManager.java
index 0ee3319..ea394ab 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/util/JDBCConnectionManager.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/util/JDBCConnectionManager.java
@@ -47,4 +47,12 @@ public class JDBCConnectionManager {
         }
         connection = null;
     }
+
+    public void rollbackConnection() {
+        try {
+            connection.rollback();
+        } catch (SQLException e) {
+            LOG.error("Failed to rollback connection", e);
+        }
+    }
 }
-- 
cgit v1.2.3-70-g09d2


From b676355ab04479864d9c0e57b8149c567928da26 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sat, 16 Jun 2018 22:46:08 +0200
Subject: Rework RegistrationDatabaseDAO #27305

---
 .../dao/RegistrationDatabaseDAO.java               | 148 ++++++++++-----------
 src/main/resources/sql/database.sql                |   4 +-
 .../einsatzverwaltung/dao/RegistrationDAOTest.java |   4 +-
 3 files changed, 73 insertions(+), 83 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index c3b1227..ed458d6 100644
--- 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
@@ -10,88 +10,70 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Timestamp;
+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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class RegistrationDatabaseDAO implements RegistrationDAO {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RegistrationDatabaseDAO.class);
-
-    private static final String ADD_REGISTRATION =
-            "INSERT INTO Registration (vehicleId, employeeId, start, end, active) VALUES (?,?,?,?,?);";
-    private static final String UPDATE_VEHICLE =
-            "UPDATE Vehicle SET status = 'FREI_WACHE' WHERE id = ?;";
-    private static final String FETCH_REGISTRATIONS =
-            "SELECT * FROM Registration WHERE vehicleId = ?";
-
-    private PreparedStatement addRegistration;
-    private PreparedStatement updateVehicle;
-    private PreparedStatement fetchRegistrations;
-
-    private Connection connection;
+    private JDBCConnectionManager jdbcConnectionManager;
     private EmployeeDAO employeePersistence;
 
     @Autowired
     public RegistrationDatabaseDAO(
-            JDBCConnectionManager connectionManager, EmployeeDAO employeePersistence)
-            throws PersistenceException {
+            JDBCConnectionManager jdbcConnectionManager, EmployeeDAO employeePersistence) {
+        this.jdbcConnectionManager = jdbcConnectionManager;
         this.employeePersistence = employeePersistence;
-        try {
-            connection = connectionManager.getConnection();
-            addRegistration =
-                    connection.prepareStatement(ADD_REGISTRATION, Statement.RETURN_GENERATED_KEYS);
-            updateVehicle = connection.prepareStatement(UPDATE_VEHICLE);
-            fetchRegistrations = connection.prepareStatement(FETCH_REGISTRATIONS);
-        } catch (SQLException e) {
-            throw new PersistenceException(e);
-        }
     }
 
     @Override
     public Set<Long> add(long vehicleId, Set<Registration> registrations)
             throws PersistenceException {
-        Set<Long> returnValues = new HashSet<>();
+        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.setAutoCommit(false);
-            for (Registration registration : registrations) {
-                addRegistration.setLong(1, vehicleId);
-                addRegistration.setLong(2, registration.employee().id());
-                addRegistration.setTimestamp(3, Timestamp.from(registration.start()));
-                addRegistration.setTimestamp(4, Timestamp.from(registration.end()));
-                addRegistration.setBoolean(
-                        5, true); // ASSUMPTION: Registration gets created as active
-                addRegistration.executeUpdate();
-                try (ResultSet rs = addRegistration.getGeneratedKeys()) {
-                    if (rs.next()) {
-                        returnValues.add(rs.getLong(1));
-                    } else {
-                        throw new PersistenceException(
-                                "Anmeldung konnte nicht gespeichert werden.");
-                    }
+            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));
                 }
             }
 
-            updateVehicle.setLong(1, vehicleId);
-            updateVehicle.executeUpdate();
+            try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
+                pstmt.setLong(1, vehicleId);
+                if (pstmt.executeUpdate() != 1)
+                    throw new PersistenceException("Failed to persist registration");
+            }
 
-            connection.commit();
-            connection.setAutoCommit(true);
-            return returnValues;
+            con.commit();
+            return vehicleIds;
         } catch (SQLException e) {
-            try {
-                connection.rollback();
-                connection.setAutoCommit(true);
-            } catch (SQLException e1) {
-                LOG.error("Rollback failed! Error message: {}", e.getMessage());
-            }
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
         }
     }
@@ -101,34 +83,42 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         throw new UnsupportedOperationException();
     }
 
-    public List<Registration> list(long vehicleId) throws PersistenceException {
+    protected List<Registration> list(long vehicleId) throws PersistenceException {
+        String sql = "SELECT * FROM Registration WHERE vehicleId = ?";
+
         List<Registration> registrationList = new ArrayList<>();
         try {
-            fetchRegistrations.setLong(1, vehicleId);
-            ResultSet rs = fetchRegistrations.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.getTimestamp("start").toInstant())
-                                .end(rs.getTimestamp("end").toInstant())
-                                .employee(emp)
-                                .build();
-                registrationList.add(registration);
+            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.getTimestamp("start").toInstant())
+                                        .end(rs.getTimestamp("end").toInstant())
+                                        .employee(emp)
+                                        .build();
+                        registrationList.add(registration);
+                    }
+                }
             }
+
+            return registrationList;
         } catch (SQLException e) {
             throw new PersistenceException(e);
         }
-
-        return registrationList;
     }
 }
diff --git a/src/main/resources/sql/database.sql b/src/main/resources/sql/database.sql
index 3d382d1..c7a99b5 100644
--- a/src/main/resources/sql/database.sql
+++ b/src/main/resources/sql/database.sql
@@ -33,8 +33,8 @@ CREATE TABLE IF NOT EXISTS Registration (
   id BIGINT AUTO_INCREMENT PRIMARY KEY,
   vehicleId BIGINT NOT NULL,
   employeeId BIGINT NOT NULL,
-  start TIMESTAMP NOT NULL,
-  end TIMESTAMP NOT NULL,
+  start TIMESTAMP WITH TIME ZONE NOT NULL,
+  end TIMESTAMP WITH TIME ZONE NOT NULL,
   active BOOLEAN NOT NULL,
   FOREIGN KEY (vehicleId) REFERENCES VehicleVersion(id),
   FOREIGN KEY (employeeId) REFERENCES EmployeeVersion(id),
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
index 289a0ae..2fb578b 100644
--- 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
@@ -105,8 +105,8 @@ public class RegistrationDAOTest extends JdbcTestCase {
                         .build();
         Registration registration =
                 Registration.builder()
-                        .start(Instant.MIN)
-                        .end(Instant.MAX)
+                        .start(Instant.now())
+                        .end(Instant.now())
                         .employee(employee)
                         .build();
         registrations.add(registration);
-- 
cgit v1.2.3-70-g09d2


From ee6579a874e3301e6a538bd0b101cdc127f44263 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sat, 16 Jun 2018 22:47:32 +0200
Subject: Rework VehicleDatabaseDAO #27305

---
 .../einsatzverwaltung/dao/VehicleDatabaseDAO.java  | 128 ++++++++-------------
 1 file changed, 47 insertions(+), 81 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 37915ea..3144288 100644
--- 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
@@ -11,19 +11,14 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Savepoint;
 import java.sql.Statement;
 import java.util.HashSet;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class VehicleDatabaseDAO implements VehicleDAO {
 
-    private static final Logger LOG = LoggerFactory.getLogger(VehicleDatabaseDAO.class);
-
     private final JDBCConnectionManager jdbcConnectionManager;
     private RegistrationDatabaseDAO registrationDatabaseDao;
 
@@ -33,85 +28,63 @@ public class VehicleDatabaseDAO implements VehicleDAO {
         this.registrationDatabaseDao = registrationDatabaseDao;
     }
 
-    public long add(Vehicle vehicle) throws PersistenceException {
-        String query1 =
+    @Override
+    public long add(Vehicle v) throws PersistenceException {
+        String sql =
                 "INSERT INTO VehicleVersion (name,hasNef,constructionType,type) VALUES (?,?,?,?)";
-        String query2 = "INSERT INTO Vehicle (version,status) VALUES (?,?)";
-
-        String status = "ABGEMELDET";
-        String name = "";
-        int id = -1;
-        int version = -1;
-        Connection connection = null;
-        Savepoint savepoint = null;
-        try {
-            connection = jdbcConnectionManager.getConnection();
-            connection.setAutoCommit(false);
-            savepoint = connection.setSavepoint();
-            try (PreparedStatement p1 =
-                    connection.prepareStatement(query1, PreparedStatement.RETURN_GENERATED_KEYS)) {
+        String sql2 = "INSERT INTO Vehicle (version,status) VALUES (?,?)";
+        String sql3 = "UPDATE VehicleVersion SET name=? WHERE id=?";
 
-                p1.setString(1, name);
-                p1.setBoolean(2, vehicle.hasNef());
-                p1.setString(3, vehicle.constructionType().name());
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+            con.setAutoCommit(false);
+            String name = "";
+            long version, id;
 
-                p1.setString(4, vehicle.type().name());
+            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();
 
-                p1.executeUpdate();
-                try (ResultSet keyResultSet = p1.getGeneratedKeys()) {
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next())
+                        throw new PersistenceException("Failed to insert into VehicleVersion");
 
-                    if (keyResultSet.next()) {
-                        version = keyResultSet.getInt(1);
-                    }
+                    version = rs.getLong(1);
                 }
             }
-            try (PreparedStatement p2 =
-                    connection.prepareStatement(query2, Statement.RETURN_GENERATED_KEYS)) {
 
-                p2.setInt(1, version);
-                p2.setString(2, status);
-                p2.executeUpdate();
-                try (ResultSet keyResultSet = p2.getGeneratedKeys()) {
+            try (PreparedStatement pstmt =
+                    con.prepareStatement(sql2, Statement.RETURN_GENERATED_KEYS)) {
+                pstmt.setLong(1, version);
+                pstmt.setInt(2, Status.ABGEMELDET.ordinal());
+                pstmt.executeUpdate();
 
-                    if (keyResultSet.next()) {
-                        id = keyResultSet.getInt(1);
-                    }
+                try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                    if (!rs.next()) throw new PersistenceException("Failed to insert into Vehicle");
+
+                    id = rs.getLong(1);
                 }
 
-                name = vehicle.type().name() + "-" + id;
+                name = v.type().name() + "-" + id;
             }
-            query1 = "UPDATE VehicleVersion SET name=? WHERE id=?";
-            try (PreparedStatement p3 = connection.prepareStatement(query1)) {
-                p3.setString(1, name);
-                p3.setInt(2, version);
-                p3.executeUpdate();
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql3)) {
+                pstmt.setString(1, name);
+                pstmt.setLong(2, version);
+
+                if (pstmt.executeUpdate() != 1)
+                    throw new PersistenceException("Failed to update VehicleVersion");
             }
 
-            connection.commit();
+            con.commit();
+            return id;
         } catch (SQLException e) {
-            rollbackAndEnableAutoCommit(connection, savepoint);
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
-        } finally {
-            try {
-                jdbcConnectionManager.getConnection().setAutoCommit(true);
-            } catch (SQLException e) {
-                LOG.error("Setting AutoCommit to true failed! ", e);
-            }
-        }
-        return id;
-    }
-
-    private void rollbackAndEnableAutoCommit(Connection connection, Savepoint savepoint)
-            throws PersistenceException {
-        try {
-            if (connection != null) {
-                if (savepoint != null) {
-                    connection.rollback(savepoint);
-                }
-                connection.setAutoCommit(true);
-            }
-        } catch (SQLException e1) {
-            throw new PersistenceException(e1);
         }
     }
 
@@ -125,12 +98,9 @@ public class VehicleDatabaseDAO implements VehicleDAO {
 
         long versionId;
 
-        Connection con = null;
-        Savepoint savepoint = null;
         try {
-            con = jdbcConnectionManager.getConnection();
+            Connection con = jdbcConnectionManager.getConnection();
             con.setAutoCommit(false);
-            savepoint = con.setSavepoint();
             try (PreparedStatement pstmt = con.prepareStatement(sql)) {
                 pstmt.setLong(1, v.id());
 
@@ -166,14 +136,8 @@ public class VehicleDatabaseDAO implements VehicleDAO {
 
             con.commit();
         } catch (SQLException e) {
-            rollbackAndEnableAutoCommit(con, savepoint);
+            jdbcConnectionManager.rollbackConnection();
             throw new PersistenceException(e);
-        } finally {
-            try {
-                jdbcConnectionManager.getConnection().setAutoCommit(true);
-            } catch (SQLException e) {
-                LOG.error("Setting AutoCommit to true failed! ", e);
-            }
         }
     }
 
@@ -193,7 +157,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                 }
             }
         } catch (SQLException e) {
-            throw new PersistenceException("Die Werte konnten nicht geladen werden.", e);
+            throw new PersistenceException(e);
         }
         return result;
     }
@@ -224,7 +188,9 @@ public class VehicleDatabaseDAO implements VehicleDAO {
     }
 
     @Override
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {}
+    public void remove(long id) throws ElementNotFoundException, PersistenceException {
+        throw new UnsupportedOperationException();
+    }
 
     private Vehicle vehicleFromRS(ResultSet rs) throws SQLException, PersistenceException {
         return Vehicle.builder()
-- 
cgit v1.2.3-70-g09d2


From 748398dba8c1cdd47e38407a5f11929352c9e70e Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sun, 17 Jun 2018 01:48:10 +0200
Subject: Rollback in cases where we throw ourselves #27305

---
 .../groupphase/einsatzverwaltung/dao/EmployeeDatabaseDAO.java    | 9 +++++++--
 .../einsatzverwaltung/dao/RegistrationDatabaseDAO.java           | 4 +++-
 .../groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java     | 9 +++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index a58c8c7..1d8286b 100644
--- 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
@@ -62,7 +62,10 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
                 pstmt.executeUpdate();
 
                 try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next()) throw new PersistenceException("Failed to insert Employee");
+                    if (!rs.next()) {
+                        con.rollback();
+                        throw new PersistenceException("Failed to insert Employee");
+                    }
 
                     con.commit();
                     return rs.getLong(1);
@@ -88,8 +91,10 @@ public class EmployeeDatabaseDAO implements EmployeeDAO {
                 pstmt.setLong(1, versionId);
                 pstmt.setLong(2, employee.id());
 
-                if (pstmt.executeUpdate() != 1)
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
                     throw new ElementNotFoundException("No such employeeId exists");
+                }
             }
 
             con.commit();
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
index ed458d6..6770942 100644
--- 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
@@ -66,8 +66,10 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
 
             try (PreparedStatement pstmt = con.prepareStatement(sql2)) {
                 pstmt.setLong(1, vehicleId);
-                if (pstmt.executeUpdate() != 1)
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
                     throw new PersistenceException("Failed to persist registration");
+                }
             }
 
             con.commit();
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
index 3144288..fcae6d3 100644
--- 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
@@ -64,7 +64,10 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                 pstmt.executeUpdate();
 
                 try (ResultSet rs = pstmt.getGeneratedKeys()) {
-                    if (!rs.next()) throw new PersistenceException("Failed to insert into Vehicle");
+                    if (!rs.next()) {
+                        con.rollback();
+                        throw new PersistenceException("Failed to insert into Vehicle");
+                    }
 
                     id = rs.getLong(1);
                 }
@@ -76,8 +79,10 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                 pstmt.setString(1, name);
                 pstmt.setLong(2, version);
 
-                if (pstmt.executeUpdate() != 1)
+                if (pstmt.executeUpdate() != 1) {
+                    con.rollback();
                     throw new PersistenceException("Failed to update VehicleVersion");
+                }
             }
 
             con.commit();
-- 
cgit v1.2.3-70-g09d2


From 69faf3743147c15fc666498ba2d4ec8f6206298d Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sun, 17 Jun 2018 03:47:56 +0200
Subject: Fix instant retrieval, RegistrationDAO.list #27305

---
 .../groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 6770942..9f7ac84 100644
--- 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
@@ -109,8 +109,12 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
                         Registration registration =
                                 Registration.builder()
                                         .id(rs.getLong("id"))
-                                        .start(rs.getTimestamp("start").toInstant())
-                                        .end(rs.getTimestamp("end").toInstant())
+                                        .start(
+                                                (rs.getObject("start", OffsetDateTime.class))
+                                                        .toInstant())
+                                        .end(
+                                                (rs.getObject("end", OffsetDateTime.class))
+                                                        .toInstant())
                                         .employee(emp)
                                         .build();
                         registrationList.add(registration);
-- 
cgit v1.2.3-70-g09d2


From 4c394df0fd6afeff29d28fd85366c1bb782bc30f Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 17 Jun 2018 15:57:07 +0200
Subject: Removed not needed FXMLLoader [#25963]

---
 .../controller/CreateOperationController.java      | 48 +---------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 0f2b4f5..81437f5 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
@@ -9,7 +9,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.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.Instant;
 import java.time.temporal.ChronoUnit;
@@ -21,8 +20,6 @@ import java.util.Set;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
@@ -38,7 +35,6 @@ 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;
 import org.springframework.stereotype.Controller;
@@ -69,15 +65,11 @@ public class CreateOperationController {
 
     private final OperationService operationService;
     private final VehicleService vehicleService;
-    private final SpringFXMLLoader fxmlLoader;
 
     public CreateOperationController(
-            OperationService operationService,
-            VehicleService vehicleService,
-            SpringFXMLLoader fxmlLoader) {
+            OperationService operationService, VehicleService vehicleService) {
         this.operationService = operationService;
         this.vehicleService = vehicleService;
-        this.fxmlLoader = fxmlLoader;
     }
 
     @FXML
@@ -328,48 +320,10 @@ public class CreateOperationController {
     }
 
     private void openArchivWindow() {
-        /*Stage stage = new Stage();
-        try {
-            stage.setScene(
-                    new Scene(
-                            (Parent)
-                                    fxmlLoader.load(
-                                            getClass()
-                                                    .getResourceAsStream(
-                                                            "/fxml/ArchiveOperation.fxml"))));
-        } catch (IOException e) {
-            LOG.error("IOException in openArchivWindow(). ", e);
-        }
-        stage.setTitle("Einsatz erstellen");
-        stage.centerOnScreen();
-        stage.show();
-        */
         archiveOperationController.setVisible(true);
         this.setVisible(false);
     }
 
-    private void openNewWindow(String fxmlFileName) {
-
-        Stage stage = new Stage();
-        try {
-            stage.setScene(
-                    new Scene(
-                            (Parent)
-                                    fxmlLoader.load(
-                                            getClass()
-                                                    .getResourceAsStream(
-                                                            "/fxml/" + fxmlFileName))));
-        } catch (IOException e) {
-            LOG.error("IOException in openNewWindow(). ", e);
-        }
-
-        stage.setTitle("Ressourcenverwaltung");
-        stage.centerOnScreen();
-        stage.showAndWait(); // important to call wait so that updateList is executed afterwards
-
-        updateList();
-    }
-
     void setVisible(boolean b) {
         apInvisible.setVisible(!b);
         grdWindowContainer.setVisible(!b);
-- 
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/java/at/ac/tuwien/sepm/assignment')

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/java/at/ac/tuwien/sepm/assignment')

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 b9521966604a101a50b2e9ac52d1f7a9f772b136 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:04:46 +0200
Subject: Display validation-error message in CreateNewEmployeeController
 [#25963]

---
 .../einsatzverwaltung/controller/CreateNewEmployeeController.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 45cca66..0ae6e91 100644
--- 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
@@ -107,12 +107,7 @@ public class CreateNewEmployeeController {
         } catch (InvalidEmployeeException e) {
             LOG.debug("Validation for Employee failed");
 
-            showModalDialogWithOkButton(
-                    AlertType.ERROR,
-                    "Ungültige Eingabe",
-                    "Mindestens eines der Eingabefelder haben einen ungültigen Wert!");
-            // TODO: could just display e.getMessage, which will show the cause of the failed
-            // validation in german
+            showModalDialogWithOkButton(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
             return;
         } catch (ServiceException e) {
             LOG.error("ServiceException in onCreateClicked(). ", e);
-- 
cgit v1.2.3-70-g09d2


From 071bc85d8a3593a2de8b1e16091428a77bbe6c68 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:07:00 +0200
Subject: Separate validation errors from exceptions w.r.t logging, alert
 [#25963]

---
 .../controller/CreateOperationController.java      | 50 ++++++++++++----------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 81437f5..8cebeab 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
@@ -164,14 +164,12 @@ public class CreateOperationController {
 
                 fpVehicles.getChildren().add(controller.getRootElement());
             }
-        } catch (ServiceException | IOException | InvalidOperationException e) {
+        } catch (ServiceException | IOException e) {
             LOG.error("Exception in updateList(). ", e);
-
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            showAlert(AlertType.ERROR, "Fehler", e.getMessage());
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in updateList(). ", e);
+            showAlert(AlertType.ERROR, "Validierungsfehler", e.getMessage());
         }
         try {
             lvActiveOperations.setItems(
@@ -179,11 +177,10 @@ public class CreateOperationController {
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
             LOG.error("ServiceException in updateList(). ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler - Einsätze");
-            alert.setHeaderText("Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten.");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            showAlert(
+                    AlertType.ERROR,
+                    "Fehler",
+                    "Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten");
         }
     }
 
@@ -276,20 +273,19 @@ public class CreateOperationController {
                         .build();
         try {
             operationService.add(operation);
-        } catch (ServiceException | InvalidOperationException e) {
+        } catch (ServiceException e) {
             LOG.error("Exception in createOperationClicked(). ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            showAlert(AlertType.ERROR, "Fehler", e.getMessage());
+            return;
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in createOperationClicked(). ", e);
+            showAlert(AlertType.ERROR, "Validierungsfehler", e.getMessage());
             return;
         }
-        Alert alert = new Alert(AlertType.CONFIRMATION);
-        alert.setTitle("Erfolg");
-        alert.setHeaderText("Erfolgreich gespeichert");
-        alert.setContentText("Der Einsatz wurde erfolgreich gespeichert.");
-        alert.showAndWait();
+        showAlert(
+                AlertType.CONFIRMATION,
+                "Erfolgreich gespeichert",
+                "Der Einsatz wurde erfolgreich gespeichert.");
         updateList();
         lblChosenVehicles.setText("keine ausgewählt");
         txtAddress.setText("");
@@ -298,6 +294,14 @@ public class CreateOperationController {
         chosenVehicles = new LinkedList<>();
     }
 
+    private void showAlert(AlertType alertType, String title, String content) {
+        Alert alert = new Alert(alertType);
+        alert.setTitle(title);
+        alert.setHeaderText(title);
+        alert.setContentText(content);
+        alert.showAndWait();
+    }
+
     public void onRegistrationLinkClicked(ActionEvent actionEvent) {
         LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
         openRegistrationWindow();
-- 
cgit v1.2.3-70-g09d2


From 51245c9906548d12f4804c83b6a6391030cffded Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:07:53 +0200
Subject: Validate destination and additionalInfo length of operation [#25963]

---
 .../einsatzverwaltung/service/OperationServiceImpl.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 598fd2c..a83cf64 100644
--- 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
@@ -257,9 +257,17 @@ public class OperationServiceImpl implements OperationService {
             throw new InvalidOperationException("Einsatz wurde in der Zukunft erstellt");
         }
 
-        if (o.destination().trim().isEmpty()) {
+        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 =
-- 
cgit v1.2.3-70-g09d2


From 673f3f051597428d3ebf7f4562e44701a600ff89 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:12:23 +0200
Subject: Remove unused methods [#25963]

---
 .../einsatzverwaltung/controller/CreateOperationController.java          | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 8cebeab..86ccbe9 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
@@ -18,7 +18,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-- 
cgit v1.2.3-70-g09d2


From 5b7060555731c447ef06f86244b036a95a95e356 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:12:56 +0200
Subject: Change modifier of fxml-methods to private [#25963]

---
 .../controller/CreateOperationController.java              | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 86ccbe9..6e29ea5 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
@@ -301,22 +301,26 @@ public class CreateOperationController {
         alert.showAndWait();
     }
 
-    public void onRegistrationLinkClicked(ActionEvent actionEvent) {
+    @FXML
+    private void onRegistrationLinkClicked() {
         LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
         openRegistrationWindow();
     }
 
-    public void onEmployeeLinkClicked(ActionEvent actionEvent) {
+    @FXML
+    private void onEmployeeLinkClicked() {
         LOG.debug("Hyperlink \"Personen\" clicked.");
         openCreateNewEmployeeWindow();
     }
 
-    public void onVehicleLinkClicked(ActionEvent actionEvent) {
+    @FXML
+    private void onVehicleLinkClicked() {
         LOG.debug("Hyperlink \"Fahrzeuge\" clicked.");
         openCreateCarWindow();
     }
 
-    public void onArchivLinkClicked() {
+    @FXML
+    private void onArchivLinkClicked() {
         LOG.debug("Hyperlink \"Archiv\" clicked.");
         archiveOperationController.update();
         openArchivWindow();
@@ -355,7 +359,7 @@ public class CreateOperationController {
     }
 
     @FXML
-    public void onOperationCodeChanged(KeyEvent keyEvent) {
+    private void onOperationCodeChanged(KeyEvent keyEvent) {
         if (keyEvent.getCode() == KeyCode.ENTER) {
             updateList();
         }
-- 
cgit v1.2.3-70-g09d2


From 63489992731e8c5c950728f417d75ed5f1a50304 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:21:18 +0200
Subject: Remove duplicate code by creating method generateOpCodeListItem
 [#25963]

---
 .../controller/CreateOperationController.java      | 31 ++++++++++++----------
 .../controller/OperationDetailsController.java     | 14 +---------
 2 files changed, 18 insertions(+), 27 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 6e29ea5..06b4bbd 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
@@ -75,20 +75,8 @@ public class CreateOperationController {
     private void initialize() {
 
         lblChosenVehicles.setText("keine ausgewählt");
-        lvActiveOperations.setCellFactory(
-                param ->
-                        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());
-                                }
-                            }
-                        });
+        lvActiveOperations.setCellFactory(param -> generateOpCodeListItem());
+
         lvActiveOperations.setOnMouseClicked(
                 event -> {
                     if (event.getClickCount() == 2) {
@@ -364,4 +352,19 @@ public class CreateOperationController {
             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/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
index c3d4947..ab348e1 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
@@ -53,19 +53,7 @@ public class OperationDetailsController {
     @FXML
     private void initialize() {
         lvActiveOperations.setCellFactory(
-                param ->
-                        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());
-                                }
-                            }
-                        });
+                param -> CreateOperationController.generateOpCodeListItem());
         lvActiveOperations.setOnMouseClicked(
                 event -> {
                     if (event.getClickCount() == 2) {
-- 
cgit v1.2.3-70-g09d2


From 7e9ec24bee09c38e1968cb7a26b5c14dc0e1b1bd Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 12:30:58 +0200
Subject: Create helper class to display alerts to remove duplicate code
 [#25963]

---
 .../controller/CreateNewEmployeeController.java    | 14 ++++----------
 .../controller/CreateOperationController.java      | 22 ++++++++--------------
 .../einsatzverwaltung/controller/Helper.java       | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 0ae6e91..8a6fb0c 100644
--- 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
@@ -107,19 +107,20 @@ public class CreateNewEmployeeController {
         } catch (InvalidEmployeeException e) {
             LOG.debug("Validation for Employee failed");
 
-            showModalDialogWithOkButton(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+            Helper.showAlertWithOkButtonAndWait(
+                    AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
             return;
         } catch (ServiceException e) {
             LOG.error("ServiceException in onCreateClicked(). ", e);
 
-            showModalDialogWithOkButton(
+            Helper.showAlertWithOkButtonAndWait(
                     AlertType.ERROR,
                     "Speicherfehler",
                     "Der Eintrag konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.");
             return;
         }
 
-        showModalDialogWithOkButton(
+        Helper.showAlertWithOkButtonAndWait(
                 AlertType.INFORMATION,
                 "Erfolgreich angelegt",
                 "Mitarbeiter wurde erfolgreich angelegt und gespeichert!");
@@ -129,13 +130,6 @@ public class CreateNewEmployeeController {
         }
     }
 
-    private void showModalDialogWithOkButton(
-            AlertType alertType, String headerText, String contentText) {
-        Alert alert = new Alert(alertType, contentText, ButtonType.OK);
-        alert.setHeaderText(headerText);
-        alert.showAndWait();
-    }
-
     private EducationLevel parseEducationLevel() {
         if (inputQualification.getSelectionModel().getSelectedItem() == null) {
             return EducationLevel.RS;
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 06b4bbd..68a3548 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
@@ -153,10 +153,11 @@ public class CreateOperationController {
             }
         } catch (ServiceException | IOException e) {
             LOG.error("Exception in updateList(). ", e);
-            showAlert(AlertType.ERROR, "Fehler", e.getMessage());
+            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in updateList(). ", e);
-            showAlert(AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            Helper.showAlertWithOkButtonAndWait(
+                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
         }
         try {
             lvActiveOperations.setItems(
@@ -164,7 +165,7 @@ public class CreateOperationController {
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
             LOG.error("ServiceException in updateList(). ", e);
-            showAlert(
+            Helper.showAlertWithOkButtonAndWait(
                     AlertType.ERROR,
                     "Fehler",
                     "Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten");
@@ -262,14 +263,15 @@ public class CreateOperationController {
             operationService.add(operation);
         } catch (ServiceException e) {
             LOG.error("Exception in createOperationClicked(). ", e);
-            showAlert(AlertType.ERROR, "Fehler", e.getMessage());
+            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
             return;
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in createOperationClicked(). ", e);
-            showAlert(AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            Helper.showAlertWithOkButtonAndWait(
+                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
             return;
         }
-        showAlert(
+        Helper.showAlertWithOkButtonAndWait(
                 AlertType.CONFIRMATION,
                 "Erfolgreich gespeichert",
                 "Der Einsatz wurde erfolgreich gespeichert.");
@@ -281,14 +283,6 @@ public class CreateOperationController {
         chosenVehicles = new LinkedList<>();
     }
 
-    private void showAlert(AlertType alertType, String title, String content) {
-        Alert alert = new Alert(alertType);
-        alert.setTitle(title);
-        alert.setHeaderText(title);
-        alert.setContentText(content);
-        alert.showAndWait();
-    }
-
     @FXML
     private void onRegistrationLinkClicked() {
         LOG.debug("Hyperlink \"Anmeldungen\" clicked.");
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
new file mode 100644
index 0000000..077c57a
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/Helper.java
@@ -0,0 +1,18 @@
+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;
+
+class Helper {
+
+    private Helper() {} // SonarLint insisted to create a private constructor to hide the public one
+
+    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();
+    }
+}
-- 
cgit v1.2.3-70-g09d2


From 7db103abe2fed5c9fb3f934495aac7ace20829ea Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:06:15 +0200
Subject: Separate validation and error messages in OperationDetailsCtrl
 [#25963]

---
 .../controller/OperationDetailsController.java     | 45 +++++++++++-----------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 ab348e1..3e37a04 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
@@ -118,21 +118,20 @@ public class OperationDetailsController {
         LOG.debug("Button \"Abschließen\" clicked.");
         try {
             operationService.complete(operation.id(), Status.COMPLETED);
-        } catch (InvalidOperationException | ServiceException e) {
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in closeOperationClicked(). ", e);
+            Helper.showAlertWithOkButtonAndWait(
+                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            return;
+        } catch (ServiceException e) {
             LOG.error("Exception in closeOperationClicked(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
             return;
         }
-        Alert alert = new Alert(AlertType.CONFIRMATION);
-        alert.setTitle("Erfolg");
-        alert.setHeaderText("Erfolgreich aktualisiert");
-        alert.setContentText("Der Einsatz wurde erfolgreich aktualisiert.");
-        alert.showAndWait();
-        closeWindow();
+        Helper.showAlertWithOkButtonAndWait(
+                AlertType.CONFIRMATION,
+                "Erfolgreich aktualisiert",
+                "Der Einsatz wurde erfolgreich aktualisiert.");
         createOperationController.updateList();
     }
 
@@ -140,20 +139,20 @@ public class OperationDetailsController {
         LOG.debug("Button \"Stornieren\" clicked.");
         try {
             operationService.complete(operation.id(), Status.CANCELLED);
-        } catch (InvalidOperationException | ServiceException e) {
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation error in cancelOperationClicked(). ", e);
+            Helper.showAlertWithOkButtonAndWait(
+                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            return;
+        } catch (ServiceException e) {
             LOG.error("Exception in cancelOperationClicked(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
             return;
         }
-        Alert alert = new Alert(AlertType.CONFIRMATION);
-        alert.setTitle("Erfolg");
-        alert.setHeaderText("Erfolgreich aktualisiert");
-        alert.setContentText("Der Einsatz wurde erfolgreich aktualisiert.");
-        alert.showAndWait();
+        Helper.showAlertWithOkButtonAndWait(
+                AlertType.CONFIRMATION,
+                "Erfolgreich aktualisiert",
+                "Der Einsatz wurde erfolgreich aktualisiert.");
         closeWindow();
         createOperationController.updateList();
     }
-- 
cgit v1.2.3-70-g09d2


From 77b66ff9e2b22ff8e869671f4a16caf0c5b02fe5 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:06:40 +0200
Subject: Separate validation and error messages in CreateOperationCtrl
 [#25963]

---
 .../controller/CreateOperationController.java      | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 68a3548..fe1b1d8 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
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Set;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
@@ -193,10 +192,16 @@ public class CreateOperationController {
                         try {
                             vehicleService.update(data.toBuilder().status(status).build());
                             this.updateList();
-                        } catch (InvalidVehicleException | ServiceException e) {
+                        } catch (InvalidVehicleException e) {
+                            LOG.debug(
+                                    "Validation error in createContextMenu(). (mi.setOnAction) ",
+                                    e);
+                            Helper.showAlertWithOkButtonAndWait(
+                                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+                        } catch (ServiceException e) {
                             LOG.error("Exception in createContextMenu(). (mi.setOnAction) ", e);
-                            Alert a = new Alert(AlertType.ERROR, e.getMessage());
-                            a.show();
+                            Helper.showAlertWithOkButtonAndWait(
+                                    AlertType.ERROR, "Fehler", e.getMessage());
                         }
                     });
 
@@ -233,10 +238,16 @@ public class CreateOperationController {
                                         .build());
 
                         this.updateList();
-                    } catch (InvalidVehicleException | ServiceException e) {
+                    } catch (InvalidVehicleException e) {
+                        LOG.debug(
+                                "Validation error in createContextMenu(). (abmelden.setOnAction) ",
+                                e);
+                        Helper.showAlertWithOkButtonAndWait(
+                                AlertType.ERROR, "Validierungsfehler", e.getMessage());
+                    } catch (ServiceException e) {
                         LOG.error("Exception in createContextMenu(). (abmelden.setOnAction) ", e);
-                        Alert a = new Alert(AlertType.ERROR, e.getMessage());
-                        a.show();
+                        Helper.showAlertWithOkButtonAndWait(
+                                AlertType.ERROR, "Fehler", e.getMessage());
                     }
                 });
 
-- 
cgit v1.2.3-70-g09d2


From b2684782f1a385cec6c4de4297298cc8435c7697 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:13:14 +0200
Subject: Create methods for displaying validation- and service errors [#25963]

---
 .../groupphase/einsatzverwaltung/controller/Helper.java       | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 077c57a..17d2019 100644
--- 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
@@ -6,8 +6,19 @@ import javafx.scene.control.ButtonType;
 
 class Helper {
 
+    private static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
+    private static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
+
     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 showAlertWithOkButtonAndWait(
             AlertType alertType, String headerText, String contentText) {
         Alert alert = new Alert(alertType, contentText, ButtonType.OK);
-- 
cgit v1.2.3-70-g09d2


From 04094db3417de513a390e55abb373e5118867794 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:17:46 +0200
Subject: Use helper method to display errors in ArchiveOperationCtrl [#25963]

---
 .../controller/ArchiveOperationController.java     | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 72b3b91..3cb9f47 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
@@ -1,5 +1,7 @@
 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;
@@ -19,7 +21,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -86,11 +87,8 @@ public class ArchiveOperationController {
             lblOperations.setText("Einsätze: " + list.size());
         } catch (ServiceException e) {
             LOG.error("ServiceException in update().", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText("Die Einsätze konnten nicht geladen werden!");
-            alert.showAndWait();
+            showServiceExceptionAlertAndWait("Die Einsätze konnten nicht geladen werden!");
+            ;
         }
         setFlowPane();
     }
@@ -118,11 +116,7 @@ public class ArchiveOperationController {
             }
         } catch (IOException e) {
             LOG.error("IOException in setFlowPane(). ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText("Die Element konnte nicht geladen werden!");
-            alert.showAndWait();
+            showServiceExceptionAlertAndWait("Die Elemente konnten nicht geladen werden!");
         }
     }
 
@@ -189,11 +183,7 @@ public class ArchiveOperationController {
             }
         } catch (IOException e) {
             LOG.error("IOException in setOperation(). ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText("Die Element konnte nicht geladen werden!");
-            alert.showAndWait();
+            showServiceExceptionAlertAndWait("Die Element konnte nicht geladen werden!");
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From d934b433d8a316583b57b402b4fdb5af99ef865d Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:21:41 +0200
Subject: Add showSuccessAlertAndWait method in Helper [#25963]

---
 .../assignment/groupphase/einsatzverwaltung/controller/Helper.java   | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 17d2019..a4e85dd 100644
--- 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
@@ -8,6 +8,7 @@ class Helper {
 
     private static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
     private static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
+    private static final String ALERT_TITLE_SUCCESS = "Erfolg";
 
     private Helper() {} // SonarLint insisted to create a private constructor to hide the public one
 
@@ -19,6 +20,10 @@ class Helper {
         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);
-- 
cgit v1.2.3-70-g09d2


From b34fc02af124a7eb542991c57a5d99f554020f04 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:26:02 +0200
Subject: Use specific helper methods for alerts in OperationDetailsCtrl
 [#25963]

---
 .../controller/OperationDetailsController.java     | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 3e37a04..7e66e22 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
@@ -1,5 +1,10 @@
 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;
@@ -13,7 +18,6 @@ import java.util.EnumSet;
 import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 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;
@@ -105,11 +109,7 @@ public class OperationDetailsController {
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
             LOG.error("ServiceException in fillActiveList(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            showServiceExceptionAlertAndWait(e.getMessage());
         }
     }
 
@@ -120,18 +120,14 @@ public class OperationDetailsController {
             operationService.complete(operation.id(), Status.COMPLETED);
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in closeOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            showAlertWithOkButtonAndWait(AlertType.ERROR, "Validierungsfehler", e.getMessage());
             return;
         } catch (ServiceException e) {
             LOG.error("Exception in closeOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
+            showServiceExceptionAlertAndWait(e.getMessage());
             return;
         }
-        Helper.showAlertWithOkButtonAndWait(
-                AlertType.CONFIRMATION,
-                "Erfolgreich aktualisiert",
-                "Der Einsatz wurde erfolgreich aktualisiert.");
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
         createOperationController.updateList();
     }
 
@@ -141,19 +137,14 @@ public class OperationDetailsController {
             operationService.complete(operation.id(), Status.CANCELLED);
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in cancelOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            showValidationErrorAlertAndWait(e.getMessage());
             return;
         } catch (ServiceException e) {
             LOG.error("Exception in cancelOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
+            showServiceExceptionAlertAndWait(e.getMessage());
             return;
         }
-        Helper.showAlertWithOkButtonAndWait(
-                AlertType.CONFIRMATION,
-                "Erfolgreich aktualisiert",
-                "Der Einsatz wurde erfolgreich aktualisiert.");
-        closeWindow();
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
         createOperationController.updateList();
     }
 
-- 
cgit v1.2.3-70-g09d2


From 82b8523d9834176de044dd7fd75f25b66621b8ad Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:31:05 +0200
Subject: Use helper methods for showing alerts in RegistrationWindowCtrl
 [#25963]

---
 .../controller/RegistrationWindowController.java   | 43 ++++++----------------
 1 file changed, 12 insertions(+), 31 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 e6c35a1..dd4ff92 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
@@ -1,5 +1,8 @@
 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;
@@ -27,8 +30,6 @@ 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.ScrollPane;
@@ -147,11 +148,8 @@ public class RegistrationWindowController {
                     });
         } catch (ServiceException e) {
             LOG.error("ServiceException in updateEmplList(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Personal - Fehler!");
-            alert.setHeaderText("Beim Auflisten des Personals ist ein Fehler aufgetreten.");
-            alert.setContentText(e.getMessage());
-            alert.show();
+            showServiceExceptionAlertAndWait(
+                    "Beim Auflisten des Personals ist ein Fehler aufgetreten.");
         }
     }
 
@@ -194,17 +192,11 @@ public class RegistrationWindowController {
             }
         } catch (ServiceException e) {
             LOG.error("ServiceException in updateVehList(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fahrzeuge - Fehler!");
-            alert.setHeaderText("Beim Auflisten der Fahrzeug ist ein Fehler aufgetreten.");
-            alert.setContentText(e.getMessage());
-            alert.show();
+            showServiceExceptionAlertAndWait(
+                    "Beim Auflisten der Fahrzeuge ist ein Fehler aufgetreten");
         } catch (IOException e) {
             LOG.error("IOException in updateVehList(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setContentText(e.getMessage());
-            alert.show();
+            showServiceExceptionAlertAndWait("Beim Laden der Fahrzeuge ist ein Fehler aufgetreten");
         }
     }
 
@@ -260,26 +252,15 @@ public class RegistrationWindowController {
             reset();
         } catch (InvalidVehicleException e) {
             LOG.debug("Validation of Vehicle in Registration failed.");
-            Alert alert = new Alert(AlertType.WARNING);
-            alert.setTitle("Ungültiges Fahrzeug");
-            alert.setHeaderText("Das spezifizierte Fahrzeug ist nicht gültig.");
-            alert.setContentText(e.getMessage());
-            alert.show();
+            showValidationErrorAlertAndWait("Das spezifizierte Fahrzeug ist nicht gültig.");
         } catch (ServiceException e) {
             LOG.error("ServiceException in create(). ", e);
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Anmeldung - Fehler!");
-            alert.setHeaderText("Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
-            alert.setContentText(e.getMessage());
-            alert.show();
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen der Anmeldung ist ein Fehler aufgetreten.");
         } catch (InvalidRegistrationException e) {
             LOG.debug("Validation of Registration failed.");
-            Alert alert = new Alert(AlertType.WARNING);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText(
+            showValidationErrorAlertAndWait(
                     "Die gewählte Kombination von Fahrzeug und Personal ist nicht gültig!");
-            alert.setContentText(e.getMessage());
-            alert.show();
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From fa8133bb7575678a367837b7fc78ab9777b32300 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:36:34 +0200
Subject: Use helper methods for showing alerts in CreateCarController [#25963]

---
 .../controller/CreateCarController.java            | 43 +++++++---------------
 1 file changed, 14 insertions(+), 29 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 1c74d2d..a4df90b 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
@@ -1,5 +1,9 @@
 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;
@@ -15,10 +19,7 @@ import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.input.MouseButton;
@@ -101,19 +102,17 @@ public class CreateCarController {
                 setToStart();
             } catch (InvalidVehicleException e) {
                 LOG.debug("Validation of Vehicle failed");
-                createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+                showValidationErrorAlertAndWait(e.getMessage());
                 setToStart();
                 return;
             } catch (ServiceException e) {
                 LOG.error("ServiceException in createCar(). ", e);
-                createComplete(AlertType.ERROR, "Fehler", e.getMessage());
+                showServiceExceptionAlertAndWait(
+                        "Ein Fehler beim Erstellen des Fahrzeuges ist aufgetreten.");
                 setToStart();
                 return;
             }
-            createComplete(
-                    AlertType.CONFIRMATION,
-                    "Speichern Erfolgreich",
-                    "Auto wurde erfolgreich angelegt");
+            showSuccessAlertAndWait("Auto wurde erfolgreich angelegt.");
         } else {
             LOG.debug("Button \"Speichern\" clicked.");
             try {
@@ -131,19 +130,16 @@ public class CreateCarController {
                 chooseVehicle = null;
             } catch (InvalidVehicleException e) {
                 LOG.debug("Validation of Vehicle failed");
-                createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+                showValidationErrorAlertAndWait(e.getMessage());
                 setToStart();
                 return;
             } catch (ServiceException e) {
                 LOG.error("ServiceException in createCar(). ", e);
-                createComplete(AlertType.ERROR, "Fehler", e.getMessage());
+                showServiceExceptionAlertAndWait(e.getMessage());
                 setToStart();
                 return;
             }
-            createComplete(
-                    AlertType.CONFIRMATION,
-                    "Bearbeiten Erfolgreich",
-                    "Auto wurde erfolgreich bearbeitet");
+            showSuccessAlertAndWait("Auto wurde erfolgreich bearbeitet.");
         }
 
         updateVehiclePane();
@@ -153,20 +149,14 @@ public class CreateCarController {
         if (cmbCtype.getSelectionModel().getSelectedItem() == null) {
             return ConstructionType.NORMAL;
         }
-        return ConstructionType.valueOf(cmbCtype.getSelectionModel().getSelectedItem().toString());
+        return ConstructionType.valueOf(cmbCtype.getSelectionModel().getSelectedItem());
     }
 
     private VehicleType parseType() {
         if (cmbTyp.getSelectionModel().getSelectedItem() == null) {
             return VehicleType.BKTW;
         }
-        return VehicleType.valueOf(cmbTyp.getSelectionModel().getSelectedItem().toString());
-    }
-
-    private void createComplete(AlertType alertType, String headerText, String contentText) {
-        Alert alert = new Alert(alertType, contentText, ButtonType.OK);
-        alert.setHeaderText(headerText);
-        alert.showAndWait();
+        return VehicleType.valueOf(cmbTyp.getSelectionModel().getSelectedItem());
     }
 
     private void setToStart() {
@@ -235,12 +225,7 @@ public class CreateCarController {
             }
         } catch (ServiceException | IOException e) {
             LOG.error("Exception in updateVehiclePane(). ", e);
-
-            Alert alert = new Alert(AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(e.getMessage());
-            alert.showAndWait();
+            showServiceExceptionAlertAndWait(e.getMessage());
         }
     }
 }
-- 
cgit v1.2.3-70-g09d2


From e845001685a0e0b77ec1bc2c16818cce30de8861 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:38:46 +0200
Subject: Use helper methods for alerts in DetailArchiveOperationCtrl [#25963]

---
 .../controller/DetailArchiveOperationController.java      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 1859605..256fd4b 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
@@ -1,5 +1,7 @@
 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;
@@ -8,7 +10,6 @@ import java.io.IOException;
 import java.util.Objects;
 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;
@@ -54,12 +55,8 @@ public class DetailArchiveOperationController {
             vBoxVehicle.getChildren().add(controller.getRootElement());
         } catch (IOException e) {
             LOG.error("IOException in set(Vehicle). (vBoxVehicle) ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(
+            showServiceExceptionAlertAndWait(
                     "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
-            alert.showAndWait();
         }
         try {
             for (int i = 0; i < Objects.requireNonNull(vehicle.registrations()).size(); i++) {
@@ -73,12 +70,8 @@ public class DetailArchiveOperationController {
             }
         } catch (IOException e) {
             LOG.error("IOException in set(Vehicle). (vBoxPeople) ", e);
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Fehler");
-            alert.setHeaderText("Fehler!");
-            alert.setContentText(
+            showServiceExceptionAlertAndWait(
                     "Ein interner Fehler ist aufgetreten. Bitte wenden Sie sich an den/die SystemadministratorIn.");
-            alert.showAndWait();
         }
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 90152495c6f708aa4a324fc29473a0871fdfa777 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:49:46 +0200
Subject: Use specific helper methods for alerts in CreateOperationCtrl
 [#25963]

---
 .../controller/CreateOperationController.java      | 40 ++++++++++------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 fe1b1d8..c3eb32b 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
@@ -1,5 +1,9 @@
 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;
@@ -19,7 +23,6 @@ import java.util.List;
 import java.util.Set;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
@@ -152,11 +155,11 @@ public class CreateOperationController {
             }
         } catch (ServiceException | IOException e) {
             LOG.error("Exception in updateList(). ", e);
-            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen des Ranking ist ein Fehler aufgetreten.");
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in updateList(). ", e);
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            showValidationErrorAlertAndWait(e.getMessage());
         }
         try {
             lvActiveOperations.setItems(
@@ -164,9 +167,7 @@ public class CreateOperationController {
                             operationService.list(EnumSet.of(Status.ACTIVE))));
         } catch (ServiceException e) {
             LOG.error("ServiceException in updateList(). ", e);
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR,
-                    "Fehler",
+            showServiceExceptionAlertAndWait(
                     "Beim Holen der aktiven Einsätze ist ein Fehler aufgetreten");
         }
     }
@@ -196,12 +197,11 @@ public class CreateOperationController {
                             LOG.debug(
                                     "Validation error in createContextMenu(). (mi.setOnAction) ",
                                     e);
-                            Helper.showAlertWithOkButtonAndWait(
-                                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+                            showValidationErrorAlertAndWait(e.getMessage());
                         } catch (ServiceException e) {
                             LOG.error("Exception in createContextMenu(). (mi.setOnAction) ", e);
-                            Helper.showAlertWithOkButtonAndWait(
-                                    AlertType.ERROR, "Fehler", e.getMessage());
+                            showServiceExceptionAlertAndWait(
+                                    "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
                         }
                     });
 
@@ -242,12 +242,11 @@ public class CreateOperationController {
                         LOG.debug(
                                 "Validation error in createContextMenu(). (abmelden.setOnAction) ",
                                 e);
-                        Helper.showAlertWithOkButtonAndWait(
-                                AlertType.ERROR, "Validierungsfehler", e.getMessage());
+                        showValidationErrorAlertAndWait(e.getMessage());
                     } catch (ServiceException e) {
                         LOG.error("Exception in createContextMenu(). (abmelden.setOnAction) ", e);
-                        Helper.showAlertWithOkButtonAndWait(
-                                AlertType.ERROR, "Fehler", e.getMessage());
+                        showServiceExceptionAlertAndWait(
+                                "Beim Aktualisieren der Fahrzeuge ist ein Fehler aufgetreten.");
                     }
                 });
 
@@ -274,18 +273,15 @@ public class CreateOperationController {
             operationService.add(operation);
         } catch (ServiceException e) {
             LOG.error("Exception in createOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(AlertType.ERROR, "Fehler", e.getMessage());
+            showServiceExceptionAlertAndWait(
+                    "Beim Erstellen des Einsatzes ist ein Fehler aufgetreten.");
             return;
         } catch (InvalidOperationException e) {
             LOG.debug("Validation error in createOperationClicked(). ", e);
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR, "Validierungsfehler", e.getMessage());
+            showValidationErrorAlertAndWait(e.getMessage());
             return;
         }
-        Helper.showAlertWithOkButtonAndWait(
-                AlertType.CONFIRMATION,
-                "Erfolgreich gespeichert",
-                "Der Einsatz wurde erfolgreich gespeichert.");
+        showSuccessAlertAndWait("Der Einsatz wurde erfolgreich gespeichert.");
         updateList();
         lblChosenVehicles.setText("keine ausgewählt");
         txtAddress.setText("");
-- 
cgit v1.2.3-70-g09d2


From 490cc59a471e11393dd6188a0e8cbba96781a3d2 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:50:11 +0200
Subject: Use specific helper methods for alerts in CreateNewEmployeeCtrl
 [#25963]

---
 .../controller/CreateNewEmployeeController.java    | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 8a6fb0c..5f0a8b2 100644
--- 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
@@ -1,5 +1,9 @@
 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;
@@ -14,10 +18,7 @@ import java.util.stream.Stream;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
@@ -106,24 +107,17 @@ public class CreateNewEmployeeController {
             }
         } catch (InvalidEmployeeException e) {
             LOG.debug("Validation for Employee failed");
-
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+            showValidationErrorAlertAndWait(e.getMessage());
             return;
         } catch (ServiceException e) {
             LOG.error("ServiceException in onCreateClicked(). ", e);
-
-            Helper.showAlertWithOkButtonAndWait(
-                    AlertType.ERROR,
-                    "Speicherfehler",
+            showServiceExceptionAlertAndWait(
                     "Der Eintrag konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.");
             return;
         }
 
-        Helper.showAlertWithOkButtonAndWait(
-                AlertType.INFORMATION,
-                "Erfolgreich angelegt",
-                "Mitarbeiter wurde erfolgreich angelegt und gespeichert!");
+        showSuccessAlertAndWait(
+                "Der/die MitarbeiterIn wurde erfolgreich angelegt und gespeichert!");
 
         if (consumerCreateClicked != null) {
             consumerCreateClicked.run();
@@ -144,7 +138,6 @@ public class CreateNewEmployeeController {
         inputQualification.setValue(employee.educationLevel().name());
         inputIsDriver.setSelected(employee.isDriver());
         inputIsPilot.setSelected(employee.isPilot());
-
         lblHeader.setText("Person bearbeiten");
         btnCreate.setText("Speichern");
     }
-- 
cgit v1.2.3-70-g09d2


From 8207c1773aa144793cb42ae37104a836a4df6df4 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 16:59:12 +0200
Subject: Fix employee&vehicle-dao-tests to use correct alert headers [#25963]

---
 .../groupphase/einsatzverwaltung/controller/Helper.java          | 8 ++++----
 .../controller/CreateNewEmployeeControllerTest.java              | 9 ++++++---
 .../controller/CreateNewVehicleControllerTest.java               | 9 ++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index a4e85dd..694c804 100644
--- 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
@@ -4,11 +4,11 @@ import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 
-class Helper {
+public class Helper {
 
-    private static final String ALERT_TITLE_VALIDATION_ERROR = "Validierungsfehler";
-    private static final String ALERT_TITLE_SERVICE_EXCEPTION = "Fehler";
-    private static final String ALERT_TITLE_SUCCESS = "Erfolg";
+    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
 
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
index ea09fb7..3273593 100644
--- 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
@@ -1,5 +1,8 @@
 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;
 
@@ -47,7 +50,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Erfolgreich angelegt", dialogPane.getHeaderText());
+        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
     }
 
     @Test
@@ -62,7 +65,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Ungültige Eingabe", dialogPane.getHeaderText());
+        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
     }
 
     @Test
@@ -79,6 +82,6 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Speicherfehler", dialogPane.getHeaderText());
+        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
index 9e6c470..f5f4b57 100644
--- 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
@@ -1,5 +1,8 @@
 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;
 
@@ -45,7 +48,7 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Speichern Erfolgreich", dialogPane.getHeaderText());
+        Assert.assertEquals(ALERT_TITLE_SUCCESS, dialogPane.getHeaderText());
     }
 
     @Test
@@ -59,7 +62,7 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Ungültige Eingabe", dialogPane.getHeaderText());
+        Assert.assertEquals(ALERT_TITLE_VALIDATION_ERROR, dialogPane.getHeaderText());
     }
 
     @Test
@@ -73,6 +76,6 @@ public class CreateNewVehicleControllerTest extends HighDpiAwareApplicationTest
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
-        Assert.assertEquals("Fehler", dialogPane.getHeaderText());
+        Assert.assertEquals(ALERT_TITLE_SERVICE_EXCEPTION, dialogPane.getHeaderText());
     }
 }
-- 
cgit v1.2.3-70-g09d2


From ed036e53ac725a9a2100e64f56ba7cad399321e5 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Sun, 17 Jun 2018 20:03:32 +0200
Subject: Fix merged code to use showService..() instead

---
 .../einsatzverwaltung/controller/OperationDetailsController.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 7e66e22..aec1e6a 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
@@ -79,12 +79,7 @@ public class OperationDetailsController {
             }
         } 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();
+            showServiceExceptionAlertAndWait("Error while updating list.");
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 667a6b2be272ff4d8806d37c62c9846af6359e8c Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sun, 17 Jun 2018 17:00:12 +0200
Subject: Remove unused code [#25963]

---
 .../einsatzverwaltung/controller/ArchiveOperationController.java    | 6 ------
 .../einsatzverwaltung/controller/OperationDetailsController.java    | 1 -
 2 files changed, 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 3cb9f47..9ac6a1a 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
@@ -20,7 +20,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -187,11 +186,6 @@ public class ArchiveOperationController {
         }
     }
 
-    public void setListVisible(boolean b) {
-        apMainDetails.setVisible(b);
-        archiveOperationFlowPane.setVisible(b);
-    }
-
     private void setDetailsVisible(boolean b) {
         apDetails.setVisible(b);
     }
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 aec1e6a..dc8d0fb 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
@@ -21,7 +21,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 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;
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 6f7f52ecf594ed131bdb557783be3ec6e49d7a85 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 17 Jun 2018 22:05:15 +0200
Subject: Fixed a bug where window of active operation would not close [#27300]

---
 .../einsatzverwaltung/controller/OperationDetailsController.java        | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 86c4de7..c0c68f3 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
@@ -126,6 +126,7 @@ public class OperationDetailsController {
         }
         showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
         createOperationController.updateList();
+        closeWindow();
     }
 
     public void cancelOperationClicked() {
@@ -143,6 +144,7 @@ public class OperationDetailsController {
         }
         showSuccessAlertAndWait("Der Einsatz wurde erfolgreich aktualisiert");
         createOperationController.updateList();
+        closeWindow();
     }
 
     private void requestVehicleClicked(VehiclePaneController v) {
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 1a018e9eb023cc355fa72e74de1da7c4795affae Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Mon, 18 Jun 2018 19:42:19 +0200
Subject: Add PopulateDB for testing

---
 .../groupphase/application/PopulateDB.java           | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
new file mode 100644
index 0000000..b115e56
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
@@ -0,0 +1,20 @@
+package at.ac.tuwien.sepm.assignment.groupphase.application;
+
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.io.InputStreamReader;
+import java.sql.SQLException;
+import org.h2.tools.RunScript;
+import org.springframework.core.io.ClassPathResource;
+
+public class PopulateDB {
+    public static void main(String[] args) throws SQLException {
+        JDBCConnectionManager jdbcConnectionManager = new JDBCConnectionManager();
+
+        RunScript.execute(
+                jdbcConnectionManager.getConnection(),
+                new InputStreamReader(
+                        ClassPathResource.class.getResourceAsStream("/sql/Testdaten.sql")));
+
+        jdbcConnectionManager.closeConnection();
+    }
+}
-- 
cgit v1.2.3-70-g09d2


From 9056b605578fcaee29965074365b9527ba865ecd Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Mon, 18 Jun 2018 20:03:50 +0200
Subject: edit Testdata #28617

---
 .../groupphase/application/PopulateDB.java         |   2 +-
 src/main/resources/sql/Testdaten.sql               | 792 ---------------------
 src/main/resources/sql/testdata.sql                | 792 +++++++++++++++++++++
 3 files changed, 793 insertions(+), 793 deletions(-)
 delete mode 100644 src/main/resources/sql/Testdaten.sql
 create mode 100644 src/main/resources/sql/testdata.sql

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
index b115e56..4ff1f78 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
@@ -13,7 +13,7 @@ public class PopulateDB {
         RunScript.execute(
                 jdbcConnectionManager.getConnection(),
                 new InputStreamReader(
-                        ClassPathResource.class.getResourceAsStream("/sql/Testdaten.sql")));
+                        ClassPathResource.class.getResourceAsStream("/sql/testdata.sql")));
 
         jdbcConnectionManager.closeConnection();
     }
diff --git a/src/main/resources/sql/Testdaten.sql b/src/main/resources/sql/Testdaten.sql
deleted file mode 100644
index 960ec93..0000000
--- a/src/main/resources/sql/Testdaten.sql
+++ /dev/null
@@ -1,792 +0,0 @@
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (1, 'Bess Peak', '1961-03-01', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (2, 'Maryrose Farriar', '1970-11-16', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (3, 'Hannis MacLardie', '1970-12-20', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (4, 'Major Folbige', '1959-12-09', 'NKV', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (5, 'Bronny Nel', '1966-03-07', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (6, 'Fransisco Labadini', '1963-09-01', 'NKI', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (7, 'Dannie Skeldon', '1969-12-25', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (8, 'Pippa Sickert', '1987-02-28', 'NKA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (9, 'Gwendolyn Grigolon', '1975-03-05', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (10, 'Aileen McGuinley', '1988-01-08', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (11, 'Barbra Izon', '1984-11-14', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (12, 'Ailsun Nestoruk', '1969-12-25', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (13, 'Ulrika Choake', '1975-06-17', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (14, 'Myrtia Elsmor', '1974-05-23', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (15, 'Brade Hurst', '1980-12-14', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (16, 'Valli Fancet', '1955-11-11', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (17, 'Dana Nixon', '1973-08-19', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (18, 'Anjela Orrice', '1986-04-21', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (19, 'Normie Martinie', '1988-09-30', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (20, 'Martelle Tunnick', '1972-01-29', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (21, 'Laurent Janouch', '1990-05-25', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (22, 'Scarface Portchmouth', '1970-04-26', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (23, 'Anatola McHugh', '1972-03-08', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (24, 'Tatum Flaonier', '1979-01-26', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (25, 'Dianna Philo', '1998-09-07', 'NKI', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (26, 'Ave Thow', '1965-07-30', 'NKV', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (27, 'Vail Naptine', '1986-08-28', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (28, 'Gaven Gainsbury', '1991-01-21', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (29, 'Kaile Hartill', '1970-06-30', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (30, 'Floria Trevaskis', '1955-01-14', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (31, 'Bidget Dukelow', '1969-12-14', 'NKI', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (32, 'Reece Mushet', '1989-07-18', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (33, 'Rafaellle Hurdle', '1968-04-25', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (34, 'Kristoforo Boner', '1960-11-26', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (35, 'Carree Marquot', '1982-10-29', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (36, 'Max Maldin', '1955-08-30', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (37, 'Betsy Urion', '1999-01-09', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (38, 'Jud Levey', '1986-08-28', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (39, 'Stepha Adriani', '1964-06-26', 'NA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (40, 'Jodie Yeskin', '1963-06-22', 'NKV', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (41, 'Viole Heritege', '1999-11-27', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (42, 'Mort Dudson', '1973-07-28', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (43, 'Brittney Srawley', '1955-04-12', 'NKI', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (44, 'Tod Plevey', '1994-09-28', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (45, 'Rhianon Lawday', '1963-11-15', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (46, 'Hill Jachtym', '1972-10-02', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (47, 'Gregory Sheavills', '1971-08-14', 'NKI', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (48, 'Linnea Castlake', '1966-03-31', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (49, 'Curr Robertz', '1983-09-24', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (50, 'Ricki Trevillion', '1972-08-17', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (51, 'Haily Gloyens', '1975-08-24', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (52, 'Sherwynd Bugbird', '1966-01-16', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (53, 'Cathrin Hamlen', '1973-01-15', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (54, 'Oliver Ropars', '1964-02-28', 'NKA', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (55, 'Mersey Suerz', '1988-03-03', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (56, 'Fabio Mapes', '1986-01-01', 'NKA', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (57, 'Devondra Jonsson', '1969-10-01', 'NKI', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (58, 'Malva Pulver', '1984-06-11', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (59, 'Petronella MacCorkell', '1990-01-25', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (60, 'Letty McKag', '1989-02-05', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (61, 'Nikoletta McLeish', '1956-09-19', 'NKV', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (62, 'Mella Gerred', '1963-04-28', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (63, 'Banky Bradforth', '1983-12-23', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (64, 'Etta Curnow', '1993-06-29', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (65, 'Bobina Fernez', '1956-12-14', 'NKV', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (66, 'Dreddy Pessold', '1972-02-25', 'NA', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (67, 'Maxie Speedy', '1984-04-19', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (68, 'Benetta Jent', '1969-12-27', 'NA', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (69, 'Caro Szanto', '1957-06-14', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (70, 'Carmela Alejandre', '1979-12-05', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (71, 'Merrile Doig', '1992-08-07', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (72, 'Michell Sanney', '1959-08-11', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (73, 'Kata Spark', '1988-12-18', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (74, 'Chelsie Normanville', '1972-04-14', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (75, 'Ciro Grigg', '1957-02-18', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (76, 'Shela Larkcum', '1979-12-14', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (77, 'Myrvyn Denyukin', '1976-07-07', 'NKA', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (78, 'Lethia Glede', '1972-12-10', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (79, 'Malchy Chiverton', '1971-08-14', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (80, 'Dario Rasor', '1997-10-05', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (81, 'Anni Baldacco', '1961-08-05', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (82, 'Brigit Wheelband', '1966-06-21', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (83, 'Niki Tynemouth', '1968-09-17', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (84, 'Nikki Mea', '1965-08-14', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (85, 'Dania Garrique', '1986-03-25', 'NA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (86, 'Dorelia Leggs', '1960-12-16', 'NKI', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (87, 'Cristin Carous', '1999-10-21', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (88, 'Clare Caustick', '1969-09-27', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (89, 'Conant Gallo', '1993-11-19', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (90, 'Gwyneth Cavie', '1956-04-12', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (91, 'Mabel Meadley', '1966-11-25', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (92, 'Mona Bonafant', '1957-06-12', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (93, 'Clarita Fealty', '1987-12-22', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (94, 'Elie Jardin', '1986-01-10', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (95, 'Pacorro Dobing', '1988-01-04', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (96, 'Marci Wloch', '1973-08-23', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (97, 'Micky Fossett', '2000-01-13', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (98, 'Bil Rangall', '1979-05-06', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (99, 'Athena Matteoni', '1980-11-08', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (100, 'Molly Fennelly', '1980-06-14', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (101, 'Dylan Fordyce', '1983-12-03', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (102, 'Onida Betjeman', '1993-01-12', 'NKI', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (103, 'Brietta Biswell', '1956-09-18', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (104, 'Elna Boyton', '1983-04-08', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (105, 'Zsazsa Robertazzi', '1967-08-28', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (106, 'Brook Bleier', '1976-12-04', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (107, 'Kaleena Fosh', '1987-08-04', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (108, 'Julee Polamontayne', '1988-09-30', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (109, 'Arte Elliss', '1965-08-30', 'NA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (110, 'Celia Skelcher', '1965-01-31', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (111, 'Kelsey Luetkemeyer', '1976-07-27', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (112, 'Pedro Jakubowski', '1982-07-10', 'NA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (113, 'Licha Slatten', '1985-03-19', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (114, 'Adella Sisson', '1997-06-02', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (115, 'Hagan Senett', '1979-09-25', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (116, 'Jecho Beilby', '1993-12-27', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (117, 'Karoly Toolin', '1988-06-11', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (118, 'Madelon Steart', '1987-08-04', 'NKA', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (119, 'Laverne Yelland', '1980-11-09', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (120, 'Murry Bottoner', '1955-04-21', 'NKA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (121, 'Sianna Tomney', '1987-04-14', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (122, 'Dulcea Squirrell', '1967-03-07', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (123, 'Bengt Durbridge', '1966-04-15', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (124, 'Cletus Akenhead', '1974-06-13', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (125, 'Huntington McKeand', '1988-12-21', 'NA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (126, 'Carolin Doget', '1974-05-02', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (127, 'Bobby Iredell', '1974-01-25', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (128, 'Preston Pidgeon', '1987-06-17', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (129, 'Gretta Darnbrough', '1996-05-22', 'NKI', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (130, 'Justen Hearley', '1976-08-09', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (131, 'Davon Baser', '1987-03-02', 'RS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (132, 'Alasdair Clancy', '1993-05-24', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (133, 'Hattie Kareman', '1997-07-07', 'NKA', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (134, 'Ignaz Buddell', '1986-02-07', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (135, 'Ashil Kanter', '1977-06-17', 'NFS', true, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (136, 'Daniele Mallam', '1969-01-26', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (137, 'Eugenius Stuehmeier', '1961-10-16', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (138, 'Jdavie Acey', '1991-11-21', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (139, 'Jaynell Fossord', '1967-10-15', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (140, 'Roarke Peascod', '1956-12-01', 'NKA', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (141, 'Horacio Boxer', '1990-02-12', 'NKA', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (142, 'Bard Thyng', '1979-01-25', 'NKI', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (143, 'Nadia Fayre', '1979-03-02', 'NFS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (144, 'Garrot Fry', '1960-12-30', 'NKV', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (145, 'Kristal Hammor', '1975-09-05', 'RS', true, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (146, 'Barnebas Kinsell', '2000-10-11', 'NFS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (147, 'Marleen Entwhistle', '1960-04-08', 'NFS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (148, 'Paule Kettlestring', '1978-04-04', 'RS', false, false);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (149, 'Valentin Nerval', '1999-06-01', 'RS', false, true);
-insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (150, 'Zitella Bywaters', '1966-11-11', 'NKA', true, true);
-
-
-insert into Employee (id, version) values (1, 1);
-insert into Employee (id, version) values (2, 2);
-insert into Employee (id, version) values (3, 3);
-insert into Employee (id, version) values (4, 4);
-insert into Employee (id, version) values (5, 5);
-insert into Employee (id, version) values (6, 6);
-insert into Employee (id, version) values (7, 7);
-insert into Employee (id, version) values (8, 8);
-insert into Employee (id, version) values (9, 9);
-insert into Employee (id, version) values (10, 10);
-insert into Employee (id, version) values (11, 11);
-insert into Employee (id, version) values (12, 12);
-insert into Employee (id, version) values (13, 13);
-insert into Employee (id, version) values (14, 14);
-insert into Employee (id, version) values (15, 15);
-insert into Employee (id, version) values (16, 16);
-insert into Employee (id, version) values (17, 17);
-insert into Employee (id, version) values (18, 18);
-insert into Employee (id, version) values (19, 19);
-insert into Employee (id, version) values (20, 20);
-insert into Employee (id, version) values (21, 21);
-insert into Employee (id, version) values (22, 22);
-insert into Employee (id, version) values (23, 23);
-insert into Employee (id, version) values (24, 24);
-insert into Employee (id, version) values (25, 25);
-insert into Employee (id, version) values (26, 26);
-insert into Employee (id, version) values (27, 27);
-insert into Employee (id, version) values (28, 28);
-insert into Employee (id, version) values (29, 29);
-insert into Employee (id, version) values (30, 30);
-insert into Employee (id, version) values (31, 31);
-insert into Employee (id, version) values (32, 32);
-insert into Employee (id, version) values (33, 33);
-insert into Employee (id, version) values (34, 34);
-insert into Employee (id, version) values (35, 35);
-insert into Employee (id, version) values (36, 36);
-insert into Employee (id, version) values (37, 37);
-insert into Employee (id, version) values (38, 38);
-insert into Employee (id, version) values (39, 39);
-insert into Employee (id, version) values (40, 40);
-insert into Employee (id, version) values (41, 41);
-insert into Employee (id, version) values (42, 42);
-insert into Employee (id, version) values (43, 43);
-insert into Employee (id, version) values (44, 44);
-insert into Employee (id, version) values (45, 45);
-insert into Employee (id, version) values (46, 46);
-insert into Employee (id, version) values (47, 47);
-insert into Employee (id, version) values (48, 48);
-insert into Employee (id, version) values (49, 49);
-insert into Employee (id, version) values (50, 50);
-insert into Employee (id, version) values (51, 51);
-insert into Employee (id, version) values (52, 52);
-insert into Employee (id, version) values (53, 53);
-insert into Employee (id, version) values (54, 54);
-insert into Employee (id, version) values (55, 55);
-insert into Employee (id, version) values (56, 56);
-insert into Employee (id, version) values (57, 57);
-insert into Employee (id, version) values (58, 58);
-insert into Employee (id, version) values (59, 59);
-insert into Employee (id, version) values (60, 60);
-insert into Employee (id, version) values (61, 61);
-insert into Employee (id, version) values (62, 62);
-insert into Employee (id, version) values (63, 63);
-insert into Employee (id, version) values (64, 64);
-insert into Employee (id, version) values (65, 65);
-insert into Employee (id, version) values (66, 66);
-insert into Employee (id, version) values (67, 67);
-insert into Employee (id, version) values (68, 68);
-insert into Employee (id, version) values (69, 69);
-insert into Employee (id, version) values (70, 70);
-insert into Employee (id, version) values (71, 71);
-insert into Employee (id, version) values (72, 72);
-insert into Employee (id, version) values (73, 73);
-insert into Employee (id, version) values (74, 74);
-insert into Employee (id, version) values (75, 75);
-insert into Employee (id, version) values (76, 76);
-insert into Employee (id, version) values (77, 77);
-insert into Employee (id, version) values (78, 78);
-insert into Employee (id, version) values (79, 79);
-insert into Employee (id, version) values (80, 80);
-insert into Employee (id, version) values (81, 81);
-insert into Employee (id, version) values (82, 82);
-insert into Employee (id, version) values (83, 83);
-insert into Employee (id, version) values (84, 84);
-insert into Employee (id, version) values (85, 85);
-insert into Employee (id, version) values (86, 86);
-insert into Employee (id, version) values (87, 87);
-insert into Employee (id, version) values (88, 88);
-insert into Employee (id, version) values (89, 89);
-insert into Employee (id, version) values (90, 90);
-insert into Employee (id, version) values (91, 91);
-insert into Employee (id, version) values (92, 92);
-insert into Employee (id, version) values (93, 93);
-insert into Employee (id, version) values (94, 94);
-insert into Employee (id, version) values (95, 95);
-insert into Employee (id, version) values (96, 96);
-insert into Employee (id, version) values (97, 97);
-insert into Employee (id, version) values (98, 98);
-insert into Employee (id, version) values (99, 99);
-insert into Employee (id, version) values (100, 100);
-insert into Employee (id, version) values (101, 101);
-insert into Employee (id, version) values (102, 102);
-insert into Employee (id, version) values (103, 103);
-insert into Employee (id, version) values (104, 104);
-insert into Employee (id, version) values (105, 105);
-insert into Employee (id, version) values (106, 106);
-insert into Employee (id, version) values (107, 107);
-insert into Employee (id, version) values (108, 108);
-insert into Employee (id, version) values (109, 109);
-insert into Employee (id, version) values (110, 110);
-insert into Employee (id, version) values (111, 111);
-insert into Employee (id, version) values (112, 112);
-insert into Employee (id, version) values (113, 113);
-insert into Employee (id, version) values (114, 114);
-insert into Employee (id, version) values (115, 115);
-insert into Employee (id, version) values (116, 116);
-insert into Employee (id, version) values (117, 117);
-insert into Employee (id, version) values (118, 118);
-insert into Employee (id, version) values (119, 119);
-insert into Employee (id, version) values (120, 120);
-insert into Employee (id, version) values (121, 121);
-insert into Employee (id, version) values (122, 122);
-insert into Employee (id, version) values (123, 123);
-insert into Employee (id, version) values (124, 124);
-insert into Employee (id, version) values (125, 125);
-insert into Employee (id, version) values (126, 126);
-insert into Employee (id, version) values (127, 127);
-insert into Employee (id, version) values (128, 128);
-insert into Employee (id, version) values (129, 129);
-insert into Employee (id, version) values (130, 130);
-insert into Employee (id, version) values (131, 131);
-insert into Employee (id, version) values (132, 132);
-insert into Employee (id, version) values (133, 133);
-insert into Employee (id, version) values (134, 134);
-insert into Employee (id, version) values (135, 135);
-insert into Employee (id, version) values (136, 136);
-insert into Employee (id, version) values (137, 137);
-insert into Employee (id, version) values (138, 138);
-insert into Employee (id, version) values (139, 139);
-insert into Employee (id, version) values (140, 140);
-insert into Employee (id, version) values (141, 141);
-insert into Employee (id, version) values (142, 142);
-insert into Employee (id, version) values (143, 143);
-insert into Employee (id, version) values (144, 144);
-insert into Employee (id, version) values (145, 145);
-insert into Employee (id, version) values (146, 146);
-insert into Employee (id, version) values (147, 147);
-insert into Employee (id, version) values (148, 148);
-insert into Employee (id, version) values (149, 149);
-insert into Employee (id, version) values (150, 150);
-
-
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (1, 'BKTW', 'NORMAL', 'BKTW-1', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (2, 'KTW', 'MITTELHOCHDACH', 'KTW-2', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (3, 'KTW', 'MITTELHOCHDACH', 'KTW-3', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (4, 'BKTW', 'NORMAL', 'BKTW-4', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (5, 'RTW', 'HOCHDACH', 'RTW-5', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (6, 'RTW', 'HOCHDACH', 'RTW-6', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (7, 'BKTW', 'NORMAL', 'BKTW-7', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (8, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-8', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (9, 'RTW', 'HOCHDACH', 'RTW-9', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (10, 'RTW', 'HOCHDACH', 'RTW-10', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (11, 'RTW', 'HOCHDACH', 'RTW-11', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (12, 'RTW', 'HOCHDACH', 'RTW-12', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (13, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-13', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (14, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-14', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (15, 'BKTW', 'NORMAL', 'BKTW-15', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (16, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-16', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (17, 'KTW', 'MITTELHOCHDACH', 'KTW-17', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (18, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-18', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (19, 'RTW', 'HOCHDACH', 'RTW-19', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (20, 'RTW', 'HOCHDACH', 'RTW-20', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (21, 'RTW', 'HOCHDACH', 'RTW-21', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (22, 'BKTW', 'NORMAL', 'BKTW-22', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (23, 'RTW', 'HOCHDACH', 'RTW-23', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (24, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-24', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (25, 'KTW', 'MITTELHOCHDACH', 'KTW-25', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (26, 'RTW', 'HOCHDACH', 'RTW-26', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (27, 'KTW', 'MITTELHOCHDACH', 'KTW-27', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (28, 'KTW', 'MITTELHOCHDACH', 'KTW-28', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (29, 'BKTW', 'NORMAL', 'BKTW-29', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (30, 'RTW', 'HOCHDACH', 'RTW-30', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (31, 'RTW', 'HOCHDACH', 'RTW-31', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (32, 'RTW', 'HOCHDACH', 'RTW-32', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (33, 'RTW', 'HOCHDACH', 'RTW-33', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (34, 'KTW', 'MITTELHOCHDACH', 'KTW-34', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (35, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-35', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (36, 'RTW', 'HOCHDACH', 'RTW-36', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (37, 'RTW', 'HOCHDACH', 'RTW-37', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (38, 'BKTW', 'NORMAL', 'BKTW-38', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (39, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-39', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (40, 'RTW', 'HOCHDACH', 'RTW-40', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (41, 'RTW', 'HOCHDACH', 'RTW-41', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (42, 'KTW', 'MITTELHOCHDACH', 'KTW-42', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (43, 'RTW', 'HOCHDACH', 'RTW-43', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (44, 'RTW', 'HOCHDACH', 'RTW-44', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (45, 'RTW', 'HOCHDACH', 'RTW-45', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (46, 'RTW', 'HOCHDACH', 'RTW-46', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (47, 'KTW', 'MITTELHOCHDACH', 'KTW-47', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (48, 'BKTW', 'NORMAL', 'BKTW-48', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (49, 'RTW', 'HOCHDACH', 'RTW-49', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (50, 'RTW', 'HOCHDACH', 'RTW-50', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (51, 'NEF', 'NORMAL', 'NEF-51', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (52, 'NEF', 'NORMAL', 'NEF-52', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (53, 'NEF', 'NORMAL', 'NEF-53', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (54, 'NEF', 'NORMAL', 'NEF-54', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (55, 'NEF', 'NORMAL', 'NEF-55', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (56, 'NEF', 'NORMAL', 'NEF-56', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (57, 'NEF', 'NORMAL', 'NEF-57', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (58, 'NEF', 'NORMAL', 'NEF-58', false);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (59, 'NAH', 'NORMAL', 'NAH-59', true);
-insert into VehicleVersion (id, type, constructionType, name, hasNef) values (60, 'NAH', 'NORMAL', 'NAH-60', true);
-
-
-insert into Vehicle (id, version, status) values (1, 1, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (2, 2, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (3, 3, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (4, 4, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (5, 5, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (6, 6, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (7, 7, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (8, 8, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (9, 9, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (10, 10, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (11, 11, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (12, 12, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (13, 13, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (14, 14, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (15, 15, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (16, 16, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (17, 17, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (18, 18, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (19, 19, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (20, 20, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (21, 21, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (22, 22, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (23, 23, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (24, 24, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (25, 25, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (26, 26, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (27, 27, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (28, 28, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (29, 29, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (30, 30, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (31, 31, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (32, 32, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (33, 33, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (34, 34, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (35, 35, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (36, 36, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (37, 37, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (38, 38, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (39, 39, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (40, 40, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (41, 41, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (42, 42, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (43, 43, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (44, 44, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (45, 45, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (46, 46, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (47, 47, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (48, 48, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (49, 49, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (50, 50, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (51, 51, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (52, 52, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (53, 53, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (54, 54, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (55, 55, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (56, 56, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (57, 57, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (58, 58, 'ABGEMELDET');
-insert into Vehicle (id, version, status) values (59, 59, 'FREI_WACHE');
-insert into Vehicle (id, version, status) values (60, 60, 'FREI_WACHE');
-
-
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (1, 5, 2, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (2, 5, 4, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (3, 46, 13, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (4, 46, 32, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (5, 32, 44, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (6, 32, 51, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (7, 45, 37, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (8, 45, 49, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (9, 14, 34, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (10, 14, 9, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (11, 11, 78, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (12, 11, 84, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (13, 47, 62, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (14, 47, 63, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (15, 41, 92, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (16, 41, 93, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (17, 50, 117, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (18, 50, 116, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (19, 17, 134, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (20, 17, 135, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (21, 42, 149, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (22, 42, 150, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (23, 12, 139, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (24, 12, 140, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (25, 34, 111, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (26, 34, 113, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (27, 22, 131, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (28, 31, 70, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (29, 31, 69, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (30, 38, 88, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (31, 49, 19, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (32, 49, 20, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (33, 40, 55, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (34, 40, 56, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (35, 26, 42, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (36, 26, 67, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (37, 36, 11, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (38, 36, 12, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (39, 37, 33, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (40, 37, 34, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (41, 37, 15, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (42, 20, 65, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (43, 20, 74, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (44, 44, 123, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (45, 44, 124, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (46, 28, 126, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (47, 28, 127, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (48, 10, 144, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (49, 10, 145, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (50, 2, 71, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (51, 2, 4, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (52, 23, 7, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (53, 23, 8, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (54, 9, 10, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (55, 9, 31, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (56, 59, 6, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (57, 59, 22, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (58, 59, 39, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (59, 60, 53, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (60, 60, 54, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (61, 60, 66, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (62, 51, 83, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (63, 51, 112, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (64, 52, 129, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (65, 52, 125, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (66, 53, 38, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (67, 53, 85, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
-/*insert into Registration (id, vehicleId, employeeId, start, end, active) values (68, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (69, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (70, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (71, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (72, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (73, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (74, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (75, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (76, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (77, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (78, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (79, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (80, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (81, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (82, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (83, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (84, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (85, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (86, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (87, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (88, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (89, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (90, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (91, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (92, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (93, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (94, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (95, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (96, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (97, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (98, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (99, , , , , true);
-insert into Registration (id, vehicleId, employeeId, start, end, active) values (100, , , , , true);*/
-
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (1, 'A', 'RD-10A4V', '2017-12-02T06:12:21Z', '0121 Golf Course Crossing', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (2, 'A', 'RD-26A6J', '2017-11-13T00:12:45Z', '75 Straubel Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (3, 'C', 'RD-65C9M', '2017-07-31T19:08:42Z', '3468 Lawn Trail', 'Junction', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (4, 'A', 'RD-51A8F', '2018-04-15T08:45:33Z', '11752 Farragut Pass', 'Park', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (5, 'C', 'RD-18C3J', '2017-07-25T03:15:18Z', '546 Nova Place', 'Parkway', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (6, 'A', 'RD-93A4D', '2017-11-07T22:33:38Z', '1 Shasta Crossing', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (7, 'O', 'RD-70O3C', '2017-08-16T20:18:10Z', '20076 Surrey Crossing', 'Point', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (8, 'B', 'RD-76B9M', '2017-12-24T18:59:08Z', '214 Nova Hill', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (9, 'E', 'RD-40E5B', '2017-11-15T02:23:19Z', '3492 Atwood Alley', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (10, 'O', 'RD-70O2F', '2018-05-20T10:57:13Z', '655 Helena Junction', 'Park', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (11, 'A', 'RD-35A7U', '2018-05-27T04:41:52Z', '200 Florence Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (12, 'A', 'RD-22A8J', '2017-08-11T07:22:54Z', '017 Cambridge Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (13, 'A', 'RD-43A6K', '2017-06-29T00:40:23Z', '59960 Longview Way', 'Lane', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (14, 'C', 'RD-74C8K', '2018-04-03T04:38:37Z', '5083 Luster Hill', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (15, 'C', 'RD-93C6T', '2017-11-30T18:39:02Z', '2 Moose Parkway', 'Place', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (16, 'D', 'RD-35D8P', '2017-12-08T23:39:15Z', '9 Utah Trail', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (17, 'A', 'RD-26A9L', '2017-08-05T18:25:13Z', '7468 Commercial Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (18, 'E', 'RD-57E7X', '2017-08-12T06:26:53Z', '0 Eliot Alley', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (19, 'B', 'RD-84B8A', '2018-06-09T07:45:21Z', '05447 Division Plaza', 'Street', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (20, 'C', 'RD-99C9L', '2018-04-28T16:41:06Z', '7 Jenifer Place', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (21, 'C', 'RD-85C9X', '2017-11-01T11:30:21Z', '350 Packers Avenue', 'Street', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (22, 'A', 'RD-16A4K', '2018-05-03T01:57:10Z', '45577 Park Meadow Circle', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (23, 'B', 'RD-59B5Y', '2017-12-01T13:41:55Z', '7666 Grayhawk Terrace', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (24, 'C', 'RD-36C4V', '2018-05-02T14:45:08Z', '1520 Montana Court', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (25, 'A', 'RD-54A3B', '2018-01-27T13:02:43Z', '5478 Blackbird Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (26, 'A', 'RD-00A0Z', '2017-07-05T10:36:42Z', '668 Kenwood Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (27, 'B', 'RD-99B3Z', '2017-10-31T13:58:54Z', '4528 Meadow Ridge Way', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (28, 'E', 'RD-21E4B', '2018-03-06T15:19:53Z', '8269 Anthes Park', 'Alley', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (29, 'A', 'RD-68A4E', '2017-07-16T11:54:29Z', '34466 Mariners Cove Lane', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (30, 'A', 'RD-44A9N', '2017-11-16T22:07:30Z', '39 Shoshone Parkway', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (31, 'B', 'RD-28B1U', '2017-10-31T23:40:33Z', '9 Butternut Place', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (32, 'A', 'RD-19A8V', '2017-07-13T02:46:28Z', '9427 Clove Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (33, 'B', 'RD-03B9Q', '2017-08-21T06:54:03Z', '08242 Hintze Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (34, 'A', 'RD-33A0C', '2017-12-16T13:31:21Z', '9 Russell Terrace', 'Parkway', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (35, 'A', 'RD-54A1E', '2017-11-18T01:08:02Z', '40776 Kings Street', 'Street', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (36, 'B', 'RD-11B9D', '2017-07-16T14:58:14Z', '4379 Grover Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (37, 'A', 'RD-20A7H', '2018-04-12T17:25:55Z', '51626 Paget Drive', 'Lane', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (38, 'B', 'RD-74B2N', '2018-06-15T15:33:35Z', '4039 Northwestern Terrace', 'Circle', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (39, 'A', 'RD-14A2U', '2018-04-13T11:12:04Z', '174 Twin Pines Road', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (40, 'O', 'RD-85O8J', '2018-04-07T17:02:42Z', '15 Schiller Plaza', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (41, 'B', 'RD-17B8G', '2017-11-12T07:42:07Z', '446 Elka Drive', 'Center', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (42, 'B', 'RD-16B1V', '2017-12-14T20:35:48Z', '0493 4th Road', 'Center', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (43, 'A', 'RD-99A7V', '2017-06-29T17:17:53Z', '7815 Harper Place', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (44, 'O', 'RD-61O2F', '2017-07-15T08:41:09Z', '1388 Steensland Junction', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (45, 'A', 'RD-18A8M', '2017-12-05T14:06:22Z', '72 Golf Course Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (46, 'A', 'RD-97A2W', '2017-08-28T20:48:22Z', '7333 Alpine Street', 'Lane', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (47, 'A', 'RD-30A3J', '2018-01-26T00:15:01Z', '884 Stoughton Trail', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (48, 'O', 'RD-34O4J', '2018-06-01T01:21:24Z', '26 Riverside Lane', 'Pass', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (49, 'B', 'RD-18B6R', '2017-07-15T08:15:06Z', '04291 Dakota Way', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (50, 'A', 'RD-36A2Y', '2017-12-29T01:36:29Z', '403 Forest Run Park', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (51, 'A', 'RD-07A3U', '2017-10-23T11:03:53Z', '00758 Di Loreto Terrace', 'Place', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (52, 'O', 'RD-62O3Y', '2018-04-05T00:45:16Z', '8 Orin Court', 'Center', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (53, 'A', 'RD-18A7D', '2017-10-17T00:32:46Z', '98788 Golf Course Court', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (54, 'A', 'RD-11A4A', '2017-09-20T03:12:38Z', '567 Oak Valley Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (55, 'A', 'RD-30A2Y', '2017-11-06T08:00:24Z', '53 Fair Oaks Center', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (56, 'A', 'RD-17A3R', '2017-12-30T16:55:12Z', '075 Lighthouse Bay Junction', 'Parkway', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (57, 'O', 'RD-18O4D', '2018-02-04T12:33:46Z', '54 Eagan Circle', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (58, 'A', 'RD-25A8I', '2017-09-26T20:36:01Z', '29 Troy Center', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (59, 'B', 'RD-20B1G', '2018-04-05T04:58:38Z', '8892 Kensington Way', 'Point', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (60, 'A', 'RD-14A9B', '2017-06-27T04:49:09Z', '031 Cody Junction', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (61, 'A', 'RD-03A6S', '2017-09-10T00:46:34Z', '21 Steensland Place', 'Place', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (62, 'O', 'RD-41O3V', '2017-07-06T02:08:29Z', '27757 Sycamore Point', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (63, 'O', 'RD-36O6T', '2018-04-20T08:06:43Z', '876 Service Pass', 'Park', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (64, 'A', 'RD-42A2T', '2017-09-24T16:11:48Z', '1 Mitchell Park', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (65, 'A', 'RD-21A9L', '2018-06-11T06:03:37Z', '73686 Merrick Trail', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (66, 'C', 'RD-89C5M', '2018-03-10T16:46:56Z', '5168 Pine View Park', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (67, 'A', 'RD-10A6K', '2018-05-18T15:17:28Z', '304 Dunning Park', 'Way', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (68, 'C', 'RD-09C7S', '2018-03-08T18:52:12Z', '0 Londonderry Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (69, 'B', 'RD-75B8D', '2017-09-26T00:11:54Z', '00 Elgar Alley', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (70, 'O', 'RD-43O2V', '2017-09-02T02:56:49Z', '5969 Elmside Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (71, 'A', 'RD-24A0R', '2017-09-04T14:27:20Z', '865 Autumn Leaf Circle', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (72, 'B', 'RD-82B3A', '2018-06-03T20:09:15Z', '449 Commercial Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (73, 'A', 'RD-59A3A', '2017-11-11T20:43:16Z', '3 Banding Hill', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (74, 'B', 'RD-98B1G', '2017-06-20T12:39:45Z', '4303 Barby Road', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (75, 'A', 'RD-61A5L', '2018-03-09T18:55:16Z', '0 Macpherson Lane', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (76, 'B', 'RD-72B8U', '2018-04-27T22:48:48Z', '4 Boyd Court', 'Point', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (77, 'C', 'RD-63C3M', '2018-04-18T02:49:03Z', '3596 Miller Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (78, 'A', 'RD-03A9D', '2017-10-20T16:01:25Z', '2 Crescent Oaks Park', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (79, 'A', 'RD-62A5V', '2018-01-02T14:59:58Z', '0089 Jackson Plaza', 'Street', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (80, 'B', 'RD-36B2C', '2018-04-11T00:56:22Z', '3741 Spaight Circle', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (81, 'A', 'RD-19A7E', '2018-05-05T00:17:49Z', '90 Fair Oaks Place', 'Avenue', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (82, 'B', 'RD-90B8G', '2017-08-06T00:47:06Z', '6 Fremont Street', 'Circle', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (83, 'A', 'RD-28A0V', '2018-01-19T13:36:34Z', '20 Arrowood Parkway', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (84, 'A', 'RD-71A0B', '2018-01-09T15:30:57Z', '060 Badeau Park', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (85, 'B', 'RD-49B7X', '2018-02-07T18:46:02Z', '97261 Burning Wood Hill', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (86, 'B', 'RD-55B0F', '2018-02-02T03:23:51Z', '13987 Corscot Way', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (87, 'A', 'RD-79A5X', '2017-08-02T02:50:44Z', '90 Dexter Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (88, 'A', 'RD-04A7T', '2017-11-06T07:18:03Z', '619 Graedel Court', 'Way', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (89, 'C', 'RD-85C1G', '2017-12-17T18:50:36Z', '7 Fremont Avenue', 'Place', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (90, 'O', 'RD-40O9Z', '2017-11-19T08:07:26Z', '79953 Fair Oaks Drive', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (91, 'C', 'RD-08C4Z', '2018-03-21T02:49:58Z', '7779 Monterey Street', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (92, 'A', 'RD-13A5U', '2017-09-29T05:21:06Z', '7 Little Fleur Road', 'Circle', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (93, 'B', 'RD-02B2E', '2017-08-04T17:00:43Z', '34572 Old Shore Crossing', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (94, 'A', 'RD-11A9X', '2017-08-27T23:59:41Z', '858 Spenser Drive', 'Avenue', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (95, 'B', 'RD-95B6D', '2018-01-07T01:49:50Z', '98 Jenifer Terrace', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (96, 'A', 'RD-47A7T', '2017-07-02T09:57:56Z', '209 Talmadge Lane', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (97, 'O', 'RD-78O1Z', '2017-12-10T15:02:21Z', '5348 Blackbird Pass', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (98, 'A', 'RD-72A5Y', '2017-12-23T10:48:06Z', '394 Anzinger Avenue', 'Point', 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (99, 'C', 'RD-78C4D', '2017-12-26T03:29:27Z', '115 Petterle Crossing', null, 'COMPLETED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (100, 'A', 'RD-17A9I', '2017-10-05T17:45:19Z', '533 Transport Way', 'Crossing', 'COMPLETED');
-
-
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (101, 'A', 'RD-74A1G', '2018-02-05T15:37:44Z', '625 Veith Center', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (102, 'B', 'RD-15B1U', '2017-10-20T04:54:38Z', '9 Westport Alley', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (103, 'O', 'RD-62O0B', '2018-02-05T12:18:43Z', '87559 Sherman Terrace', 'Court', 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (104, 'A', 'RD-45A0Y', '2018-05-17T17:08:18Z', '8 Delladonna Lane', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (105, 'A', 'RD-42A8G', '2018-05-03T01:52:39Z', '7 Superior Drive', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (106, 'O', 'RD-03O0G', '2018-01-21T17:21:12Z', '72 Darwin Point', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (107, 'A', 'RD-94A0W', '2017-11-08T06:11:31Z', '7168 Anniversary Way', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (108, 'A', 'RD-18A1E', '2018-02-20T15:51:48Z', '2023 Barby Road', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (109, 'A', 'RD-11A2I', '2018-02-07T06:42:04Z', '1901 Mesta Street', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (110, 'O', 'RD-78O0A', '2018-01-02T21:11:05Z', '6 David Trail', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (111, 'B', 'RD-70B6R', '2017-11-23T11:35:51Z', '188 Golden Leaf Avenue', 'Road', 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (112, 'B', 'RD-95B9K', '2018-02-03T06:44:16Z', '805 Jenna Alley', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (113, 'A', 'RD-58A3E', '2017-08-18T08:46:01Z', '954 Oriole Hill', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (114, 'B', 'RD-58B5V', '2017-06-19T12:47:16Z', '2503 East Road', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (115, 'A', 'RD-93A3V', '2018-03-04T16:46:37Z', '2 Northview Terrace', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (116, 'B', 'RD-25B6N', '2018-01-05T13:49:50Z', '43459 Crownhardt Crossing', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (117, 'A', 'RD-01A3J', '2017-08-08T05:23:13Z', '13 Kedzie Road', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (118, 'B', 'RD-70B9E', '2017-09-25T14:22:46Z', '49 Westridge Point', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (119, 'A', 'RD-18A6U', '2018-01-15T22:08:09Z', '6109 Kennedy Court', null, 'CANCELLED');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (120, 'O', 'RD-27O6C', '2017-10-06T11:55:04Z', '590 Golf Terrace', null, 'CANCELLED');
-
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (121, 'C', 'RD-34C5U', '2018-06-18T02:58:38Z', '1909 Cascade Drive', 'Hill', 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (122, 'B', 'RD-55B4X', '2018-06-18T03:55:21Z', '7 Rigney Parkway', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (123, 'C', 'RD-41C0X', '2018-06-18T06:35:58Z', '86986 Mcbride Court', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (124, 'A', 'RD-60A5T', '2018-06-18T14:33:37Z', '14649 Manley Park', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (125, 'D', 'RD-95D8H', '2018-06-18T09:15:13Z', '50 Magdeline Road', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (126, 'A', 'RD-16A9F', '2018-06-18T01:28:09Z', '25241 Bowman Alley', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (127, 'A', 'RD-33A1C', '2018-06-18T16:49:43Z', '59864 Rutledge Avenue', null, 'ACTIVE');
-insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (128, 'B', 'RD-49B4F', '2018-06-18T06:10:37Z', '43 Longview Crossing', null, 'ACTIVE');
-
---(51|52|53|59|60|2|5|9|10|11|12|14|17|20|22|23|26|28|31|32|34|36|37|38|40|41|42|44|45|46|47|49|50)
-
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,1);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,2);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,3);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,4);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,5);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,6);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (46,7);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,8);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,9);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,10);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,11);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,12);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,13);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,14);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (22,15);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,16);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,17);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,18);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,19);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,20);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,21);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,22);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,23);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,24);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,25);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,26);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (5,27);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,28);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,29);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,30);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,31);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,32);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,33);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,34);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,35);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,36);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,37);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,38);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,39);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,40);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,41);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,42);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (53,43);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,44);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,45);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,46);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,47);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,48);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,49);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,50);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,51);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,52);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,53);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,54);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,55);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,56);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,57);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,58);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (32,59);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,60);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,61);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (5,62);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,63);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,64);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,65);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,66);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,67);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,68);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,69);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (14,70);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (52,71);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,72);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,73);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,74);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,75);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,76);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,77);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,78);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,79);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (22,80);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,81);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,82);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,83);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,84);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,85);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,86);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,87);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,88);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,89);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,90);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,91);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,92);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,93);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (53,94);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,95);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,96);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (32,97);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,98);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,99);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,100);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (46,101);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,102);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,103);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,104);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,105);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,106);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,107);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,108);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,109);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,110);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,111);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (17,112);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,113);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,114);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,115);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,116);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,117);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,118);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,119);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,120);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,121);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,122);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,123);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,124);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,125);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,125);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,126);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (27,127);
-INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (17,128);
diff --git a/src/main/resources/sql/testdata.sql b/src/main/resources/sql/testdata.sql
new file mode 100644
index 0000000..3cfb0ee
--- /dev/null
+++ b/src/main/resources/sql/testdata.sql
@@ -0,0 +1,792 @@
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (1, 'Bess Peak', '1961-03-01', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (2, 'Maryrose Farriar', '1970-11-16', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (3, 'Hannis MacLardie', '1970-12-20', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (4, 'Major Folbige', '1959-12-09', 'NKV', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (5, 'Bronny Nel', '1966-03-07', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (6, 'Fransisco Labadini', '1963-09-01', 'NKI', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (7, 'Dannie Skeldon', '1969-12-25', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (8, 'Pippa Sickert', '1987-02-28', 'NKA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (9, 'Gwendolyn Grigolon', '1975-03-05', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (10, 'Aileen McGuinley', '1988-01-08', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (11, 'Barbra Izon', '1984-11-14', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (12, 'Ailsun Nestoruk', '1969-12-25', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (13, 'Ulrika Choake', '1975-06-17', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (14, 'Myrtia Elsmor', '1974-05-23', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (15, 'Brade Hurst', '1980-12-14', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (16, 'Valli Fancet', '1955-11-11', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (17, 'Dana Nixon', '1973-08-19', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (18, 'Anjela Orrice', '1986-04-21', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (19, 'Normie Martinie', '1988-09-30', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (20, 'Martelle Tunnick', '1972-01-29', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (21, 'Laurent Janouch', '1990-05-25', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (22, 'Scarface Portchmouth', '1970-04-26', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (23, 'Anatola McHugh', '1972-03-08', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (24, 'Tatum Flaonier', '1979-01-26', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (25, 'Dianna Philo', '1998-09-07', 'NKI', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (26, 'Ave Thow', '1965-07-30', 'NKV', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (27, 'Vail Naptine', '1986-08-28', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (28, 'Gaven Gainsbury', '1991-01-21', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (29, 'Kaile Hartill', '1970-06-30', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (30, 'Floria Trevaskis', '1955-01-14', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (31, 'Bidget Dukelow', '1969-12-14', 'NKI', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (32, 'Reece Mushet', '1989-07-18', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (33, 'Rafaellle Hurdle', '1968-04-25', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (34, 'Kristoforo Boner', '1960-11-26', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (35, 'Carree Marquot', '1982-10-29', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (36, 'Max Maldin', '1955-08-30', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (37, 'Betsy Urion', '1999-01-09', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (38, 'Jud Levey', '1986-08-28', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (39, 'Stepha Adriani', '1964-06-26', 'NA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (40, 'Jodie Yeskin', '1963-06-22', 'NKV', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (41, 'Viole Heritege', '1999-11-27', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (42, 'Mort Dudson', '1973-07-28', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (43, 'Brittney Srawley', '1955-04-12', 'NKI', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (44, 'Tod Plevey', '1994-09-28', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (45, 'Rhianon Lawday', '1963-11-15', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (46, 'Hill Jachtym', '1972-10-02', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (47, 'Gregory Sheavills', '1971-08-14', 'NKI', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (48, 'Linnea Castlake', '1966-03-31', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (49, 'Curr Robertz', '1983-09-24', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (50, 'Ricki Trevillion', '1972-08-17', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (51, 'Haily Gloyens', '1975-08-24', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (52, 'Sherwynd Bugbird', '1966-01-16', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (53, 'Cathrin Hamlen', '1973-01-15', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (54, 'Oliver Ropars', '1964-02-28', 'NKA', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (55, 'Mersey Suerz', '1988-03-03', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (56, 'Fabio Mapes', '1986-01-01', 'NKA', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (57, 'Devondra Jonsson', '1969-10-01', 'NKI', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (58, 'Malva Pulver', '1984-06-11', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (59, 'Petronella MacCorkell', '1990-01-25', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (60, 'Letty McKag', '1989-02-05', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (61, 'Nikoletta McLeish', '1956-09-19', 'NKV', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (62, 'Mella Gerred', '1963-04-28', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (63, 'Banky Bradforth', '1983-12-23', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (64, 'Etta Curnow', '1993-06-29', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (65, 'Bobina Fernez', '1956-12-14', 'NKV', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (66, 'Dreddy Pessold', '1972-02-25', 'NA', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (67, 'Maxie Speedy', '1984-04-19', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (68, 'Benetta Jent', '1969-12-27', 'NA', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (69, 'Caro Szanto', '1957-06-14', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (70, 'Carmela Alejandre', '1979-12-05', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (71, 'Merrile Doig', '1992-08-07', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (72, 'Michell Sanney', '1959-08-11', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (73, 'Kata Spark', '1988-12-18', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (74, 'Chelsie Normanville', '1972-04-14', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (75, 'Ciro Grigg', '1957-02-18', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (76, 'Shela Larkcum', '1979-12-14', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (77, 'Myrvyn Denyukin', '1976-07-07', 'NKA', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (78, 'Lethia Glede', '1972-12-10', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (79, 'Malchy Chiverton', '1971-08-14', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (80, 'Dario Rasor', '1997-10-05', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (81, 'Anni Baldacco', '1961-08-05', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (82, 'Brigit Wheelband', '1966-06-21', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (83, 'Niki Tynemouth', '1968-09-17', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (84, 'Nikki Mea', '1965-08-14', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (85, 'Dania Garrique', '1986-03-25', 'NA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (86, 'Dorelia Leggs', '1960-12-16', 'NKI', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (87, 'Cristin Carous', '1999-10-21', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (88, 'Clare Caustick', '1969-09-27', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (89, 'Conant Gallo', '1993-11-19', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (90, 'Gwyneth Cavie', '1956-04-12', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (91, 'Mabel Meadley', '1966-11-25', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (92, 'Mona Bonafant', '1957-06-12', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (93, 'Clarita Fealty', '1987-12-22', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (94, 'Elie Jardin', '1986-01-10', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (95, 'Pacorro Dobing', '1988-01-04', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (96, 'Marci Wloch', '1973-08-23', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (97, 'Micky Fossett', '2000-01-13', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (98, 'Bil Rangall', '1979-05-06', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (99, 'Athena Matteoni', '1980-11-08', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (100, 'Molly Fennelly', '1980-06-14', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (101, 'Dylan Fordyce', '1983-12-03', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (102, 'Onida Betjeman', '1993-01-12', 'NKI', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (103, 'Brietta Biswell', '1956-09-18', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (104, 'Elna Boyton', '1983-04-08', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (105, 'Zsazsa Robertazzi', '1967-08-28', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (106, 'Brook Bleier', '1976-12-04', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (107, 'Kaleena Fosh', '1987-08-04', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (108, 'Julee Polamontayne', '1988-09-30', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (109, 'Arte Elliss', '1965-08-30', 'NA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (110, 'Celia Skelcher', '1965-01-31', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (111, 'Kelsey Luetkemeyer', '1976-07-27', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (112, 'Pedro Jakubowski', '1982-07-10', 'NA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (113, 'Licha Slatten', '1985-03-19', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (114, 'Adella Sisson', '1997-06-02', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (115, 'Hagan Senett', '1979-09-25', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (116, 'Jecho Beilby', '1993-12-27', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (117, 'Karoly Toolin', '1988-06-11', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (118, 'Madelon Steart', '1987-08-04', 'NKA', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (119, 'Laverne Yelland', '1980-11-09', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (120, 'Murry Bottoner', '1955-04-21', 'NKA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (121, 'Sianna Tomney', '1987-04-14', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (122, 'Dulcea Squirrell', '1967-03-07', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (123, 'Bengt Durbridge', '1966-04-15', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (124, 'Cletus Akenhead', '1974-06-13', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (125, 'Huntington McKeand', '1988-12-21', 'NA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (126, 'Carolin Doget', '1974-05-02', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (127, 'Bobby Iredell', '1974-01-25', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (128, 'Preston Pidgeon', '1987-06-17', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (129, 'Gretta Darnbrough', '1996-05-22', 'NKI', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (130, 'Justen Hearley', '1976-08-09', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (131, 'Davon Baser', '1987-03-02', 'RS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (132, 'Alasdair Clancy', '1993-05-24', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (133, 'Hattie Kareman', '1997-07-07', 'NKA', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (134, 'Ignaz Buddell', '1986-02-07', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (135, 'Ashil Kanter', '1977-06-17', 'NFS', true, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (136, 'Daniele Mallam', '1969-01-26', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (137, 'Eugenius Stuehmeier', '1961-10-16', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (138, 'Jdavie Acey', '1991-11-21', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (139, 'Jaynell Fossord', '1967-10-15', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (140, 'Roarke Peascod', '1956-12-01', 'NKA', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (141, 'Horacio Boxer', '1990-02-12', 'NKA', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (142, 'Bard Thyng', '1979-01-25', 'NKI', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (143, 'Nadia Fayre', '1979-03-02', 'NFS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (144, 'Garrot Fry', '1960-12-30', 'NKV', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (145, 'Kristal Hammor', '1975-09-05', 'RS', true, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (146, 'Barnebas Kinsell', '2000-10-11', 'NFS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (147, 'Marleen Entwhistle', '1960-04-08', 'NFS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (148, 'Paule Kettlestring', '1978-04-04', 'RS', false, false);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (149, 'Valentin Nerval', '1999-06-01', 'RS', false, true);
+insert into EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPilot) values (150, 'Zitella Bywaters', '1966-11-11', 'NKA', true, true);
+
+
+insert into Employee (id, version) values (1, 1);
+insert into Employee (id, version) values (2, 2);
+insert into Employee (id, version) values (3, 3);
+insert into Employee (id, version) values (4, 4);
+insert into Employee (id, version) values (5, 5);
+insert into Employee (id, version) values (6, 6);
+insert into Employee (id, version) values (7, 7);
+insert into Employee (id, version) values (8, 8);
+insert into Employee (id, version) values (9, 9);
+insert into Employee (id, version) values (10, 10);
+insert into Employee (id, version) values (11, 11);
+insert into Employee (id, version) values (12, 12);
+insert into Employee (id, version) values (13, 13);
+insert into Employee (id, version) values (14, 14);
+insert into Employee (id, version) values (15, 15);
+insert into Employee (id, version) values (16, 16);
+insert into Employee (id, version) values (17, 17);
+insert into Employee (id, version) values (18, 18);
+insert into Employee (id, version) values (19, 19);
+insert into Employee (id, version) values (20, 20);
+insert into Employee (id, version) values (21, 21);
+insert into Employee (id, version) values (22, 22);
+insert into Employee (id, version) values (23, 23);
+insert into Employee (id, version) values (24, 24);
+insert into Employee (id, version) values (25, 25);
+insert into Employee (id, version) values (26, 26);
+insert into Employee (id, version) values (27, 27);
+insert into Employee (id, version) values (28, 28);
+insert into Employee (id, version) values (29, 29);
+insert into Employee (id, version) values (30, 30);
+insert into Employee (id, version) values (31, 31);
+insert into Employee (id, version) values (32, 32);
+insert into Employee (id, version) values (33, 33);
+insert into Employee (id, version) values (34, 34);
+insert into Employee (id, version) values (35, 35);
+insert into Employee (id, version) values (36, 36);
+insert into Employee (id, version) values (37, 37);
+insert into Employee (id, version) values (38, 38);
+insert into Employee (id, version) values (39, 39);
+insert into Employee (id, version) values (40, 40);
+insert into Employee (id, version) values (41, 41);
+insert into Employee (id, version) values (42, 42);
+insert into Employee (id, version) values (43, 43);
+insert into Employee (id, version) values (44, 44);
+insert into Employee (id, version) values (45, 45);
+insert into Employee (id, version) values (46, 46);
+insert into Employee (id, version) values (47, 47);
+insert into Employee (id, version) values (48, 48);
+insert into Employee (id, version) values (49, 49);
+insert into Employee (id, version) values (50, 50);
+insert into Employee (id, version) values (51, 51);
+insert into Employee (id, version) values (52, 52);
+insert into Employee (id, version) values (53, 53);
+insert into Employee (id, version) values (54, 54);
+insert into Employee (id, version) values (55, 55);
+insert into Employee (id, version) values (56, 56);
+insert into Employee (id, version) values (57, 57);
+insert into Employee (id, version) values (58, 58);
+insert into Employee (id, version) values (59, 59);
+insert into Employee (id, version) values (60, 60);
+insert into Employee (id, version) values (61, 61);
+insert into Employee (id, version) values (62, 62);
+insert into Employee (id, version) values (63, 63);
+insert into Employee (id, version) values (64, 64);
+insert into Employee (id, version) values (65, 65);
+insert into Employee (id, version) values (66, 66);
+insert into Employee (id, version) values (67, 67);
+insert into Employee (id, version) values (68, 68);
+insert into Employee (id, version) values (69, 69);
+insert into Employee (id, version) values (70, 70);
+insert into Employee (id, version) values (71, 71);
+insert into Employee (id, version) values (72, 72);
+insert into Employee (id, version) values (73, 73);
+insert into Employee (id, version) values (74, 74);
+insert into Employee (id, version) values (75, 75);
+insert into Employee (id, version) values (76, 76);
+insert into Employee (id, version) values (77, 77);
+insert into Employee (id, version) values (78, 78);
+insert into Employee (id, version) values (79, 79);
+insert into Employee (id, version) values (80, 80);
+insert into Employee (id, version) values (81, 81);
+insert into Employee (id, version) values (82, 82);
+insert into Employee (id, version) values (83, 83);
+insert into Employee (id, version) values (84, 84);
+insert into Employee (id, version) values (85, 85);
+insert into Employee (id, version) values (86, 86);
+insert into Employee (id, version) values (87, 87);
+insert into Employee (id, version) values (88, 88);
+insert into Employee (id, version) values (89, 89);
+insert into Employee (id, version) values (90, 90);
+insert into Employee (id, version) values (91, 91);
+insert into Employee (id, version) values (92, 92);
+insert into Employee (id, version) values (93, 93);
+insert into Employee (id, version) values (94, 94);
+insert into Employee (id, version) values (95, 95);
+insert into Employee (id, version) values (96, 96);
+insert into Employee (id, version) values (97, 97);
+insert into Employee (id, version) values (98, 98);
+insert into Employee (id, version) values (99, 99);
+insert into Employee (id, version) values (100, 100);
+insert into Employee (id, version) values (101, 101);
+insert into Employee (id, version) values (102, 102);
+insert into Employee (id, version) values (103, 103);
+insert into Employee (id, version) values (104, 104);
+insert into Employee (id, version) values (105, 105);
+insert into Employee (id, version) values (106, 106);
+insert into Employee (id, version) values (107, 107);
+insert into Employee (id, version) values (108, 108);
+insert into Employee (id, version) values (109, 109);
+insert into Employee (id, version) values (110, 110);
+insert into Employee (id, version) values (111, 111);
+insert into Employee (id, version) values (112, 112);
+insert into Employee (id, version) values (113, 113);
+insert into Employee (id, version) values (114, 114);
+insert into Employee (id, version) values (115, 115);
+insert into Employee (id, version) values (116, 116);
+insert into Employee (id, version) values (117, 117);
+insert into Employee (id, version) values (118, 118);
+insert into Employee (id, version) values (119, 119);
+insert into Employee (id, version) values (120, 120);
+insert into Employee (id, version) values (121, 121);
+insert into Employee (id, version) values (122, 122);
+insert into Employee (id, version) values (123, 123);
+insert into Employee (id, version) values (124, 124);
+insert into Employee (id, version) values (125, 125);
+insert into Employee (id, version) values (126, 126);
+insert into Employee (id, version) values (127, 127);
+insert into Employee (id, version) values (128, 128);
+insert into Employee (id, version) values (129, 129);
+insert into Employee (id, version) values (130, 130);
+insert into Employee (id, version) values (131, 131);
+insert into Employee (id, version) values (132, 132);
+insert into Employee (id, version) values (133, 133);
+insert into Employee (id, version) values (134, 134);
+insert into Employee (id, version) values (135, 135);
+insert into Employee (id, version) values (136, 136);
+insert into Employee (id, version) values (137, 137);
+insert into Employee (id, version) values (138, 138);
+insert into Employee (id, version) values (139, 139);
+insert into Employee (id, version) values (140, 140);
+insert into Employee (id, version) values (141, 141);
+insert into Employee (id, version) values (142, 142);
+insert into Employee (id, version) values (143, 143);
+insert into Employee (id, version) values (144, 144);
+insert into Employee (id, version) values (145, 145);
+insert into Employee (id, version) values (146, 146);
+insert into Employee (id, version) values (147, 147);
+insert into Employee (id, version) values (148, 148);
+insert into Employee (id, version) values (149, 149);
+insert into Employee (id, version) values (150, 150);
+
+
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (1, 'BKTW', 'NORMAL', 'BKTW-1', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (2, 'KTW', 'MITTELHOCHDACH', 'KTW-2', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (3, 'KTW', 'MITTELHOCHDACH', 'KTW-3', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (4, 'BKTW', 'NORMAL', 'BKTW-4', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (5, 'RTW', 'HOCHDACH', 'RTW-5', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (6, 'RTW', 'HOCHDACH', 'RTW-6', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (7, 'BKTW', 'NORMAL', 'BKTW-7', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (8, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-8', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (9, 'RTW', 'HOCHDACH', 'RTW-9', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (10, 'RTW', 'HOCHDACH', 'RTW-10', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (11, 'RTW', 'HOCHDACH', 'RTW-11', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (12, 'RTW', 'HOCHDACH', 'RTW-12', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (13, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-13', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (14, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-14', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (15, 'BKTW', 'NORMAL', 'BKTW-15', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (16, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-16', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (17, 'KTW', 'MITTELHOCHDACH', 'KTW-17', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (18, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-18', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (19, 'RTW', 'HOCHDACH', 'RTW-19', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (20, 'RTW', 'HOCHDACH', 'RTW-20', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (21, 'RTW', 'HOCHDACH', 'RTW-21', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (22, 'BKTW', 'NORMAL', 'BKTW-22', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (23, 'RTW', 'HOCHDACH', 'RTW-23', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (24, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-24', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (25, 'KTW', 'MITTELHOCHDACH', 'KTW-25', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (26, 'RTW', 'HOCHDACH', 'RTW-26', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (27, 'KTW', 'MITTELHOCHDACH', 'KTW-27', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (28, 'KTW', 'MITTELHOCHDACH', 'KTW-28', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (29, 'BKTW', 'NORMAL', 'BKTW-29', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (30, 'RTW', 'HOCHDACH', 'RTW-30', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (31, 'RTW', 'HOCHDACH', 'RTW-31', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (32, 'RTW', 'HOCHDACH', 'RTW-32', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (33, 'RTW', 'HOCHDACH', 'RTW-33', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (34, 'KTW', 'MITTELHOCHDACH', 'KTW-34', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (35, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-35', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (36, 'RTW', 'HOCHDACH', 'RTW-36', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (37, 'RTW', 'HOCHDACH', 'RTW-37', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (38, 'BKTW', 'NORMAL', 'BKTW-38', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (39, 'KTW_B', 'MITTELHOCHDACH', 'KTW_B-39', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (40, 'RTW', 'HOCHDACH', 'RTW-40', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (41, 'RTW', 'HOCHDACH', 'RTW-41', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (42, 'KTW', 'MITTELHOCHDACH', 'KTW-42', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (43, 'RTW', 'HOCHDACH', 'RTW-43', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (44, 'RTW', 'HOCHDACH', 'RTW-44', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (45, 'RTW', 'HOCHDACH', 'RTW-45', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (46, 'RTW', 'HOCHDACH', 'RTW-46', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (47, 'KTW', 'MITTELHOCHDACH', 'KTW-47', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (48, 'BKTW', 'NORMAL', 'BKTW-48', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (49, 'RTW', 'HOCHDACH', 'RTW-49', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (50, 'RTW', 'HOCHDACH', 'RTW-50', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (51, 'NEF', 'NORMAL', 'NEF-51', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (52, 'NEF', 'NORMAL', 'NEF-52', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (53, 'NEF', 'NORMAL', 'NEF-53', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (54, 'NEF', 'NORMAL', 'NEF-54', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (55, 'NEF', 'NORMAL', 'NEF-55', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (56, 'NEF', 'NORMAL', 'NEF-56', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (57, 'NEF', 'NORMAL', 'NEF-57', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (58, 'NEF', 'NORMAL', 'NEF-58', false);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (59, 'NAH', 'NORMAL', 'NAH-59', true);
+insert into VehicleVersion (id, type, constructionType, name, hasNef) values (60, 'NAH', 'NORMAL', 'NAH-60', true);
+
+
+insert into Vehicle (id, version, status) values (1, 1, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (2, 2, 'AM_BERUFUNGSORT');
+insert into Vehicle (id, version, status) values (3, 3, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (4, 4, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (5, 5, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (6, 6, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (7, 7, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (8, 8, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (9, 9, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (10, 10, 'ZUM_ZIELORT');
+insert into Vehicle (id, version, status) values (11, 11, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (12, 12, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (13, 13, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (14, 14, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (15, 15, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (16, 16, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (17, 17, 'ZUM_BERUFUNGSORT');
+insert into Vehicle (id, version, status) values (18, 18, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (19, 19, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (20, 20, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (21, 21, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (22, 22, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (23, 23, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (24, 24, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (25, 25, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (26, 26, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (27, 27, 'AM_ZIELORT');
+insert into Vehicle (id, version, status) values (28, 28, 'AM_BERUFUNGSORT');
+insert into Vehicle (id, version, status) values (29, 29, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (30, 30, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (31, 31, 'ZUM_BERUFUNGSORT');
+insert into Vehicle (id, version, status) values (32, 32, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (33, 33, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (34, 34, 'AM_ZIELORT');
+insert into Vehicle (id, version, status) values (35, 35, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (36, 36, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (37, 37, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (38, 38, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (39, 39, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (40, 40, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (41, 41, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (42, 42, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (43, 43, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (44, 44, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (45, 45, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (46, 46, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (47, 47, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (48, 48, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (49, 49, 'AM_BERUFUNGSORT');
+insert into Vehicle (id, version, status) values (50, 50, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (51, 51, 'ZUM_ZIELORT');
+insert into Vehicle (id, version, status) values (52, 52, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (53, 53, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (54, 54, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (55, 55, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (56, 56, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (57, 57, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (58, 58, 'ABGEMELDET');
+insert into Vehicle (id, version, status) values (59, 59, 'FREI_WACHE');
+insert into Vehicle (id, version, status) values (60, 60, 'FREI_WACHE');
+
+
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (1, 5, 2, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (2, 5, 4, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (3, 46, 13, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (4, 46, 32, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (5, 32, 44, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (6, 32, 51, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (7, 45, 37, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (8, 45, 49, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (9, 14, 34, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (10, 14, 9, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (11, 11, 78, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (12, 11, 84, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (13, 47, 62, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (14, 47, 63, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (15, 41, 92, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (16, 41, 93, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (17, 50, 117, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (18, 50, 116, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (19, 17, 134, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (20, 17, 135, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (21, 42, 149, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (22, 42, 150, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (23, 12, 139, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (24, 12, 140, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (25, 34, 111, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (26, 34, 113, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (27, 22, 131, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (28, 31, 70, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (29, 31, 69, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (30, 38, 88, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (31, 49, 19, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (32, 49, 20, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (33, 40, 55, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (34, 40, 56, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (35, 26, 42, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (36, 26, 67, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (37, 36, 11, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (38, 36, 12, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (39, 37, 33, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (40, 37, 34, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (41, 37, 15, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (42, 20, 65, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (43, 20, 74, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (44, 44, 123, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (45, 44, 124, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (46, 28, 126, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (47, 28, 127, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (48, 10, 144, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (49, 10, 145, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (50, 2, 71, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (51, 2, 4, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (52, 23, 7, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (53, 23, 8, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (54, 9, 10, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (55, 9, 31, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (56, 59, 6, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (57, 59, 22, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (58, 59, 39, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (59, 60, 53, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (60, 60, 54, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (61, 60, 66, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (62, 51, 83, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (63, 51, 112, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (64, 52, 129, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (65, 52, 125, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (66, 53, 38, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (67, 53, 85, '2018-06-14 14:00:00.0', '2018-06-23 14:00:00.0', true);
+/*insert into Registration (id, vehicleId, employeeId, start, end, active) values (68, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (69, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (70, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (71, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (72, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (73, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (74, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (75, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (76, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (77, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (78, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (79, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (80, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (81, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (82, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (83, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (84, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (85, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (86, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (87, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (88, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (89, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (90, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (91, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (92, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (93, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (94, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (95, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (96, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (97, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (98, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (99, , , , , true);
+insert into Registration (id, vehicleId, employeeId, start, end, active) values (100, , , , , true);*/
+
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (1, 'A', 'RD-10A4V', '2017-12-02T06:12:21Z', '0121 Golf Course Crossing', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (2, 'A', 'RD-26A6J', '2017-11-13T00:12:45Z', '75 Straubel Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (3, 'C', 'RD-65C9M', '2017-07-31T19:08:42Z', '3468 Lawn Trail', 'Junction', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (4, 'A', 'RD-51A8F', '2018-04-15T08:45:33Z', '11752 Farragut Pass', 'Park', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (5, 'C', 'RD-18C3J', '2017-07-25T03:15:18Z', '546 Nova Place', 'Parkway', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (6, 'A', 'RD-93A4D', '2017-11-07T22:33:38Z', '1 Shasta Crossing', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (7, 'O', 'RD-70O3C', '2017-08-16T20:18:10Z', '20076 Surrey Crossing', 'Point', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (8, 'B', 'RD-76B9M', '2017-12-24T18:59:08Z', '214 Nova Hill', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (9, 'E', 'RD-40E5B', '2017-11-15T02:23:19Z', '3492 Atwood Alley', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (10, 'O', 'RD-70O2F', '2018-05-20T10:57:13Z', '655 Helena Junction', 'Park', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (11, 'A', 'RD-35A7U', '2018-05-27T04:41:52Z', '200 Florence Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (12, 'A', 'RD-22A8J', '2017-08-11T07:22:54Z', '017 Cambridge Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (13, 'A', 'RD-43A6K', '2017-06-29T00:40:23Z', '59960 Longview Way', 'Lane', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (14, 'C', 'RD-74C8K', '2018-04-03T04:38:37Z', '5083 Luster Hill', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (15, 'C', 'RD-93C6T', '2017-11-30T18:39:02Z', '2 Moose Parkway', 'Place', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (16, 'D', 'RD-35D8P', '2017-12-08T23:39:15Z', '9 Utah Trail', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (17, 'A', 'RD-26A9L', '2017-08-05T18:25:13Z', '7468 Commercial Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (18, 'E', 'RD-57E7X', '2017-08-12T06:26:53Z', '0 Eliot Alley', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (19, 'B', 'RD-84B8A', '2018-06-09T07:45:21Z', '05447 Division Plaza', 'Street', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (20, 'C', 'RD-99C9L', '2018-04-28T16:41:06Z', '7 Jenifer Place', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (21, 'C', 'RD-85C9X', '2017-11-01T11:30:21Z', '350 Packers Avenue', 'Street', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (22, 'A', 'RD-16A4K', '2018-05-03T01:57:10Z', '45577 Park Meadow Circle', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (23, 'B', 'RD-59B5Y', '2017-12-01T13:41:55Z', '7666 Grayhawk Terrace', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (24, 'C', 'RD-36C4V', '2018-05-02T14:45:08Z', '1520 Montana Court', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (25, 'A', 'RD-54A3B', '2018-01-27T13:02:43Z', '5478 Blackbird Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (26, 'A', 'RD-00A0Z', '2017-07-05T10:36:42Z', '668 Kenwood Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (27, 'B', 'RD-99B3Z', '2017-10-31T13:58:54Z', '4528 Meadow Ridge Way', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (28, 'E', 'RD-21E4B', '2018-03-06T15:19:53Z', '8269 Anthes Park', 'Alley', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (29, 'A', 'RD-68A4E', '2017-07-16T11:54:29Z', '34466 Mariners Cove Lane', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (30, 'A', 'RD-44A9N', '2017-11-16T22:07:30Z', '39 Shoshone Parkway', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (31, 'B', 'RD-28B1U', '2017-10-31T23:40:33Z', '9 Butternut Place', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (32, 'A', 'RD-19A8V', '2017-07-13T02:46:28Z', '9427 Clove Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (33, 'B', 'RD-03B9Q', '2017-08-21T06:54:03Z', '08242 Hintze Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (34, 'A', 'RD-33A0C', '2017-12-16T13:31:21Z', '9 Russell Terrace', 'Parkway', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (35, 'A', 'RD-54A1E', '2017-11-18T01:08:02Z', '40776 Kings Street', 'Street', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (36, 'B', 'RD-11B9D', '2017-07-16T14:58:14Z', '4379 Grover Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (37, 'A', 'RD-20A7H', '2018-04-12T17:25:55Z', '51626 Paget Drive', 'Lane', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (38, 'B', 'RD-74B2N', '2018-06-15T15:33:35Z', '4039 Northwestern Terrace', 'Circle', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (39, 'A', 'RD-14A2U', '2018-04-13T11:12:04Z', '174 Twin Pines Road', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (40, 'O', 'RD-85O8J', '2018-04-07T17:02:42Z', '15 Schiller Plaza', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (41, 'B', 'RD-17B8G', '2017-11-12T07:42:07Z', '446 Elka Drive', 'Center', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (42, 'B', 'RD-16B1V', '2017-12-14T20:35:48Z', '0493 4th Road', 'Center', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (43, 'A', 'RD-99A7V', '2017-06-29T17:17:53Z', '7815 Harper Place', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (44, 'O', 'RD-61O2F', '2017-07-15T08:41:09Z', '1388 Steensland Junction', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (45, 'A', 'RD-18A8M', '2017-12-05T14:06:22Z', '72 Golf Course Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (46, 'A', 'RD-97A2W', '2017-08-28T20:48:22Z', '7333 Alpine Street', 'Lane', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (47, 'A', 'RD-30A3J', '2018-01-26T00:15:01Z', '884 Stoughton Trail', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (48, 'O', 'RD-34O4J', '2018-06-01T01:21:24Z', '26 Riverside Lane', 'Pass', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (49, 'B', 'RD-18B6R', '2017-07-15T08:15:06Z', '04291 Dakota Way', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (50, 'A', 'RD-36A2Y', '2017-12-29T01:36:29Z', '403 Forest Run Park', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (51, 'A', 'RD-07A3U', '2017-10-23T11:03:53Z', '00758 Di Loreto Terrace', 'Place', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (52, 'O', 'RD-62O3Y', '2018-04-05T00:45:16Z', '8 Orin Court', 'Center', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (53, 'A', 'RD-18A7D', '2017-10-17T00:32:46Z', '98788 Golf Course Court', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (54, 'A', 'RD-11A4A', '2017-09-20T03:12:38Z', '567 Oak Valley Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (55, 'A', 'RD-30A2Y', '2017-11-06T08:00:24Z', '53 Fair Oaks Center', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (56, 'A', 'RD-17A3R', '2017-12-30T16:55:12Z', '075 Lighthouse Bay Junction', 'Parkway', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (57, 'O', 'RD-18O4D', '2018-02-04T12:33:46Z', '54 Eagan Circle', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (58, 'A', 'RD-25A8I', '2017-09-26T20:36:01Z', '29 Troy Center', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (59, 'B', 'RD-20B1G', '2018-04-05T04:58:38Z', '8892 Kensington Way', 'Point', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (60, 'A', 'RD-14A9B', '2017-06-27T04:49:09Z', '031 Cody Junction', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (61, 'A', 'RD-03A6S', '2017-09-10T00:46:34Z', '21 Steensland Place', 'Place', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (62, 'O', 'RD-41O3V', '2017-07-06T02:08:29Z', '27757 Sycamore Point', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (63, 'O', 'RD-36O6T', '2018-04-20T08:06:43Z', '876 Service Pass', 'Park', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (64, 'A', 'RD-42A2T', '2017-09-24T16:11:48Z', '1 Mitchell Park', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (65, 'A', 'RD-21A9L', '2018-06-11T06:03:37Z', '73686 Merrick Trail', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (66, 'C', 'RD-89C5M', '2018-03-10T16:46:56Z', '5168 Pine View Park', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (67, 'A', 'RD-10A6K', '2018-05-18T15:17:28Z', '304 Dunning Park', 'Way', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (68, 'C', 'RD-09C7S', '2018-03-08T18:52:12Z', '0 Londonderry Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (69, 'B', 'RD-75B8D', '2017-09-26T00:11:54Z', '00 Elgar Alley', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (70, 'O', 'RD-43O2V', '2017-09-02T02:56:49Z', '5969 Elmside Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (71, 'A', 'RD-24A0R', '2017-09-04T14:27:20Z', '865 Autumn Leaf Circle', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (72, 'B', 'RD-82B3A', '2018-06-03T20:09:15Z', '449 Commercial Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (73, 'A', 'RD-59A3A', '2017-11-11T20:43:16Z', '3 Banding Hill', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (74, 'B', 'RD-98B1G', '2017-06-20T12:39:45Z', '4303 Barby Road', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (75, 'A', 'RD-61A5L', '2018-03-09T18:55:16Z', '0 Macpherson Lane', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (76, 'B', 'RD-72B8U', '2018-04-27T22:48:48Z', '4 Boyd Court', 'Point', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (77, 'C', 'RD-63C3M', '2018-04-18T02:49:03Z', '3596 Miller Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (78, 'A', 'RD-03A9D', '2017-10-20T16:01:25Z', '2 Crescent Oaks Park', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (79, 'A', 'RD-62A5V', '2018-01-02T14:59:58Z', '0089 Jackson Plaza', 'Street', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (80, 'B', 'RD-36B2C', '2018-04-11T00:56:22Z', '3741 Spaight Circle', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (81, 'A', 'RD-19A7E', '2018-05-05T00:17:49Z', '90 Fair Oaks Place', 'Avenue', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (82, 'B', 'RD-90B8G', '2017-08-06T00:47:06Z', '6 Fremont Street', 'Circle', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (83, 'A', 'RD-28A0V', '2018-01-19T13:36:34Z', '20 Arrowood Parkway', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (84, 'A', 'RD-71A0B', '2018-01-09T15:30:57Z', '060 Badeau Park', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (85, 'B', 'RD-49B7X', '2018-02-07T18:46:02Z', '97261 Burning Wood Hill', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (86, 'B', 'RD-55B0F', '2018-02-02T03:23:51Z', '13987 Corscot Way', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (87, 'A', 'RD-79A5X', '2017-08-02T02:50:44Z', '90 Dexter Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (88, 'A', 'RD-04A7T', '2017-11-06T07:18:03Z', '619 Graedel Court', 'Way', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (89, 'C', 'RD-85C1G', '2017-12-17T18:50:36Z', '7 Fremont Avenue', 'Place', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (90, 'O', 'RD-40O9Z', '2017-11-19T08:07:26Z', '79953 Fair Oaks Drive', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (91, 'C', 'RD-08C4Z', '2018-03-21T02:49:58Z', '7779 Monterey Street', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (92, 'A', 'RD-13A5U', '2017-09-29T05:21:06Z', '7 Little Fleur Road', 'Circle', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (93, 'B', 'RD-02B2E', '2017-08-04T17:00:43Z', '34572 Old Shore Crossing', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (94, 'A', 'RD-11A9X', '2017-08-27T23:59:41Z', '858 Spenser Drive', 'Avenue', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (95, 'B', 'RD-95B6D', '2018-01-07T01:49:50Z', '98 Jenifer Terrace', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (96, 'A', 'RD-47A7T', '2017-07-02T09:57:56Z', '209 Talmadge Lane', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (97, 'O', 'RD-78O1Z', '2017-12-10T15:02:21Z', '5348 Blackbird Pass', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (98, 'A', 'RD-72A5Y', '2017-12-23T10:48:06Z', '394 Anzinger Avenue', 'Point', 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (99, 'C', 'RD-78C4D', '2017-12-26T03:29:27Z', '115 Petterle Crossing', null, 'COMPLETED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (100, 'A', 'RD-17A9I', '2017-10-05T17:45:19Z', '533 Transport Way', 'Crossing', 'COMPLETED');
+
+
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (101, 'A', 'RD-74A1G', '2018-02-05T15:37:44Z', '625 Veith Center', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (102, 'B', 'RD-15B1U', '2017-10-20T04:54:38Z', '9 Westport Alley', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (103, 'O', 'RD-62O0B', '2018-02-05T12:18:43Z', '87559 Sherman Terrace', 'Court', 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (104, 'A', 'RD-45A0Y', '2018-05-17T17:08:18Z', '8 Delladonna Lane', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (105, 'A', 'RD-42A8G', '2018-05-03T01:52:39Z', '7 Superior Drive', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (106, 'O', 'RD-03O0G', '2018-01-21T17:21:12Z', '72 Darwin Point', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (107, 'A', 'RD-94A0W', '2017-11-08T06:11:31Z', '7168 Anniversary Way', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (108, 'A', 'RD-18A1E', '2018-02-20T15:51:48Z', '2023 Barby Road', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (109, 'A', 'RD-11A2I', '2018-02-07T06:42:04Z', '1901 Mesta Street', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (110, 'O', 'RD-78O0A', '2018-01-02T21:11:05Z', '6 David Trail', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (111, 'B', 'RD-70B6R', '2017-11-23T11:35:51Z', '188 Golden Leaf Avenue', 'Road', 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (112, 'B', 'RD-95B9K', '2018-02-03T06:44:16Z', '805 Jenna Alley', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (113, 'A', 'RD-58A3E', '2017-08-18T08:46:01Z', '954 Oriole Hill', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (114, 'B', 'RD-58B5V', '2017-06-19T12:47:16Z', '2503 East Road', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (115, 'A', 'RD-93A3V', '2018-03-04T16:46:37Z', '2 Northview Terrace', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (116, 'B', 'RD-25B6N', '2018-01-05T13:49:50Z', '43459 Crownhardt Crossing', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (117, 'A', 'RD-01A3J', '2017-08-08T05:23:13Z', '13 Kedzie Road', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (118, 'B', 'RD-70B9E', '2017-09-25T14:22:46Z', '49 Westridge Point', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (119, 'A', 'RD-18A6U', '2018-01-15T22:08:09Z', '6109 Kennedy Court', null, 'CANCELLED');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (120, 'O', 'RD-27O6C', '2017-10-06T11:55:04Z', '590 Golf Terrace', null, 'CANCELLED');
+
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (121, 'C', 'RD-34C5U', '2018-06-18T02:58:38Z', '1909 Cascade Drive', 'Hill', 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (122, 'B', 'RD-55B4X', '2018-06-18T03:55:21Z', '7 Rigney Parkway', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (123, 'C', 'RD-41C0X', '2018-06-18T06:35:58Z', '86986 Mcbride Court', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (124, 'A', 'RD-60A5T', '2018-06-18T14:33:37Z', '14649 Manley Park', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (125, 'D', 'RD-95D8H', '2018-06-18T09:15:13Z', '50 Magdeline Road', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (126, 'A', 'RD-16A9F', '2018-06-18T01:28:09Z', '25241 Bowman Alley', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (127, 'A', 'RD-33A1C', '2018-06-18T16:49:43Z', '59864 Rutledge Avenue', null, 'ACTIVE');
+insert into Operation (id, severity, opCode, created, destination, additionalInfo, status) values (128, 'B', 'RD-49B4F', '2018-06-18T06:10:37Z', '43 Longview Crossing', null, 'ACTIVE');
+
+--(51|52|53|59|60|2|5|9|10|11|12|14|17|20|22|23|26|28|31|32|34|36|37|38|40|41|42|44|45|46|47|49|50)
+
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,1);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,2);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,3);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,4);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,5);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,6);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (46,7);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,8);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,9);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,10);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,11);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,12);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,13);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,14);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (22,15);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,16);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,17);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,18);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,19);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,20);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,21);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,22);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,23);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,24);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,25);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,26);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (5,27);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,28);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,29);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,30);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,31);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,32);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,33);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,34);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,35);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,36);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,37);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,38);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,39);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,40);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,41);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,42);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (53,43);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,44);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,45);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,46);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,47);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,48);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,49);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,50);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,51);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,52);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,53);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,54);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,55);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,56);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,57);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,58);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (32,59);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,60);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,61);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (5,62);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,63);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (45,64);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,65);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,66);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,67);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,68);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,69);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (14,70);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (52,71);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,72);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,73);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (26,74);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,75);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,76);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,77);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,78);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,79);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (22,80);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,81);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,82);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (37,83);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (50,84);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,85);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (41,86);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,87);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,88);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,89);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (60,90);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,91);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (47,92);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,93);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (53,94);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (38,95);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,96);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (32,97);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,98);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,99);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (20,100);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (46,101);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (12,102);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,103);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (42,104);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,105);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,106);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,107);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,108);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,109);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (59,110);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,111);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (17,112);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,113);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (23,114);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (40,115);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,116);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (36,117);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,118);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (11,119);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (9,120);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (31,121);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (2,122);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (49,123);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (28,124);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (51,125);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (10,125);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (34,126);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (27,127);
+INSERT INTO VehicleOperation (vehicleId,operationId) VALUES (17,128);
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 2f89d8530f716b346b1985c6b59ba9e58cdf13d6 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Mon, 18 Jun 2018 20:44:31 +0200
Subject: Reuse images in EmployeeListItemController [#25963]

---
 .../controller/EmployeeListItemController.java           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 543fe0d..d445b43 100644
--- 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
@@ -30,6 +30,12 @@ public class EmployeeListItemController extends CustomListItemController {
     private Consumer<Employee> consumerEmployeeClicked;
     private Consumer<EmployeeListItemController> consumerEmployeeListItemClicked;
 
+    private static Image imageQualification = new Image("/images/Qualification.png");
+    private static Image imagePilot = new Image("/images/Pilot.png");
+    private static Image imageNotPilot = new Image("/images/NotPilot.png");
+    private static Image imageDriver = new Image("images/Driver.png");
+    private static Image imageNotDriver = new Image("images/NotDriver.png");
+
     @FXML
     private void onEmployeeClicked() {
         if (consumerEmployeeClicked != null) {
@@ -46,13 +52,9 @@ public class EmployeeListItemController extends CustomListItemController {
         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));
+        imgQualification.setImage(imageQualification);
+        imgPilot.setImage(employee.isPilot() ? imagePilot : imageNotPilot);
+        imgDriver.setImage(employee.isDriver() ? imageDriver : imageNotDriver);
     }
 
     public static EmployeeListItemController createEmployeeListItemController(
-- 
cgit v1.2.3-70-g09d2


From 41eaffacce8c35e517ec5a1e7a914858a0717a1d Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Mon, 18 Jun 2018 21:30:50 +0200
Subject: Sort imports after rename

---
 .../missioncontrol/controller/ArchiveOperationController.java  |  2 +-
 .../missioncontrol/controller/CreateCarController.java         |  4 ++--
 .../missioncontrol/controller/CreateNewEmployeeController.java |  4 ++--
 .../missioncontrol/controller/CreateOperationController.java   |  6 +++---
 .../missioncontrol/controller/ManageEmployeesController.java   |  2 +-
 .../missioncontrol/controller/OperationDetailsController.java  |  6 +++---
 .../controller/RegistrationWindowController.java               |  6 +++---
 .../assignment/groupphase/missioncontrol/dao/EmployeeDAO.java  |  2 +-
 .../groupphase/missioncontrol/dao/EmployeeDatabaseDAO.java     |  4 ++--
 .../assignment/groupphase/missioncontrol/dao/OperationDAO.java |  4 ++--
 .../groupphase/missioncontrol/dao/OperationDatabaseDAO.java    |  4 ++--
 .../groupphase/missioncontrol/dao/RegistrationDAO.java         |  2 +-
 .../groupphase/missioncontrol/dao/RegistrationDatabaseDAO.java |  4 ++--
 .../assignment/groupphase/missioncontrol/dao/VehicleDAO.java   |  2 +-
 .../groupphase/missioncontrol/dao/VehicleDatabaseDAO.java      |  4 ++--
 .../groupphase/missioncontrol/dto/RegistrationValidator.java   |  4 ++--
 .../groupphase/missioncontrol/service/EmployeeService.java     |  2 +-
 .../groupphase/missioncontrol/service/EmployeeServiceImpl.java |  6 +++---
 .../groupphase/missioncontrol/service/OperationService.java    |  6 +++---
 .../missioncontrol/service/OperationServiceImpl.java           | 10 +++++-----
 .../groupphase/missioncontrol/service/RegistrationService.java |  2 +-
 .../missioncontrol/service/RegistrationServiceImpl.java        | 10 +++++-----
 .../groupphase/missioncontrol/service/VehicleService.java      |  4 ++--
 .../groupphase/missioncontrol/service/VehicleServiceImpl.java  |  8 ++++----
 .../controller/CreateNewEmployeeControllerTest.java            |  2 +-
 .../controller/CreateNewVehicleControllerTest.java             |  2 +-
 .../groupphase/missioncontrol/dao/EmployeeDAOTest.java         |  4 ++--
 .../groupphase/missioncontrol/dao/OperationDAOTest.java        |  4 ++--
 .../groupphase/missioncontrol/dao/RegistrationDAOTest.java     |  2 +-
 .../groupphase/missioncontrol/dao/VehicleDAOTest.java          |  4 ++--
 .../groupphase/missioncontrol/service/EmployeeServiceTest.java |  8 ++++----
 .../service/OperationServiceIntegrationTest.java               |  6 +++---
 .../missioncontrol/service/OperationServiceTest.java           |  6 +++---
 .../service/RegistrationServiceIntegrationTest.java            |  8 ++++----
 .../missioncontrol/service/RegistrationServiceTest.java        | 10 +++++-----
 35 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 6e0c89d..5b1f975 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
@@ -2,11 +2,11 @@ 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.exception.ServiceException;
 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;
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
index aa76535..1dd41c7 100644
--- 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
@@ -4,13 +4,13 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 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;
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
index 433bfa6..3e0240c 100644
--- 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
@@ -4,11 +4,11 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.exception.InvalidEmployeeException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 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;
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
index b237265..260b910 100644
--- 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
@@ -4,15 +4,15 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.exception.InvalidOperationException;
+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.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;
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
index 6138094..fa228de 100644
--- 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
@@ -1,8 +1,8 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller;
 
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 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;
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 0476fc6..38d3bd1 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
@@ -5,14 +5,14 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.exception.InvalidOperationException;
+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.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;
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
index 9c47fe4..e540b9f 100644
--- 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
@@ -3,6 +3,9 @@ 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.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.missioncontrol.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
@@ -10,9 +13,6 @@ 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;
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
index d8ac513..675e951 100644
--- 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
@@ -1,8 +1,8 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
 import java.util.Set;
 
 public interface EmployeeDAO {
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
index 889b0fc..32dd6d2 100644
--- 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
@@ -1,9 +1,9 @@
 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.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
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
index c0ef5d4..e496898 100644
--- 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
@@ -1,9 +1,9 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Status;
 import java.util.EnumSet;
 import java.util.Set;
 
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
index 1641720..1ccb4cf 100644
--- 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
@@ -1,11 +1,11 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 
+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.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;
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
index 02e742c..4a35f86 100644
--- 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
@@ -1,8 +1,8 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
 import java.util.Set;
 
 public interface RegistrationDAO {
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
index 1006a33..1f11024 100644
--- 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
@@ -1,9 +1,9 @@
 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.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
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
index ed24498..46d1853 100644
--- 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
@@ -1,8 +1,8 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
 import java.util.Set;
 
 public interface VehicleDAO {
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
index dd7c0f2..9bd7ec7 100644
--- 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
@@ -1,11 +1,11 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 
+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.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;
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
index 9512f64..a2cb8c1 100644
--- 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
@@ -1,9 +1,9 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.VehicleType;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
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
index fa4d0e6..5beabaa 100644
--- 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
@@ -1,8 +1,8 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee;
 import java.util.Set;
 
 public interface EmployeeService {
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
index 945fb49..a08b03e 100644
--- 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
@@ -1,12 +1,12 @@
 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 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 java.util.Set;
 import org.springframework.stereotype.Service;
 
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
index ca1dce9..42b23bb 100644
--- 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
@@ -1,11 +1,11 @@
 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 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 java.util.EnumSet;
 import java.util.Set;
 import java.util.SortedSet;
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
index baae598..0c350fe 100644
--- 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
@@ -1,5 +1,10 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
 
+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 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;
@@ -7,11 +12,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Seve
 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;
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
index 027417f..91577dc 100644
--- 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
@@ -1,9 +1,9 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Registration;
 import java.util.Set;
 
 public interface RegistrationService {
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
index 3ec69e7..eb2cd1d 100644
--- 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
@@ -1,15 +1,15 @@
 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 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 java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
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
index d96dfb7..f8e303d 100644
--- 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
@@ -1,9 +1,9 @@
 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 at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Status;
 import java.util.EnumSet;
 import java.util.Set;
 
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
index 6a035c6..a68720d 100644
--- 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
@@ -1,13 +1,13 @@
 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 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 java.util.EnumSet;
 import java.util.Set;
 import java.util.stream.Collectors;
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
index 2b0f793..ccd37b4 100644
--- 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
@@ -6,9 +6,9 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.missioncontrol.service.EmployeeService;
 import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
 import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
 import javafx.scene.control.DialogPane;
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
index 282c50f..4906d64 100644
--- 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
@@ -6,9 +6,9 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 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.missioncontrol.service.VehicleService;
 import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
 import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
 import javafx.scene.control.DialogPane;
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
index 8485f67..008ac57 100644
--- 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
@@ -1,9 +1,9 @@
 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.missioncontrol.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
 import java.io.InputStream;
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
index a4a0829..b15b31a 100644
--- 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
@@ -2,14 +2,14 @@ package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 
 import static org.junit.Assert.assertEquals;
 
+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.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;
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
index 6f7ee49..2cb54f8 100644
--- 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
@@ -2,10 +2,10 @@ package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 
 import static org.junit.Assert.*;
 
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 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;
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
index 294ce10..c4d7d86 100644
--- 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
@@ -1,11 +1,11 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 
+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.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;
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
index 7a16d3e..17c0a47 100644
--- 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
@@ -6,14 +6,14 @@ 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 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 java.time.LocalDate;
 import org.junit.Assert;
 import org.junit.Test;
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
index e380850..865a402 100644
--- 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
@@ -2,6 +2,9 @@ package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
 
 import static org.junit.Assert.assertEquals;
 
+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.missioncontrol.dao.EmployeeDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.EmployeeDatabaseDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.OperationDAO;
@@ -13,9 +16,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDatabas
 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;
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
index c232e78..4c1eaf1 100644
--- 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
@@ -6,6 +6,9 @@ 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.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.missioncontrol.dao.OperationDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao.VehicleDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation;
@@ -13,9 +16,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Seve
 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;
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
index bfe44aa..ac5c3fb 100644
--- 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
@@ -1,15 +1,15 @@
 package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service;
 
+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.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;
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
index 62982ac..b4bcff4 100644
--- 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
@@ -3,6 +3,11 @@ 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.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 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;
@@ -13,11 +18,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Vehicle.Builde
 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;
-- 
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/java/at/ac/tuwien/sepm/assignment')

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 410eadc051a76cc7bae782efd15fe708439c2132 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Mon, 18 Jun 2018 23:21:25 +0200
Subject: Only call reset when needed, and then only once instead of twice
 #28864

---
 .../missioncontrol/controller/RegistrationWindowController.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index e540b9f..3bde468 100644
--- 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
@@ -202,7 +202,6 @@ public class RegistrationWindowController {
 
     public void cancel() {
         LOG.debug("Hyperlink \"schließen\" clicked");
-        reset();
         this.setVisible(false);
         createOperationController.setVisible(true);
     }
@@ -265,8 +264,8 @@ public class RegistrationWindowController {
     }
 
     public void setVisible(boolean b) {
+        if (b) reset();
         root.setVisible(b);
-        reset();
     }
 
     public void tfVehicleSearch_TextChanged(KeyEvent keyEvent) {
-- 
cgit v1.2.3-70-g09d2


From 2ed8028db3944677e67e57d99a7032efef0581e5 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Mon, 18 Jun 2018 23:37:43 +0200
Subject: Comment out unnecessary reset #28864

---
 .../missioncontrol/controller/RegistrationWindowController.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 3bde468..c89860f 100644
--- 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
@@ -248,7 +248,7 @@ public class RegistrationWindowController {
             // ((Stage) lVehicles.getScene().getWindow()).close();
             this.setVisible(false);
             createOperationController.setVisible(true);
-            reset();
+            // reset();
         } catch (InvalidVehicleException e) {
             LOG.debug("Validation of Vehicle in Registration failed.");
             showValidationErrorAlertAndWait("Das spezifizierte Fahrzeug ist nicht gültig.");
-- 
cgit v1.2.3-70-g09d2


From ed5ac0d568e393c9c14041b2fd6bf7b683c7540b Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Tue, 19 Jun 2018 00:06:30 +0200
Subject: Comment out unnecessary reset #28864

---
 .../missioncontrol/controller/RegistrationWindowController.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index c89860f..94210e4 100644
--- 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
@@ -98,7 +98,7 @@ public class RegistrationWindowController {
         cbEnd.setItems(hours);
         cbEnd.setValue(12);
 
-        reset();
+        // reset();
     }
 
     private void updateEmplList() {
-- 
cgit v1.2.3-70-g09d2


From 2e316a8540f2db3b36693f6e2c2754e4d66c82ee Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Tue, 19 Jun 2018 00:07:58 +0200
Subject: Only update when window becomes visible again, greatly speeding up
 opening time of all windows #28864

---
 .../groupphase/missioncontrol/controller/CreateOperationController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 260b910..8c1df80 100644
--- 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
@@ -324,7 +324,7 @@ public class CreateOperationController {
         apInvisible.setVisible(!b);
         grdWindowContainer.setVisible(!b);
 
-        updateList();
+        if (b) updateList();
     }
 
     private void openDetailsWindow(Operation operation) {
-- 
cgit v1.2.3-70-g09d2


From 2f6fa3024fc11b65a29624e12fb7a9a6cc851bd9 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 19 Jun 2018 00:06:20 +0200
Subject: Fixup OperationDao to convert version

---
 .../missioncontrol/dao/OperationDatabaseDAO.java   | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 1ccb4cf..10bba3d 100644
--- 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
@@ -37,7 +37,6 @@ public class OperationDatabaseDAO implements OperationDAO {
         String sql =
                 "INSERT INTO Operation(opCode, severity, created, destination, additionalInfo,"
                         + "            status) VALUES (?, ?, ?, ?, ?, ?)";
-        String sql2 = "INSERT INTO VehicleOperation(vehicleId, operationId) VALUES (?, ?)";
         long operationId;
 
         try {
@@ -59,16 +58,7 @@ public class OperationDatabaseDAO implements OperationDAO {
                 }
             }
 
-            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();
-            }
+            createVehicleOperation(con, operationId, o.vehicles());
             con.commit();
             return operationId;
         } catch (SQLException e) {
@@ -84,7 +74,6 @@ public class OperationDatabaseDAO implements OperationDAO {
                 "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();
@@ -106,16 +95,7 @@ public class OperationDatabaseDAO implements OperationDAO {
                 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();
-            }
+            createVehicleOperation(con, o.id(), o.vehicles());
             con.commit();
         } catch (SQLException e) {
             jdbcConnectionManager.rollbackConnection();
@@ -123,6 +103,24 @@ public class OperationDatabaseDAO implements OperationDAO {
         }
     }
 
+    private void createVehicleOperation(Connection con, long operationId, Set<Vehicle> vehicles)
+            throws SQLException {
+        String sql =
+                "INSERT INTO VehicleOperation(vehicleId, operationId)"
+                        + " SELECT version, ? FROM Vehicle WHERE id = ?";
+
+        try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+            pstmt.setLong(1, operationId);
+
+            for (long id : (Iterable<Long>) vehicles.stream().map(Vehicle::id)::iterator) {
+                pstmt.setLong(2, id);
+                pstmt.addBatch();
+            }
+
+            pstmt.executeBatch();
+        }
+    }
+
     @Override
     public Operation get(long operationId) throws ElementNotFoundException, PersistenceException {
         String sql = "Select * from operation where id = ?";
@@ -195,7 +193,9 @@ public class OperationDatabaseDAO implements OperationDAO {
     }
 
     private Set<Vehicle> getVehiclesFromOperationId(long operationId) throws PersistenceException {
-        String sql = "SELECT vehicleId FROM VehicleOperation WHERE operationId = ?";
+        String sql =
+                "SELECT id FROM Vehicle WHERE version IN"
+                        + " (SELECT vehicleId FROM VehicleOperation WHERE operationId = ?)";
         Set<Vehicle> vehicles = new HashSet<>();
 
         try {
@@ -206,7 +206,7 @@ public class OperationDatabaseDAO implements OperationDAO {
 
                 try (ResultSet rs = pstmt.getResultSet()) {
                     while (rs.next()) {
-                        vehicles.add(vehicleDAO.get(rs.getLong("vehicleId")));
+                        vehicles.add(vehicleDAO.get(rs.getLong("Vehicle.id")));
                     }
                 }
             }
-- 
cgit v1.2.3-70-g09d2


From ede9e933d7e966ee4122b7b57242c88efc868faa Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 00:31:05 +0200
Subject: Change versioning in RegistrationDatabaseDAO [#25963]

---
 .../dao/RegistrationDatabaseDAO.java               | 112 ++++++++++++++-------
 .../missioncontrol/dao/VehicleDatabaseDAO.java     |   2 +-
 2 files changed, 79 insertions(+), 35 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 1f11024..2f52349 100644
--- 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
@@ -3,6 +3,7 @@ package at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dao;
 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.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.util.JDBCConnectionManager;
 import java.sql.Connection;
@@ -10,6 +11,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -32,6 +34,38 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         this.employeePersistence = employeePersistence;
     }
 
+    private long getVehicleVersionId(long vehicleId) throws PersistenceException {
+        String sqlGetVehicleVersionId = "SELECT * FROM vehicle WHERE id = ?";
+        try (PreparedStatement stmt =
+                jdbcConnectionManager.getConnection().prepareStatement(sqlGetVehicleVersionId)) {
+            stmt.setLong(1, vehicleId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getLong("version");
+            } else {
+                throw new PersistenceException("vehicle id not found");
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
+    private long getEmployeeVersionId(long employeeId) throws PersistenceException {
+        String sqlGetEmployeeVersionId = "SELECT * FROM employee WHERE id = ?";
+        try (PreparedStatement stmt =
+                jdbcConnectionManager.getConnection().prepareStatement(sqlGetEmployeeVersionId)) {
+            stmt.setLong(1, employeeId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getLong("version");
+            } else {
+                throw new PersistenceException("employee id not found");
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+    }
+
     @Override
     public Set<Long> add(long vehicleId, Set<Registration> registrations)
             throws PersistenceException {
@@ -47,10 +81,12 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
 
             try (PreparedStatement pstmt =
                     con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
-                pstmt.setLong(1, vehicleId);
+
+                // vehicleId is a Vehicle.id as it comes from GUI => fetch VehicleVersion.id
+                pstmt.setLong(1, getVehicleVersionId(vehicleId));
 
                 for (Registration r : registrations) {
-                    pstmt.setLong(2, r.employee().id());
+                    pstmt.setLong(2, getEmployeeVersionId(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);
@@ -86,40 +122,48 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
     }
 
     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);
+        // vehicleId is a Vehicle.id as it comes from GUI => fetch VehicleVersion.id
+        long vehicleVersionId = getVehicleVersionId(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);
-                    }
-                }
+        String sql =
+                "SELECT * FROM Registration r "
+                        + "JOIN EmployeeVersion ev ON ev.id = r.employeeId "
+                        + "JOIN VehicleVersion vv ON vv.id = r.vehicleId "
+                        + "WHERE r.vehicleId = ?";
+
+        try (PreparedStatement stmt = jdbcConnectionManager.getConnection().prepareStatement(sql)) {
+
+            List<Registration> registrationList = new ArrayList<>();
+            stmt.setLong(1, vehicleVersionId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+
+                Employee employee =
+                        Employee.builder()
+                                .id(rs.getLong("EmployeeVersion.id"))
+                                .name(rs.getString("EmployeeVersion.name"))
+                                .birthday(rs.getObject("EmployeeVersion.birthday", LocalDate.class))
+                                .educationLevel(
+                                        EducationLevel.valueOf(
+                                                rs.getString("EmployeeVersion.educationLevel")))
+                                .isDriver(rs.getBoolean("EmployeeVersion.isDriver"))
+                                .isPilot(rs.getBoolean("EmployeeVersion.isPilot"))
+                                .build();
+
+                Registration registration =
+                        Registration.builder()
+                                .id(rs.getLong("Registration.id"))
+                                .start(
+                                        (rs.getObject("Registration.start", OffsetDateTime.class))
+                                                .toInstant())
+                                .end(
+                                        (rs.getObject("Registration.end", OffsetDateTime.class))
+                                                .toInstant())
+                                .employee(employee)
+                                .build();
+
+                registrationList.add(registration);
             }
 
             return registrationList;
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
index 9bd7ec7..eb3cc61 100644
--- 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
@@ -205,7 +205,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                 .type(VehicleType.valueOf(rs.getString("type")))
                 .status(Status.values()[rs.getInt("status")])
                 .hasNef(rs.getBoolean("hasNef"))
-                .registrations(registrationDatabaseDao.list(rs.getLong("id")))
+                .registrations(registrationDatabaseDao.list(rs.getLong("Vehicle.id")))
                 .build();
     }
 }
-- 
cgit v1.2.3-70-g09d2


From ba18fafe3daca828719b95f0b0efeae6683afd3d Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 12:56:16 +0200
Subject: Change versioning in Operation and Registration [#25963]

---
 .../controller/CreateCarController.java            |  2 +-
 .../controller/CreateOperationController.java      |  1 +
 .../missioncontrol/dao/OperationDatabaseDAO.java   | 36 +++++++++++++++++-----
 .../dao/RegistrationDatabaseDAO.java               |  7 ++---
 4 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 1dd41c7..4da46a2 100644
--- 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
@@ -189,7 +189,7 @@ public class CreateCarController {
         createOperationController.setVisible(true);
     }
 
-    private void updateVehiclePane() {
+    void updateVehiclePane() {
         try {
             fpVehicleList.getChildren().clear();
 
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
index 8c1df80..e5d7b72 100644
--- 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
@@ -340,6 +340,7 @@ public class CreateOperationController {
     private void openCreateCarWindow() {
         this.setVisible(false);
         createCarController.setVisible(true);
+        createCarController.updateVehiclePane();
     }
 
     private void openRegistrationWindow() {
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
index 10bba3d..d06e13f 100644
--- 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
@@ -6,6 +6,8 @@ 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.util.JDBCConnectionManager;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -25,11 +27,15 @@ public class OperationDatabaseDAO implements OperationDAO {
 
     private JDBCConnectionManager jdbcConnectionManager;
     private VehicleDAO vehicleDAO;
+    private RegistrationDatabaseDAO registrationDAO;
 
     public OperationDatabaseDAO(
-            JDBCConnectionManager jdbcConnectionManager, VehicleDAO vehicleDAO) {
+            JDBCConnectionManager jdbcConnectionManager,
+            VehicleDAO vehicleDAO,
+            RegistrationDatabaseDAO registrationDAO) {
         this.jdbcConnectionManager = jdbcConnectionManager;
         this.vehicleDAO = vehicleDAO;
+        this.registrationDAO = registrationDAO;
     }
 
     @Override
@@ -193,9 +199,12 @@ public class OperationDatabaseDAO implements OperationDAO {
     }
 
     private Set<Vehicle> getVehiclesFromOperationId(long operationId) throws PersistenceException {
+        /*String sql =
+        "SELECT id FROM Vehicle WHERE version IN"
+                + " (SELECT vehicleId FROM VehicleOperation WHERE operationId = ?)";*/
         String sql =
-                "SELECT id FROM Vehicle WHERE version IN"
-                        + " (SELECT vehicleId FROM VehicleOperation WHERE operationId = ?)";
+                "SELECT vv.* FROM VehicleOperation vo JOIN VehicleVersion vv ON vv.id = vo.vehicleId WHERE operationId = ?";
+
         Set<Vehicle> vehicles = new HashSet<>();
 
         try {
@@ -206,16 +215,29 @@ public class OperationDatabaseDAO implements OperationDAO {
 
                 try (ResultSet rs = pstmt.getResultSet()) {
                     while (rs.next()) {
-                        vehicles.add(vehicleDAO.get(rs.getLong("Vehicle.id")));
+                        vehicles.add(vehicleFromRS(rs));
                     }
                 }
             }
         } catch (SQLException e) {
             throw new PersistenceException(e);
-        } catch (ElementNotFoundException e) {
-            throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
-        }
+        } /*catch (ElementNotFoundException e) {
+              throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
+          }*/
 
         return vehicles;
     }
+
+    private Vehicle vehicleFromRS(ResultSet rs) throws SQLException, PersistenceException {
+        return Vehicle.builder()
+                .id(rs.getLong("VehicleVersion.id"))
+                .name(rs.getString("VehicleVersion.name"))
+                .constructionType(
+                        ConstructionType.values()[rs.getInt("VehicleVersion.constructionType")])
+                .type(VehicleType.valueOf(rs.getString("VehicleVersion.type")))
+                .status(Vehicle.Status.ABGEMELDET)
+                .hasNef(rs.getBoolean("VehicleVersion.hasNef"))
+                .registrations(registrationDAO.list(rs.getLong("VehicleVersion.id")))
+                .build();
+    }
 }
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
index 2f52349..b08ee68 100644
--- 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
@@ -83,7 +83,7 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
                     con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
 
                 // vehicleId is a Vehicle.id as it comes from GUI => fetch VehicleVersion.id
-                pstmt.setLong(1, getVehicleVersionId(vehicleId));
+                pstmt.setLong(1, getVehicleVersionId(vehicleId) /*vehicleId*/);
 
                 for (Registration r : registrations) {
                     pstmt.setLong(2, getEmployeeVersionId(r.employee().id()));
@@ -123,9 +123,6 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
 
     protected List<Registration> list(long vehicleId) throws PersistenceException {
 
-        // vehicleId is a Vehicle.id as it comes from GUI => fetch VehicleVersion.id
-        long vehicleVersionId = getVehicleVersionId(vehicleId);
-
         String sql =
                 "SELECT * FROM Registration r "
                         + "JOIN EmployeeVersion ev ON ev.id = r.employeeId "
@@ -135,7 +132,7 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         try (PreparedStatement stmt = jdbcConnectionManager.getConnection().prepareStatement(sql)) {
 
             List<Registration> registrationList = new ArrayList<>();
-            stmt.setLong(1, vehicleVersionId);
+            stmt.setLong(1, vehicleId); // is vehicle version id!
             ResultSet rs = stmt.executeQuery();
             while (rs.next()) {
 
-- 
cgit v1.2.3-70-g09d2


From 2244bd4a51eedda216d6bc822f4e07008239944b Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 16:51:54 +0200
Subject: Fix versioning problem where wrong cars showed up in op-detail
 [#25963]

---
 .../missioncontrol/dao/OperationDatabaseDAO.java          | 15 +++++++++------
 .../missioncontrol/dao/RegistrationDatabaseDAO.java       |  2 +-
 .../groupphase/missioncontrol/dao/VehicleDatabaseDAO.java |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index d06e13f..53682f9 100644
--- 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
@@ -221,21 +221,24 @@ public class OperationDatabaseDAO implements OperationDAO {
             }
         } catch (SQLException e) {
             throw new PersistenceException(e);
-        } /*catch (ElementNotFoundException e) {
-              throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
-          }*/
+        } catch (ElementNotFoundException e) {
+            throw new PersistenceException("VehicleOperation contained nonexistent vehicle", e);
+        }
 
         return vehicles;
     }
 
-    private Vehicle vehicleFromRS(ResultSet rs) throws SQLException, PersistenceException {
+    private Vehicle vehicleFromRS(ResultSet rs)
+            throws SQLException, PersistenceException, ElementNotFoundException {
+        String name = rs.getString("VehicleVersion.name");
+        long vehicleId = Long.parseLong(name.split("-")[1]);
         return Vehicle.builder()
-                .id(rs.getLong("VehicleVersion.id"))
+                .id(vehicleId)
                 .name(rs.getString("VehicleVersion.name"))
                 .constructionType(
                         ConstructionType.values()[rs.getInt("VehicleVersion.constructionType")])
                 .type(VehicleType.valueOf(rs.getString("VehicleVersion.type")))
-                .status(Vehicle.Status.ABGEMELDET)
+                .status(vehicleDAO.get(vehicleId).status())
                 .hasNef(rs.getBoolean("VehicleVersion.hasNef"))
                 .registrations(registrationDAO.list(rs.getLong("VehicleVersion.id")))
                 .build();
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
index b08ee68..90fbc2c 100644
--- 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
@@ -83,7 +83,7 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
                     con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
 
                 // vehicleId is a Vehicle.id as it comes from GUI => fetch VehicleVersion.id
-                pstmt.setLong(1, getVehicleVersionId(vehicleId) /*vehicleId*/);
+                pstmt.setLong(1, getVehicleVersionId(vehicleId));
 
                 for (Registration r : registrations) {
                     pstmt.setLong(2, getEmployeeVersionId(r.employee().id()));
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
index eb3cc61..8cef65e 100644
--- 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
@@ -170,7 +170,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
     @Override
     public Vehicle get(long id) throws ElementNotFoundException, PersistenceException {
         String sql =
-                "SELECT a.id, b.name, b.constructionType, b.type, a.status, b.hasNef"
+                "SELECT *"
                         + " FROM Vehicle a"
                         + " INNER JOIN VehicleVersion b"
                         + " ON version = b.id"
@@ -205,7 +205,7 @@ public class VehicleDatabaseDAO implements VehicleDAO {
                 .type(VehicleType.valueOf(rs.getString("type")))
                 .status(Status.values()[rs.getInt("status")])
                 .hasNef(rs.getBoolean("hasNef"))
-                .registrations(registrationDatabaseDao.list(rs.getLong("Vehicle.id")))
+                .registrations(registrationDatabaseDao.list(rs.getLong("Vehicle.version")))
                 .build();
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 824e8cb818820b313b7dd08d8f72932b8ca7d41d Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 18:29:39 +0200
Subject: Set status of vehicles to 'ZUM_BERUFUNGSORT' when creating op
 [#25963]

---
 .../groupphase/missioncontrol/dao/OperationDatabaseDAO.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 53682f9..238a2a8 100644
--- 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
@@ -114,16 +114,23 @@ public class OperationDatabaseDAO implements OperationDAO {
         String sql =
                 "INSERT INTO VehicleOperation(vehicleId, operationId)"
                         + " SELECT version, ? FROM Vehicle WHERE id = ?";
+        String sqlUpdateVehicleStatus =
+                "UPDATE Vehicle SET status = 'ZUM_BERUFUNGSORT' WHERE id = ?";
 
-        try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+        try (PreparedStatement pstmt = con.prepareStatement(sql);
+                PreparedStatement stmtUpdateVehicleStatus =
+                        con.prepareStatement(sqlUpdateVehicleStatus)) {
             pstmt.setLong(1, operationId);
 
             for (long id : (Iterable<Long>) vehicles.stream().map(Vehicle::id)::iterator) {
                 pstmt.setLong(2, id);
+                stmtUpdateVehicleStatus.setLong(1, id);
                 pstmt.addBatch();
+                stmtUpdateVehicleStatus.addBatch();
             }
 
             pstmt.executeBatch();
+            stmtUpdateVehicleStatus.executeBatch();
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From fffb6c7bbc2a68fb824309616d3d278b39f4e824 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 21:06:12 +0200
Subject: Display registrations in archive which are in timeframe only [#25963]

E.g. one group of people registers to from 10-12. If the group of people is registered on a car which is sent to the operation within the time it is listed in archive. Otherwise, they are not shown. This restriction is necessary as otherwise, all employees that have been registered to this vehicle would be listed, regardless of the time of their registration
---
 .../controller/ArchiveOperationController.java     |  2 +-
 .../DetailArchiveOperationController.java          | 27 ++++++++++++++++++----
 .../dao/RegistrationDatabaseDAO.java               | 22 ++++++++++--------
 3 files changed, 36 insertions(+), 15 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 5b1f975..3c3a005 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
@@ -177,7 +177,7 @@ public class ArchiveOperationController {
 
                 controller = DetailArchiveOperationController.create(fxmlLoader);
 
-                controller.set(vehicle);
+                controller.set(vehicle, detailOperation);
                 fpVehicles.getChildren().add(controller.getRoot());
             }
         } catch (IOException e) {
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
index 32630a5..a866653 100644
--- 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
@@ -3,11 +3,15 @@ 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.Operation;
+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.util.SpringFXMLLoader;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
 import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
@@ -47,7 +51,7 @@ public class DetailArchiveOperationController {
 
     private Node rootElement;
 
-    public void set(Vehicle vehicle) {
+    public void set(Vehicle vehicle, Operation operation) {
         VehiclePaneController controller;
         try {
             controller = VehiclePaneController.createVehiclePane();
@@ -59,10 +63,25 @@ public class DetailArchiveOperationController {
                     "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();
+            List<Registration> registrations =
+                    Objects.requireNonNull(vehicle.registrations())
+                            .stream()
+                            .filter(
+                                    registration ->
+                                            registration
+                                                            .start()
+                                                            .isBefore(
+                                                                    Objects.requireNonNull(
+                                                                            operation.created()))
+                                                    && registration
+                                                            .end()
+                                                            .isAfter(
+                                                                    Objects.requireNonNull(
+                                                                            operation.created())))
+                            .collect(Collectors.toList());
 
+            for (Registration registration : registrations) {
+                Employee employee = registration.employee();
                 EmployeeListItemController employeeListItemController =
                         EmployeeListItemController.createEmployeeListItemController(
                                 fxmlLoader, employee);
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
index 90fbc2c..9f182c2 100644
--- 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
@@ -39,11 +39,12 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         try (PreparedStatement stmt =
                 jdbcConnectionManager.getConnection().prepareStatement(sqlGetVehicleVersionId)) {
             stmt.setLong(1, vehicleId);
-            ResultSet rs = stmt.executeQuery();
-            if (rs.next()) {
-                return rs.getLong("version");
-            } else {
-                throw new PersistenceException("vehicle id not found");
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getLong("version");
+                } else {
+                    throw new PersistenceException("vehicle id not found");
+                }
             }
         } catch (SQLException e) {
             throw new PersistenceException(e);
@@ -55,11 +56,12 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         try (PreparedStatement stmt =
                 jdbcConnectionManager.getConnection().prepareStatement(sqlGetEmployeeVersionId)) {
             stmt.setLong(1, employeeId);
-            ResultSet rs = stmt.executeQuery();
-            if (rs.next()) {
-                return rs.getLong("version");
-            } else {
-                throw new PersistenceException("employee id not found");
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getLong("version");
+                } else {
+                    throw new PersistenceException("employee id not found");
+                }
             }
         } catch (SQLException e) {
             throw new PersistenceException(e);
-- 
cgit v1.2.3-70-g09d2


From 280196ec77ffb1ff722b947afa6b2e2439a663ec Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 19 Jun 2018 21:09:14 +0200
Subject: Implement and remove registrations #25963

---
 .../controller/CreateOperationController.java      | 26 +++++++++++++++-------
 .../dao/RegistrationDatabaseDAO.java               | 18 +++++++++++++++
 .../service/RegistrationServiceImpl.java           | 10 ++++++++-
 3 files changed, 45 insertions(+), 9 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index e5d7b72..cc09127 100644
--- 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
@@ -5,6 +5,7 @@ import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.
 import static at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.Helper.showValidationErrorAlertAndWait;
 
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+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.missioncontrol.dto.Operation;
@@ -12,6 +13,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.dto.Operation.Stat
 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.RegistrationService;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
 import java.io.IOException;
 import java.time.Instant;
@@ -66,11 +68,15 @@ public class CreateOperationController {
 
     private final OperationService operationService;
     private final VehicleService vehicleService;
+    private final RegistrationService registrationService;
 
     public CreateOperationController(
-            OperationService operationService, VehicleService vehicleService) {
+            OperationService operationService,
+            VehicleService vehicleService,
+            RegistrationService registrationService) {
         this.operationService = operationService;
         this.vehicleService = vehicleService;
+        this.registrationService = registrationService;
     }
 
     @FXML
@@ -117,7 +123,10 @@ public class CreateOperationController {
                         .setOnMouseClicked(
                                 event -> {
                                     if (event.getButton().equals(MouseButton.SECONDARY)) {
-                                        createContextMenu(vehicle, vehicleService)
+                                        createContextMenu(
+                                                        vehicle,
+                                                        vehicleService,
+                                                        registrationService)
                                                 .show(
                                                         controller.getRootElement(),
                                                         event.getScreenX(),
@@ -172,14 +181,11 @@ public class CreateOperationController {
         }
     }
 
-    private ContextMenu createContextMenu(Vehicle data, VehicleService vehicleService) {
+    private ContextMenu createContextMenu(
+            Vehicle data, VehicleService vehicleService, RegistrationService registrationService) {
         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) {
@@ -191,9 +197,13 @@ public class CreateOperationController {
             mi.setOnAction(
                     event -> {
                         try {
+                            if (status == Vehicle.Status.ABGEMELDET)
+                                for (Registration registration : data.registrations())
+                                    registrationService.remove(registration.id());
+
                             vehicleService.update(data.toBuilder().status(status).build());
                             this.updateList();
-                        } catch (InvalidVehicleException e) {
+                        } catch (InvalidVehicleException | InvalidRegistrationException e) {
                             LOG.debug(
                                     "Validation error in createContextMenu(). (mi.setOnAction) ",
                                     e);
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
index 9f182c2..8ae319c 100644
--- 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
@@ -11,6 +11,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
@@ -120,6 +121,23 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
 
     @Override
     public void remove(long id) throws ElementNotFoundException, PersistenceException {
+        String sql = "UPDATE Registration SET active = 0, end = ? WHERE id = ?";
+
+        try {
+            Connection con = jdbcConnectionManager.getConnection();
+
+            try (PreparedStatement pstmt = con.prepareStatement(sql)) {
+                pstmt.setObject(1, OffsetDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()));
+                pstmt.setLong(2, id);
+
+                if (pstmt.executeUpdate() != 1)
+                    throw new ElementNotFoundException("No such registrationId exists");
+            }
+
+        } catch (SQLException e) {
+            throw new PersistenceException(e);
+        }
+
         throw new UnsupportedOperationException();
     }
 
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
index eb2cd1d..a6a1dfe 100644
--- 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
@@ -47,6 +47,14 @@ public class RegistrationServiceImpl implements RegistrationService {
 
     @Override
     public void remove(long registrationId) throws InvalidRegistrationException, ServiceException {
-        throw new UnsupportedOperationException();
+        if (registrationId <= 0) throw new InvalidRegistrationException("RegistrationId invalid");
+
+        try {
+            registrationDAO.remove(registrationId);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        } catch (ElementNotFoundException e) {
+            throw new InvalidRegistrationException(e);
+        }
     }
 }
-- 
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/java/at/ac/tuwien/sepm/assignment')

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


From c0137272697475c522afa6ce1126187e68818be5 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 19 Jun 2018 21:55:11 +0200
Subject: Fixup the contextmenu handling for remove #25963

---
 .../controller/CreateOperationController.java      | 41 +++++-----------------
 .../dao/RegistrationDatabaseDAO.java               |  2 --
 2 files changed, 9 insertions(+), 34 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index cc09127..2334803 100644
--- 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
@@ -16,12 +16,8 @@ import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.OperationS
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.RegistrationService;
 import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.service.VehicleService;
 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;
@@ -186,6 +182,8 @@ public class CreateOperationController {
         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) {
@@ -197,13 +195,9 @@ public class CreateOperationController {
             mi.setOnAction(
                     event -> {
                         try {
-                            if (status == Vehicle.Status.ABGEMELDET)
-                                for (Registration registration : data.registrations())
-                                    registrationService.remove(registration.id());
-
                             vehicleService.update(data.toBuilder().status(status).build());
                             this.updateList();
-                        } catch (InvalidVehicleException | InvalidRegistrationException e) {
+                        } catch (InvalidVehicleException e) {
                             LOG.debug(
                                     "Validation error in createContextMenu(). (mi.setOnAction) ",
                                     e);
@@ -223,32 +217,15 @@ public class CreateOperationController {
         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);
-                        }
+                        if (data.registrations() == null) return;
 
-                        vehicleService.update(
-                                data.toBuilder()
-                                        .registrations(newRegistrations)
-                                        .status(Vehicle.Status.ABGEMELDET)
-                                        .build());
+                        for (Registration registration : data.registrations())
+                            registrationService.remove(registration.id());
 
+                        vehicleService.update(
+                                data.toBuilder().status(Vehicle.Status.ABGEMELDET).build());
                         this.updateList();
-                    } catch (InvalidVehicleException e) {
+                    } catch (InvalidVehicleException | InvalidRegistrationException e) {
                         LOG.debug(
                                 "Validation error in createContextMenu(). (abmelden.setOnAction) ",
                                 e);
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
index 8ae319c..b624056 100644
--- 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
@@ -137,8 +137,6 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
         } catch (SQLException e) {
             throw new PersistenceException(e);
         }
-
-        throw new UnsupportedOperationException();
     }
 
     protected List<Registration> list(long vehicleId) throws PersistenceException {
-- 
cgit v1.2.3-70-g09d2


From 9b760d769a6cf3def05ced52c835c596df79faf0 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Tue, 19 Jun 2018 22:06:25 +0200
Subject: Set default registration start- & end time [#25963]

---
 .../controller/RegistrationWindowController.java   | 37 ++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 94210e4..be0bfff 100644
--- 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
@@ -94,13 +94,16 @@ public class RegistrationWindowController {
                         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);
-
+        setDefaultTime();
         // reset();
     }
 
+    private void setDefaultTime() {
+        cbStart.setValue(LocalDateTime.now().getHour());
+        cbEnd.setValue((LocalDateTime.now().getHour() + 4) % 24);
+    }
+
     private void updateEmplList() {
         employeeListController.deselectAllEmployees();
 
@@ -215,6 +218,7 @@ public class RegistrationWindowController {
         lVehicles.setText("-");
         updateVehList();
         updateEmplList();
+        setDefaultTime();
     }
 
     public void create() {
@@ -225,21 +229,28 @@ public class RegistrationWindowController {
             if (chosenVehicle == null) {
                 throw new InvalidVehicleException("no Vehicle");
             }
+
+            LocalDateTime startDate =
+                    LocalDateTime.of(
+                            LocalDate.now(),
+                            LocalTime.of(
+                                    cbStart.getValue(),
+                                    LocalDateTime.now().getMinute(),
+                                    LocalDateTime.now().getSecond()));
+
+            LocalDateTime endDate =
+                    LocalDateTime.of(
+                            LocalDate.now()
+                                    .plusDays(cbStart.getValue() >= cbEnd.getValue() ? 1 : 0),
+                            LocalTime.of(cbEnd.getValue(), 0));
+
             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()))
+                                .start(startDate.toInstant(OffsetDateTime.now().getOffset()))
+                                .end(endDate.toInstant(OffsetDateTime.now().getOffset()))
                                 .build());
             }
 
-- 
cgit v1.2.3-70-g09d2


From e70bb2b2771239dcda52f4ad1532ae56c96a3293 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Wed, 20 Jun 2018 16:56:08 +0200
Subject: Show validation error message (as changed during Jour Fixe)

---
 .../missioncontrol/controller/RegistrationWindowController.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index be0bfff..4a8bc06 100644
--- 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
@@ -262,15 +262,14 @@ public class RegistrationWindowController {
             // reset();
         } catch (InvalidVehicleException e) {
             LOG.debug("Validation of Vehicle in Registration failed.");
-            showValidationErrorAlertAndWait("Das spezifizierte Fahrzeug ist nicht gültig.");
+            showValidationErrorAlertAndWait(e.getMessage());
         } 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!");
+            showValidationErrorAlertAndWait(e.getMessage());
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 91e1248d777635a34e7d62c288c0aa38eba74205 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Wed, 20 Jun 2018 19:27:18 +0200
Subject: Speed up user interface by only updating operation list when changes
 could happen #28864

---
 .../missioncontrol/controller/CreateOperationController.java          | 4 +++-
 .../missioncontrol/controller/RegistrationWindowController.java       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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
index 2334803..f06b43f 100644
--- 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
@@ -94,6 +94,8 @@ public class CreateOperationController {
         setVisible(true);
         createCarController.setVisible(false);
         registrationWindowController.setVisible(false);
+
+        updateList();
     }
 
     public void updateList() {
@@ -311,7 +313,7 @@ public class CreateOperationController {
         apInvisible.setVisible(!b);
         grdWindowContainer.setVisible(!b);
 
-        if (b) updateList();
+        // if (b) updateList();
     }
 
     private void openDetailsWindow(Operation operation) {
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
index 4a8bc06..c445a12 100644
--- 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
@@ -259,6 +259,7 @@ public class RegistrationWindowController {
             // ((Stage) lVehicles.getScene().getWindow()).close();
             this.setVisible(false);
             createOperationController.setVisible(true);
+            createOperationController.updateList();
             // reset();
         } catch (InvalidVehicleException e) {
             LOG.debug("Validation of Vehicle in Registration failed.");
-- 
cgit v1.2.3-70-g09d2


From 7884e7dfb93b6555f9470734209b4f188ee7a937 Mon Sep 17 00:00:00 2001
From: Felix Kehrer <felix.kehrer@gmail.com>
Date: Wed, 20 Jun 2018 20:33:52 +0200
Subject: Handle validation errors differently from other Exceptions #28864

---
 .../controller/OperationDetailsController.java          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

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 937a86a..daeaedd 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
@@ -89,9 +89,12 @@ public class OperationDetailsController {
                 controller.getBtnRequest().setOnAction(e -> requestVehicleClicked(controller));
                 fpAdditional.getChildren().add(controller.getRootElement());
             }
-        } catch (IOException | ServiceException | InvalidOperationException e) {
+        } catch (IOException | ServiceException e) {
             LOG.error("Error while updating list.", e);
             showServiceExceptionAlertAndWait("Error while updating list.");
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation for Operation failed");
+            showValidationErrorAlertAndWait(e.getMessage());
         }
     }
 
@@ -160,17 +163,23 @@ public class OperationDetailsController {
     private void requestVehicleClicked(VehiclePaneController v) {
         LOG.debug("Button \"Nachfordern\" clicked.");
 
-        Vehicle vehicle;
+        Vehicle vehicle = null;
 
         try {
             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);
+        } catch (ServiceException e) {
+            LOG.error("ServiceException in requestVehicleClicked()", e);
             showServiceExceptionAlertAndWait(e.getMessage());
             return;
+        } catch (InvalidVehicleException e) {
+            LOG.debug("Validation of Vehicle failed");
+            showValidationErrorAlertAndWait(e.getMessage());
+        } catch (InvalidOperationException e) {
+            LOG.debug("Validation of Operation failed");
+            showValidationErrorAlertAndWait(e.getMessage());
         }
         showSuccessAlertAndWait("Das Fahrzeug wurde erfolgreich angefordert");
         operation.vehicles().add(vehicle);
-- 
cgit v1.2.3-70-g09d2