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