Operations in archive are now sorted [#27299]

2 files changed, 30 insertions, 11 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 107ed2f..04f1dde 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -8,9 +8,11 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -18,7 +20,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
-import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
@@ -36,7 +37,6 @@ public class ArchiveOperationController {
     @FXML private AnchorPane archiveOperationAP;
     @FXML private AnchorPane apDetails;
     @FXML private Label lblCodeHeader;
-    @FXML private Hyperlink hypBack;
     @FXML private Label lblOpCode;
     @FXML private Label lblVehicles;
     @FXML private Label lblDate;
@@ -71,8 +71,7 @@ public class ArchiveOperationController {
     private void setFlowPane() {
         try {
             archiveOperationFlowPane.getChildren().clear();
-            Set<Operation> operations = list;
-            for (Operation operation : operations) {
+            for (Operation operation : sortSet(list)) {
                 OperationInArchiveController opInAController =
                         OperationInArchiveController.create();
                 opInAController.set(operation);
@@ -93,26 +92,46 @@ public class ArchiveOperationController {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
-            alert.setContentText("Das Element konnte nicht geladen werden!");
+            alert.setContentText("Die Element konnte nicht geladen werden!");
             alert.showAndWait();
         }
     }
 
+    private List<Operation> sortSet(Set<Operation> operationsSet) {
+        Operation[] array = operationsSet.toArray(new Operation[operationsSet.size()]);
+        for (int i = array.length - 1; i > 0; i--) {
+            for (int j = 0; j < i; j++) {
+                LocalDateTime first =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j].created()), ZoneOffset.UTC);
+                LocalDateTime second =
+                        LocalDateTime.ofInstant(
+                                Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC);
+                if (second.isBefore(first)) {
+                    Operation help = array[j];
+                    array[j] = array[j + 1];
+                    array[j + 1] = help;
+                }
+            }
+        }
+        return Arrays.asList(array);
+    }
+
     private Operation detailOperation;
 
     private void setOperation() {
         lblCodeHeader.setText(detailOperation.opCode());
         String date = "am ";
         if (detailOperation.created() != null) {
-            LocalDateTime myDateTime =
+            LocalDateTime dateTime =
                     LocalDateTime.ofInstant(
                             Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
             date +=
-                    myDateTime.getDayOfMonth()
+                    dateTime.getDayOfMonth()
                             + "."
-                            + myDateTime.getMonth().getValue()
+                            + dateTime.getMonth().getValue()
                             + "."
-                            + myDateTime.getYear();
+                            + dateTime.getYear();
             lblDate.setText(date);
         } else {
             lblDate.setText("---");
@@ -157,7 +176,7 @@ public class ArchiveOperationController {
         createOperationController.setVisible(true);
     }
 
-    public void setVisible(boolean b) {
+    void setVisible(boolean b) {
         archiveOperationAP.setVisible(b);
         backApMain.setVisible(b);
         apMainDetails.setVisible(b);
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index ddcb0b4..0e4e3d7 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -35,7 +35,7 @@
                         <Font name="System Bold" size="16.0" />
                      </font>
                   </Label>
-                  <Hyperlink fx:id="hypBack" layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
+                  <Hyperlink layoutX="656.0" layoutY="20.0" onAction="#backClicked" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="50.0">
                      <font>
                         <Font name="System Bold" size="16.0" />
                      </font>