aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/at/ac/tuwien/sepm
diff options
context:
space:
mode:
authorAndreas Weninger <e01526989@student.tuwien.ac.at>2018-06-12 13:42:09 +0200
committerAndreas Weninger <e01526989@student.tuwien.ac.at>2018-06-12 13:42:09 +0200
commit74ddaa7804eb5721ef9cbe641f01ff39b904017d (patch)
tree28613513384d4b61233ff94403b461b86be048c9 /src/main/java/at/ac/tuwien/sepm
parentf66e6b22e3d31d56fe92d03281de12731956f51e (diff)
downloadsepm-groupproject-74ddaa7804eb5721ef9cbe641f01ff39b904017d.tar.gz
sepm-groupproject-74ddaa7804eb5721ef9cbe641f01ff39b904017d.tar.xz
sepm-groupproject-74ddaa7804eb5721ef9cbe641f01ff39b904017d.zip
Hotfix: Status was not displayed if the vehicle had no registrations.
Diffstat (limited to 'src/main/java/at/ac/tuwien/sepm')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java13
1 files changed, 6 insertions, 7 deletions
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);