aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorViktoria Pundy <viktoria.pundy@aon.at>2018-05-17 16:24:24 +0200
committerTharre <tharre3@gmail.com>2018-05-22 15:53:23 +0200
commit81996499f2536ce0c5e4d4a128df73753a14f65c (patch)
treea939ca181e420499790f7b128274cd20555f1e3b /src/main/java
parent56bb347936509de408df2f3959b71d882362d337 (diff)
downloadsepm-groupproject-81996499f2536ce0c5e4d4a128df73753a14f65c.tar.gz
sepm-groupproject-81996499f2536ce0c5e4d4a128df73753a14f65c.tar.xz
sepm-groupproject-81996499f2536ce0c5e4d4a128df73753a14f65c.zip
Vehicles are now shown in detail view [#24990]
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
index 177dd4d..c22b398 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
@@ -2,12 +2,14 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.EnumSet;
import java.util.LinkedList;
+import java.util.List;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
@@ -27,6 +29,7 @@ public class ArchivOperationController {
public Label lblVehicles;
public Label lblDate;
public Label lblAddress;
+ public FlowPane fpVehicles;
OperationService operationService;
public FlowPane archiveOperationFlowPane;
public CreateOperationController createOperationController;
@@ -107,6 +110,15 @@ public class ArchivOperationController {
}
lblVehicles.setText(result.toString());
lblAddress.setText(detailOperation.destination());
+
+ List<Vehicle> vehicles = detailOperation.vehicles();
+ for (int i = 0; i < vehicles.size(); i++) {
+ Button b = new Button();
+ b.setPrefHeight(200);
+ b.setPrefWidth(640 / 2);
+ b.setText(vehicles.get(i).name());
+ fpVehicles.getChildren().add(b);
+ }
}
public void setListVisible(boolean b) {
@@ -119,6 +131,5 @@ public class ArchivOperationController {
public void backClicked() {
setDetailsVisible(false);
- // setListVisible(true);
}
}