diff options
Diffstat (limited to 'src/main')
3 files changed, 12 insertions, 34 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 d6b6de8..107ed2f 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 @@ -66,15 +66,6 @@ public class ArchiveOperationController { alert.showAndWait(); } setFlowPane(); - - /*for (Operation operation : list) { - Button b = new Button(); - b.setPrefHeight(200); - b.setPrefWidth(750 / 2); - b.setText(operation.opCode()); - b.setOnAction(event -> buttonClicked(b)); - archiveOperationFlowPane.getChildren().add(b); - }*/ } private void setFlowPane() { @@ -109,23 +100,6 @@ public class ArchiveOperationController { private Operation detailOperation; - /*private void buttonClicked(Button button) { - int size = archiveOperationFlowPane.getChildren().size(); - int index = 0; - for (int i = 0; i < size; i++) { - if (archiveOperationFlowPane.getChildren().get(i) == button) { - index = i; - break; - } - } - detailOperation = list.get(index); - backApMain.setVisible(false); - backApDetails.setVisible(true); - //apHeader.setVisible(false); - setOperation(); - setDetailsVisible(true); - }*/ - private void setOperation() { lblCodeHeader.setText(detailOperation.opCode()); String date = "am "; @@ -173,7 +147,6 @@ public class ArchiveOperationController { public void backClicked() { fpVehicles.getChildren().clear(); setDetailsVisible(false); - // apHeader.setVisible(true); backApDetails.setVisible(false); apMainDetails.setVisible(true); backApMain.setVisible(true); diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index 41c6a03..90cbe74 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -13,11 +13,11 @@ <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="202.0" prefHeight="449.0" prefWidth="900.0" AnchorPane.leftAnchor="50.0"> + <ScrollPane hbarPolicy="NEVER" layoutY="202.0" prefHeight="449.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" 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 top="20.0" /> + <Insets left="40.0" top="20.0" /> </padding></FlowPane> </content> </ScrollPane> @@ -74,14 +74,19 @@ </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"> <children> - <Hyperlink layoutX="29.0" layoutY="23.0" onAction="#backToMain" text="Zurück" textFill="WHITE"> + <Hyperlink layoutX="871.0" layoutY="35.0" onAction="#backToMain" text="Zurück" textFill="WHITE"> <font> - <Font name="System Bold" size="16.0" /> + <Font name="System Bold" size="20.0" /> </font> </Hyperlink> + <Label layoutX="62.0" layoutY="40.0" prefHeight="30.0" prefWidth="100.0" text="Archiv" textFill="WHITE"> + <font> + <Font name="System Bold" size="20.0" /> + </font> + </Label> </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" styleClass="bg-white, shadowed"> <children> <GridPane layoutY="11.0" prefHeight="99.0" prefWidth="451.0"> <columnConstraints> diff --git a/src/main/resources/fxml/OperationInArchive.fxml b/src/main/resources/fxml/OperationInArchive.fxml index f079f42..9da1d9b 100644 --- a/src/main/resources/fxml/OperationInArchive.fxml +++ b/src/main/resources/fxml/OperationInArchive.fxml @@ -32,7 +32,7 @@ <Font size="17.0" /> </font> </Text> - <HBox prefHeight="23.0" prefWidth="139.0" GridPane.rowIndex="2"> + <HBox prefHeight="23.0" prefWidth="139.0" spacing="7.0" GridPane.rowIndex="2"> <children> <ImageView fitHeight="23.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true"> <image> |