From 694c5f3e6b5b260298af91a6d9d1b63dbc9e6231 Mon Sep 17 00:00:00 2001 From: Martin Weick Date: Tue, 22 May 2018 22:27:25 +0200 Subject: fixing registration Employee list #25874 --- .../einsatzverwaltung/controller/RegistrationWindowController.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') 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 9ed6147..fa79e27 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 @@ -143,6 +143,7 @@ public class RegistrationWindowController { public void cancel() { LOG.debug("Cancel Button clicked"); + chosenEmployees.clear(); ((Stage) lVehicles.getScene().getWindow()).close(); } @@ -170,7 +171,9 @@ public class RegistrationWindowController { } try { registrationService.add(chosenVehicle.id(), registrations); + chosenEmployees.clear(); ((Stage) lVehicles.getScene().getWindow()).close(); + } catch (InvalidVehicleException e) { // NOT THROWN ANYWHERE RIGHT NOW LOG.info( @@ -182,6 +185,7 @@ 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: {}", @@ -191,6 +195,7 @@ 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: {}", @@ -201,6 +206,7 @@ public class RegistrationWindowController { "Die gewählte Kombination von Fahrzeug und Personal ist nicht gültig!"); alert.setContentText(e.getMessage()); alert.show(); + chosenEmployees.clear(); } } } -- cgit v1.2.3-70-g09d2