diff options
2 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java index 6d37379..19aa177 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java @@ -36,20 +36,21 @@ public class EmployeeListController { public void setData( List<Employee> employeeList, - Consumer<Employee> onEditEmployeeClicked, - Consumer<EmployeeListItemController> onEmployeeClicked) { + Consumer<Employee> onEmployeeClicked, + Consumer<EmployeeListItemController> onEmployeeListItemClicked) { flowPaneEmployeeList.getChildren().clear(); employeeListItemControllers.clear(); employeeList.forEach( employee -> - addEmployeeToFlowPane(employee, onEditEmployeeClicked, onEmployeeClicked)); + addEmployeeToFlowPane( + employee, onEmployeeClicked, onEmployeeListItemClicked)); } private void addEmployeeToFlowPane( Employee employee, - Consumer<Employee> onEditEmployeeClicked, - Consumer<EmployeeListItemController> onEmployeeClicked) { + Consumer<Employee> onEmployeeClicked, + Consumer<EmployeeListItemController> onEmployeeListItemClicked) { Insets listItemMargins = new Insets(0, 5, 10, 5); try { @@ -60,13 +61,13 @@ public class EmployeeListController { flowPaneEmployeeList.getChildren().add(rootElement); employeeListItemControllers.add(controller); FlowPane.setMargin(rootElement, listItemMargins); - if (onEditEmployeeClicked != null) { - controller.setConsumerEditEmployeeClicked(onEditEmployeeClicked); - } if (onEmployeeClicked != null) { - controller.setConsumerEmployeeClicked( + controller.setConsumerEmployeeClicked(onEmployeeClicked); + } + if (onEmployeeListItemClicked != null) { + controller.setConsumerEmployeeListItemClicked( employeeListItemController -> { - onEmployeeClicked.accept(employeeListItemController); + onEmployeeListItemClicked.accept(employeeListItemController); if (this.onEmployeeClicked != null) { this.onEmployeeClicked.accept( employeeListItemController.getEmployee()); diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java index 6fd0824..cf7644d 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java @@ -90,7 +90,7 @@ public class EmployeeListItemController extends CustomListItemController { this.consumerEmployeeClicked = consumerEmployeeClicked; } - public void setConsumerListItemEmployeeClicked( + public void setConsumerEmployeeListItemClicked( Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) { this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked; } |