diff options
Diffstat (limited to 'src')
3 files changed, 16 insertions, 15 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 a233d21..d66ad40 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 @@ -120,7 +120,7 @@ public class ArchiveOperationController { LocalDateTime second = LocalDateTime.ofInstant( Objects.requireNonNull(array[j + 1].created()), ZoneOffset.UTC); - if (second.isBefore(first)) { + if (first.isBefore(second)) { Operation help = array[j]; array[j] = array[j + 1]; array[j + 1] = help; diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index 42f583c..8db231e 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -12,11 +12,11 @@ <?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.text.Font?> -<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: white;" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ArchiveOperationController"> +<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ArchiveOperationController"> <children> - <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0"> + <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="435.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="50.0"> <content> - <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: WHITE;" vgap="12"> + <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="12"> <padding> <Insets left="40.0" top="20.0" /> </padding></FlowPane> @@ -24,6 +24,15 @@ </ScrollPane> <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="1000.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> <children> + <ScrollPane fitToWidth="true" hbarPolicy="NEVER" layoutY="211.0" prefHeight="424.0" prefWidth="840.0" style="-fx-background-color: rgba(239,235,232,1);" vbarPolicy="NEVER" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="211.0"> + <content> + <FlowPane fx:id="fpVehicles" hgap="50" prefHeight="419.0" prefWidth="830.0" style="-fx-background-color: rgba(239,235,232,1);" vgap="20"> + <padding> + <Insets left="40.0" right="40.0" top="20.0" /> + </padding> + </FlowPane> + </content> + </ScrollPane> <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);"> <children> <Label layoutX="81.0" layoutY="20.0" prefHeight="34.0" prefWidth="116.0" text="Archiv-Eintrag:" textFill="WHITE"> @@ -42,7 +51,7 @@ </font> </Hyperlink> </children></AnchorPane> - <AnchorPane layoutX="82.0" layoutY="60.0" prefHeight="150.0" prefWidth="836.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);"> + <AnchorPane layoutX="82.0" layoutY="81.0" prefHeight="99.0" prefWidth="822.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 5, 0, 0, 5);"> <children> <Label fx:id="lblOpCode" layoutX="25.0" layoutY="22.0" prefHeight="26.0" prefWidth="116.0" text="Label"> <font> @@ -67,14 +76,6 @@ <ImageView fx:id="imvVehicleDetail" fitHeight="34.0" fitWidth="34.0" layoutX="14.0" layoutY="97.0" pickOnBounds="true" preserveRatio="true" /> </children> </AnchorPane> - <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0"> - <content> - <FlowPane fx:id="fpVehicles" hgap="12" prefHeight="410.0" prefWidth="840.0" /> - </content> - <padding> - <Insets left="40.0" right="40.0" top="20.0" /> - </padding> - </ScrollPane> </children> </AnchorPane> <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> diff --git a/src/main/resources/fxml/DetailArchiveOperation.fxml b/src/main/resources/fxml/DetailArchiveOperation.fxml index 616818e..82c23ed 100644 --- a/src/main/resources/fxml/DetailArchiveOperation.fxml +++ b/src/main/resources/fxml/DetailArchiveOperation.fxml @@ -7,10 +7,10 @@ <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.DetailArchiveOperationController"> <children> - <HBox prefHeight="100.0" prefWidth="200.0" spacing="40.0"> + <HBox prefHeight="100.0" prefWidth="200.0" spacing="100.0"> <children> <VBox fx:id="vBoxVehicle" prefHeight="200.0" prefWidth="100.0" /> - <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" /> + <VBox fx:id="vBoxPeople" prefHeight="200.0" prefWidth="100.0" spacing="10.0" /> </children> <padding> <Insets right="10.0" /> |