diff options
| author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-31 17:37:06 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-06-02 00:14:15 +0200 |
| commit | 6be4aefaf0618e14df1028b5610c2b41a7800403 (patch) | |
| tree | 763201b9bcfef689a2ff2fdce6680bdf7dc0b3b4 /src/main | |
| parent | cd1d4f95b1f7b7aeefd20d0b545d6856ff0b9b70 (diff) | |
| download | sepm-groupproject-6be4aefaf0618e14df1028b5610c2b41a7800403.tar.gz sepm-groupproject-6be4aefaf0618e14df1028b5610c2b41a7800403.tar.xz sepm-groupproject-6be4aefaf0618e14df1028b5610c2b41a7800403.zip | |
Added pane with information to main archive window [#27299]
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java | 5 | ||||
| -rw-r--r-- | src/main/resources/fxml/ArchiveOperation.fxml | 40 |
2 files changed, 42 insertions, 3 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 4377dcb..d6b6de8 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,7 +27,10 @@ import org.springframework.stereotype.Controller; @Controller public class ArchiveOperationController { - public AnchorPane apMainDetails; + @FXML private AnchorPane apMainDetails; + @FXML private Label lblOperations; + @FXML private Label lblClosed; + @FXML private Label lblCancelled; @FXML private AnchorPane backApMain; @FXML private AnchorPane backApDetails; @FXML private AnchorPane archiveOperationAP; diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index b5daa5b..41c6a03 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -5,7 +5,10 @@ <?import javafx.scene.control.Label?> <?import javafx.scene.control.ScrollPane?> <?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.ColumnConstraints?> <?import javafx.scene.layout.FlowPane?> +<?import javafx.scene.layout.GridPane?> +<?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"> @@ -69,7 +72,7 @@ </ScrollPane> </children> </AnchorPane> - <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"> + <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"> <children> <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE"> <font> @@ -78,6 +81,39 @@ </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" /> + <AnchorPane fx:id="apMainDetails" layoutX="50.0" layoutY="85.0" prefHeight="118.0" prefWidth="900.0" style="-fx-background-color: WHITE;" visible="false"> + <children> + <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + </rowConstraints> + <children> + <Label fx:id="lblOperations" text="Einsätze:"> + <font> + <Font name="System Bold" size="20.0" /> + </font> + </Label> + <Label fx:id="lblClosed" text="abgeschlossen:" GridPane.rowIndex="1"> + <font> + <Font size="15.0" /> + </font> + </Label> + <Label fx:id="lblCancelled" text="storniert:" GridPane.rowIndex="2"> + <font> + <Font size="15.0" /> + </font> + </Label> + </children> + <padding> + <Insets left="20.0" /> + </padding> + </GridPane> + </children> + </AnchorPane> </children> </AnchorPane> |