1 files changed, 28 insertions, 4 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 e97b8ad..c0de7cc 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
@@ -1,7 +1,15 @@
 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.service.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.util.EnumSet;
+import java.util.LinkedList;
+import java.util.List;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.layout.FlowPane;
 import org.springframework.stereotype.Controller;
@@ -23,12 +31,12 @@ public class ArchivOperationController {
 
     @FXML
     public void initialize() {
-        for (int i = 0; i < 2; i++) {
+        /*for (int i = 0; i < 2; i++) {
             Button b = new Button();
             b.setPrefHeight(200);
-            b.setPrefWidth(650 / 2);
+            b.setPrefWidth(800 / 2);
             archiveOperationFlowPane.getChildren().add(b);
-        }
+        }*/
     }
 
     public void fillList() {
@@ -41,7 +49,23 @@ public class ArchivOperationController {
             b.setPrefWidth(650 / 2);
             archiveOperationFlowPane.getChildren().add(b);
         }*/
-        // operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED));
+        List<Operation> list = new LinkedList<>();
+        try {
+            list = operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED));
+        } catch (ServiceException e) {
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setTitle("Fehler");
+            alert.setHeaderText("Fehler!");
+            alert.setContentText("Die Einsätze konnten nicht geladen werden!");
+            alert.showAndWait();
+        }
+        for (int i =0;i<list.size();i++){
+            Button b = new Button();
+            b.setPrefHeight(200);
+            b.setPrefWidth(800 / 2);
+            b.setText(list.get(i).opCode());
+            archiveOperationFlowPane.getChildren().add(b);
+        }
         /*} catch (ServiceException e) {
             Alert alert = new Alert(AlertType.ERROR);
             alert.setTitle("Fehler");