1 files changed, 20 insertions, 4 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
index ef890e0..5222712 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
@@ -35,6 +35,8 @@ 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;
@@ -106,9 +108,16 @@ public class CreateOperationController {
     public void updateList() {
         try {
             fpVehicles.getChildren().clear();
-            EnumSet<Vehicle.Status> stati = EnumSet.allOf(Vehicle.Status.class);
-            stati.remove(Vehicle.Status.ABGEMELDET);
-            Set<Vehicle> vehicles = vehicleService.list(stati);
+
+            // 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();
@@ -152,7 +161,7 @@ public class CreateOperationController {
 
                 fpVehicles.getChildren().add(controller.getRootElement());
             }
-        } catch (ServiceException | IOException e) {
+        } catch (ServiceException | IOException | InvalidOperationException e) {
             LOG.error("Error while updating list.", e);
 
             Alert alert = new Alert(Alert.AlertType.ERROR);
@@ -344,4 +353,11 @@ public class CreateOperationController {
         operationDetailsController.initOperation(operation);
         this.setVisible(false);
     }
+
+    @FXML
+    public void onOperationCodeChanged(KeyEvent keyEvent) {
+        if (keyEvent.getCode() == KeyCode.ENTER) {
+            updateList();
+        }
+    }
 }