diff options
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java | 4 | ||||
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java (renamed from src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ListEmployeesController.java) | 8 | ||||
| -rw-r--r-- | src/main/resources/fxml/CreateOperationController.fxml | 2 | ||||
| -rw-r--r-- | src/main/resources/fxml/manageEmployees.fxml (renamed from src/main/resources/fxml/listEmployees.fxml) | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java index d2657b6..57d9611 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java @@ -58,7 +58,7 @@ public class CreateOperationController { @FXML private Label lblChosenVehicles; @FXML private AnchorPane apInvisible; @FXML private OperationDetailsController operationDetailsController; - @FXML private ListEmployeesController listEmployeesController; + @FXML private ManageEmployeesController manageEmployeesController; @FXML private CreateCarController createCarController; @FXML private RegistrationWindowController registrationWindowController; @FXML private ArchiveOperationController archiveOperationController; @@ -367,7 +367,7 @@ public class CreateOperationController { private void openCreateNewEmployeeWindow() { this.setVisible(false); - listEmployeesController.setVisible(true); + manageEmployeesController.setVisible(true); } private void openCreateCarWindow() { 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/ManageEmployeesController.java index 02a3e4c..a126cc7 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/ManageEmployeesController.java @@ -6,17 +6,15 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException; import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader; import java.io.IOException; import java.lang.invoke.MethodHandles; +import java.util.stream.Collectors; import javafx.fxml.FXML; -import javafx.geometry.Insets; -import javafx.scene.Node; import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.FlowPane; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @Controller -public class ListEmployeesController { +public class ManageEmployeesController { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @FXML private AnchorPane listEmployeesAP; @@ -29,7 +27,7 @@ public class ListEmployeesController { private final CreateOperationController createOperationController; - public ListEmployeesController( + public ManageEmployeesController( EmployeeService employeeService, SpringFXMLLoader fxmlLoader, CreateOperationController createOperationController) { diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 79c0a51..d22dc45 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -84,7 +84,7 @@ style="-fx-background-color: rgba(0,0,0,0.7);" visible="false"/> <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/> - <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="listEmployees" source="/fxml/listEmployees.fxml"/> + <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees" source="/fxml/manageEmployees.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="100.0" source="/fxml/ArchiveOperation.fxml" fx:id="archiveOperation"/> diff --git a/src/main/resources/fxml/listEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml index 7f9e638..e6efb89 100644 --- a/src/main/resources/fxml/listEmployees.fxml +++ b/src/main/resources/fxml/manageEmployees.fxml @@ -5,11 +5,9 @@ <?import javafx.scene.control.Label?> <?import javafx.scene.control.ScrollPane?> <?import javafx.scene.layout.AnchorPane?> -<?import javafx.scene.layout.FlowPane?> <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Font?> - -<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"> +<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.ManageEmployeesController"> <children> <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;"> <children> |