diff options
Diffstat (limited to 'src')
6 files changed, 30 insertions, 14 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 ab4982b..4f6f55f 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 @@ -131,6 +131,11 @@ public class ArchiveOperationController { setDetailsVisible(false); } + public void backToMain() { + this.setVisible(false); + createOperationController.setVisible(true); + } + public void setVisible(boolean b) { archiveOperationAP.setVisible(b); } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java index 74e699b..7e964cb 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java @@ -213,8 +213,8 @@ public class CreateCarController { createCarAP.setVisible(b); } - public void cancel() { + public void backToMain() { this.setVisible(false); - createOperationController.setVisible(false); + createOperationController.setVisible(true); } } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java index 4637a80..02a3e4c 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java @@ -126,7 +126,7 @@ public class ListEmployeesController { listEmployeesAP.setVisible(b); } - public void close() { + public void backToMain() { this.setVisible(false); createOperationController.setVisible(true); } diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index 7eace12..2f55b24 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -9,7 +9,7 @@ <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"> <children> - <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0"> + <ScrollPane layoutY="100.0" prefHeight="550.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0"> <content> <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" /> </content> @@ -65,5 +65,14 @@ </ScrollPane> </children> </AnchorPane> + <AnchorPane prefHeight="100.0" prefWidth="800.0" style="-fx-background-color: BROWN;"> + <children> + <Hyperlink layoutX="713.0" layoutY="16.0" onAction="#backToMain" text="Zurück" textFill="WHITE"> + <font> + <Font name="System Bold" size="16.0" /> + </font> + </Hyperlink> + </children> + </AnchorPane> </children> </AnchorPane> diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml index 99cd7b0..a33c26e 100644 --- a/src/main/resources/fxml/createCar.fxml +++ b/src/main/resources/fxml/createCar.fxml @@ -14,5 +14,6 @@ <Button fx:id="btn_create" layoutX="500.0" layoutY="53.0" mnemonicParsing="false" onAction="#createCar" text="Erstellen" /> <CheckBox fx:id="cbx_NEF" layoutX="14.0" layoutY="57.0" mnemonicParsing="false" text="NEF - Halterung" /> <FlowPane fx:id="fp_vehicleList" layoutX="14.0" layoutY="94.0" prefHeight="298.0" prefWidth="571.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" /> + <Button layoutX="398.0" layoutY="14.0" mnemonicParsing="false" onAction="#backToMain" prefHeight="26.0" prefWidth="80.0" text="Zurück" /> </children> </AnchorPane> diff --git a/src/main/resources/fxml/listEmployees.fxml b/src/main/resources/fxml/listEmployees.fxml index 6c4593b..7f9e638 100644 --- a/src/main/resources/fxml/listEmployees.fxml +++ b/src/main/resources/fxml/listEmployees.fxml @@ -1,6 +1,7 @@ <?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?> <?import javafx.scene.layout.AnchorPane?> @@ -8,31 +9,31 @@ <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Font?> -<AnchorPane fx:id="listEmployeesAP" visible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" - prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" - 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.ListEmployeesController"> +<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" 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.ListEmployeesController"> <children> <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;"> <children> <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE"> <font> - <Font name="Calibri Bold" size="22.0"/> + <Font name="Calibri Bold" size="22.0" /> </font> </Label> + <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE"> + <font> + <Font name="System Bold" size="16.0" /> + </font> + </Hyperlink> </children> </AnchorPane> <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0"> <children> - <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" - style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);"/> + <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" /> <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER"> <VBox.margin> - <Insets top="20.0"/> + <Insets top="20.0" /> </VBox.margin> <content> - <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" - style="-fx-background-color: #EFEBE8;"/> + <FlowPane fx:id="flowPaneEmployeeList" prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;" /> </content> </ScrollPane> </children> |