From 5ce2c8943e7c47be60659662bdf4f73e8b606206 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Wed, 6 Jun 2018 22:05:38 +0200 Subject: Rename ListEmployeesController to ManageEmployeesController [#25963] because later, a new Controller EmployeeListController will be created, which just lists employees and the current ListEmployeesController actually not only lists employees but also allows them to edit, create => manage --- src/main/resources/fxml/manageEmployees.fxml | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/main/resources/fxml/manageEmployees.fxml (limited to 'src/main/resources/fxml/manageEmployees.fxml') diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml new file mode 100644 index 0000000..e6efb89 --- /dev/null +++ b/src/main/resources/fxml/manageEmployees.fxml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From d721ab5480c025c0a998d23ffe462f430fd40bf6 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Wed, 6 Jun 2018 22:10:22 +0200 Subject: Refactor ManageEmployeesCtrl to make use of EmployeeListCtrl [#25963] --- .../controller/ManageEmployeesController.java | 45 ++++++++-------------- src/main/resources/fxml/manageEmployees.fxml | 2 +- 2 files changed, 17 insertions(+), 30 deletions(-) (limited to 'src/main/resources/fxml/manageEmployees.fxml') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java index a126cc7..655c7da 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ManageEmployeesController.java @@ -18,9 +18,8 @@ public class ManageEmployeesController { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @FXML private AnchorPane listEmployeesAP; - @FXML private AnchorPane containerHeader; - @FXML private FlowPane flowPaneEmployeeList; + @FXML private EmployeeListController employeeListController; private final EmployeeService employeeService; private final SpringFXMLLoader fxmlLoader; @@ -87,39 +86,27 @@ public class ManageEmployeesController { } private void updateEmployeeList(String searchString) { + try { - flowPaneEmployeeList.getChildren().clear(); - employeeService - .list() - .stream() - .filter( - employee -> - searchString.trim().isEmpty() - || employee.name() - .toLowerCase() - .contains(searchString.toLowerCase())) - .forEach(this::addEmployeeToFlowPane); + employeeListController.setData( + employeeService + .list() + .stream() + .filter( + employee -> + searchString.trim().isEmpty() + || employee.name() + .toLowerCase() + .contains(searchString.toLowerCase())) + .collect(Collectors.toList()), + this::openEditEmployee, + null); + } catch (ServiceException e) { LOG.error("Could not fetch employee list: {}", e); } } - private void addEmployeeToFlowPane(Employee employee) { - Insets listItemMargins = new Insets(0, 5, 10, 5); - - try { - EmployeeListItemController controller = - EmployeeListItemController.createEmployeeListItemController( - fxmlLoader, employee); - Node rootElement = controller.getRootElement(); - flowPaneEmployeeList.getChildren().add(rootElement); - FlowPane.setMargin(rootElement, listItemMargins); - controller.setConsumerEditEmployeeClicked(this::openEditEmployee); - } catch (IOException e) { - LOG.error("Could not create a new EmployeeListItem: {}", e); - } - } - public void setVisible(boolean b) { listEmployeesAP.setVisible(b); } diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml index e6efb89..c007c88 100644 --- a/src/main/resources/fxml/manageEmployees.fxml +++ b/src/main/resources/fxml/manageEmployees.fxml @@ -31,7 +31,7 @@ - + -- cgit v1.2.3-70-g09d2 From 1ec6ae678c834592b5d731171a936161147c0707 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Fri, 15 Jun 2018 11:34:14 +0200 Subject: Adjust employee list item to be more compact, adjust sizes [#28618] --- src/main/resources/fxml/employeeList.fxml | 5 +- src/main/resources/fxml/employeeListItem.fxml | 55 ++++++++++++---------- .../resources/fxml/filterEmployeesControl.fxml | 2 +- src/main/resources/fxml/manageEmployees.fxml | 42 ++++++++++------- 4 files changed, 60 insertions(+), 44 deletions(-) (limited to 'src/main/resources/fxml/manageEmployees.fxml') diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml index 52c502a..4131125 100644 --- a/src/main/resources/fxml/employeeList.fxml +++ b/src/main/resources/fxml/employeeList.fxml @@ -5,5 +5,8 @@ xmlns:fx="http://javafx.com/fxml" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListController" fx:id="flowPaneEmployeeList" - prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;"> + stylesheets="@/styles/main.css" + prefWidth="${flowPaneEmployeeList.parent.width}" + prefHeight="${flowPaneEmployeeList.parent.height}" + style="-fx-background-color: #EFEBE8;"> diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml index eb5c95c..3c020eb 100644 --- a/src/main/resources/fxml/employeeListItem.fxml +++ b/src/main/resources/fxml/employeeListItem.fxml @@ -4,50 +4,53 @@ - + + fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListItemController"> -