diff options
Diffstat (limited to 'src')
4 files changed, 32 insertions, 22 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 9c372fe..4377dcb 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 @@ -27,6 +27,7 @@ import org.springframework.stereotype.Controller; @Controller public class ArchiveOperationController { + public AnchorPane apMainDetails; @FXML private AnchorPane backApMain; @FXML private AnchorPane backApDetails; @FXML private AnchorPane archiveOperationAP; @@ -87,6 +88,7 @@ public class ArchiveOperationController { event -> { detailOperation = operation; backApMain.setVisible(false); + apMainDetails.setVisible(false); backApDetails.setVisible(true); setOperation(); setDetailsVisible(true); @@ -157,6 +159,7 @@ public class ArchiveOperationController { } public void setListVisible(boolean b) { + apMainDetails.setVisible(b); archiveOperationFlowPane.setVisible(b); } @@ -169,6 +172,7 @@ public class ArchiveOperationController { setDetailsVisible(false); // apHeader.setVisible(true); backApDetails.setVisible(false); + apMainDetails.setVisible(true); backApMain.setVisible(true); } @@ -180,5 +184,6 @@ public class ArchiveOperationController { public 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 f185545..b5daa5b 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<?import javafx.geometry.Insets?> <?import javafx.scene.control.Hyperlink?> <?import javafx.scene.control.Label?> <?import javafx.scene.control.ScrollPane?> @@ -7,16 +8,19 @@ <?import javafx.scene.layout.FlowPane?> <?import javafx.scene.text.Font?> -<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" 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: 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"> <children> - <ScrollPane layoutY="169.0" prefHeight="481.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0"> + <ScrollPane layoutY="202.0" prefHeight="449.0" prefWidth="900.0" AnchorPane.leftAnchor="50.0"> <content> - <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" hgap="12" vgap="12"/> + <FlowPane fx:id="archiveOperationFlowPane" hgap="12" prefHeight="598.0" prefWidth="900.0" vgap="12"> + <padding> + <Insets top="20.0" /> + </padding></FlowPane> </content> </ScrollPane> - <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> + <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> - <AnchorPane fx:id="backApDetails" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);"> + <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"> <font> @@ -28,13 +32,13 @@ <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"> + <Hyperlink fx:id="hypBack" 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> </Hyperlink> </children></AnchorPane> - <AnchorPane layoutX="82.0" layoutY="60.0" prefHeight="150.0" prefWidth="636.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="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);"> <children> <Label fx:id="lblOpCode" layoutX="25.0" layoutY="22.0" prefHeight="26.0" prefWidth="116.0" text="Label"> <font> @@ -51,21 +55,21 @@ <Font size="15.0" /> </font> </Label> - <Label fx:id="lblDate" alignment="CENTER_RIGHT" layoutX="482.0" layoutY="22.0" prefHeight="27.0" prefWidth="140.0" text="Label"> + <Label fx:id="lblDate" alignment="CENTER_RIGHT" layoutX="482.0" layoutY="22.0" prefHeight="27.0" prefWidth="140.0" text="Label" AnchorPane.rightAnchor="50.0"> <font> <Font name="System Bold" size="18.0" /> </font> </Label> </children> </AnchorPane> - <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="640.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0"> + <ScrollPane fitToWidth="true" prefHeight="410.0" prefWidth="840.0" AnchorPane.leftAnchor="82.0" AnchorPane.topAnchor="225.0"> <content> - <FlowPane fx:id="fpVehicles" prefHeight="410.0" prefWidth="640.0" /> + <FlowPane fx:id="fpVehicles" prefHeight="410.0" prefWidth="840.0" /> </content> </ScrollPane> </children> </AnchorPane> - <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> + <AnchorPane fx:id="backApMain" prefHeight="170.0" prefWidth="1000.0" style="-fx-background-color: rgba(191,144,0,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> <children> <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE"> <font> @@ -74,5 +78,6 @@ </Hyperlink> </children> </AnchorPane> + <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false" /> </children> </AnchorPane> diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index ba27f53..79c0a51 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -87,5 +87,5 @@ <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="listEmployees" source="/fxml/listEmployees.fxml"/> <fx:include AnchorPane.leftAnchor="300" AnchorPane.topAnchor="135.4" source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/> <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/> - <fx:include AnchorPane.leftAnchor="200.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/> + <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/> </AnchorPane> diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml index 1f04fc0..f079f42 100644 --- a/src/main/resources/fxml/OperationInArchive.fxml +++ b/src/main/resources/fxml/OperationInArchive.fxml @@ -10,10 +10,10 @@ <?import javafx.scene.text.Font?> <?import javafx.scene.text.Text?> -<GridPane hgap="12.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController"> +<GridPane hgap="12.0" prefHeight="106.0" prefWidth="374.0" styleClass="bg-white, shadowed" vgap="12" 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.OperationInArchiveController"> <columnConstraints> - <ColumnConstraints /> - <ColumnConstraints /> + <ColumnConstraints maxWidth="249.6000518798828" minWidth="205.60003662109375" prefWidth="249.6000518798828" /> + <ColumnConstraints maxWidth="182.39996337890625" minWidth="138.3999481201172" prefWidth="138.3999481201172" /> <ColumnConstraints /> <ColumnConstraints /> <ColumnConstraints /> @@ -24,15 +24,15 @@ <RowConstraints /> </rowConstraints> <padding> - <Insets bottom="6.0" left="12.0" right="12.0" top="6.0" /> + <Insets bottom="6.0" left="12.0" top="6.0" /> </padding> <children> <Text fx:id="txtAddress" text="Text" GridPane.rowIndex="1"> <font> - <Font size="20.0" /> + <Font size="17.0" /> </font> </Text> - <HBox prefHeight="0.0" prefWidth="200.0" GridPane.rowIndex="2"> + <HBox prefHeight="23.0" prefWidth="139.0" GridPane.rowIndex="2"> <children> <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true"> <image> @@ -41,19 +41,19 @@ </ImageView> <Text fx:id="txtVehicles" strokeType="OUTSIDE" strokeWidth="0.0" text="Text"> <font> - <Font size="20.0" /> + <Font size="17.0" /> </font> </Text> </children> </HBox> - <Text fx:id="txtDate" nodeOrientation="RIGHT_TO_LEFT" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" wrappingWidth="187.73674726486206" GridPane.columnIndex="1"> + <Text fx:id="txtDate" nodeOrientation="RIGHT_TO_LEFT" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" wrappingWidth="132.53673648834229" GridPane.columnIndex="1"> <font> - <Font name="System Bold" size="20.0" /> + <Font name="System Bold" size="17.0" /> </font> </Text> <Text fx:id="txtOpCode" strokeType="OUTSIDE" strokeWidth="0.0" text="Text"> <font> - <Font name="System Bold" size="20.0" /> + <Font name="System Bold" size="17.0" /> </font> </Text> </children> |