diff options
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java | 25 | ||||
| -rw-r--r-- | src/main/resources/fxml/employeeListItem.fxml | 5 |
2 files changed, 11 insertions, 19 deletions
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 ff5bf59..6fd0824 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 @@ -29,20 +29,16 @@ public class EmployeeListItemController extends CustomListItemController { private Employee employee; - private Consumer<Employee> consumerEditEmployeeClicked; - private Consumer<EmployeeListItemController> consumerEmployeeClicked; - - @FXML - private void onEditEmployeeClicked() { - if (consumerEditEmployeeClicked != null) { - consumerEditEmployeeClicked.accept(employee); - } - } + private Consumer<Employee> consumerEmployeeClicked; + private Consumer<EmployeeListItemController> consumerEmployeeListItemClicked; @FXML private void onEmployeeClicked() { if (consumerEmployeeClicked != null) { - consumerEmployeeClicked.accept(this); + consumerEmployeeClicked.accept(employee); + } + if (consumerEmployeeListItemClicked != null) { + consumerEmployeeListItemClicked.accept(this); } } @@ -90,11 +86,12 @@ public class EmployeeListItemController extends CustomListItemController { return employee; } - public void setConsumerEditEmployeeClicked(Consumer<Employee> consumerEditEmployeeClicked) { - this.consumerEditEmployeeClicked = consumerEditEmployeeClicked; + public void setConsumerEmployeeClicked(Consumer<Employee> consumerEmployeeClicked) { + this.consumerEmployeeClicked = consumerEmployeeClicked; } - public void setConsumerEmployeeClicked(Consumer<EmployeeListItemController> consumerEmployeeClicked) { - this.consumerEmployeeClicked = consumerEmployeeClicked; + public void setConsumerListItemEmployeeClicked( + Consumer<EmployeeListItemController> consumerEmployeeListItemClicked) { + this.consumerEmployeeListItemClicked = consumerEmployeeListItemClicked; } } diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml index 6e95c0c..8e446cb 100644 --- a/src/main/resources/fxml/employeeListItem.fxml +++ b/src/main/resources/fxml/employeeListItem.fxml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.scene.control.Button?> <?import javafx.scene.control.Label?> <?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.HBox?> <?import javafx.scene.text.Font?> - <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="96.0" prefWidth="360.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" @@ -19,9 +17,6 @@ <Font name="System Bold" size="18.0"/> </font> </Label> - <Button fx:id="btnEdit" layoutX="298.0" layoutY="5.0" mnemonicParsing="false" - onAction="#onEditEmployeeClicked" - text="bearbeiten" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0"/> <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0"> <children> |