1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java
index 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);
     }
 }