diff options
| author | Martin Weick <e1627760@student.tuwien.ac.at> | 2018-05-17 15:03:58 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-22 15:02:27 +0200 |
| commit | 7a2ab0924997cac6e6cf3abab9c6cc5cc508d74b (patch) | |
| tree | 37bac602c9fcf893b9defa7aeb03d01e05aa1645 /src/main | |
| parent | e978119c2ea7624d05b80080a94b3ba1fcc7f040 (diff) | |
| download | sepm-groupproject-7a2ab0924997cac6e6cf3abab9c6cc5cc508d74b.tar.gz sepm-groupproject-7a2ab0924997cac6e6cf3abab9c6cc5cc508d74b.tar.xz sepm-groupproject-7a2ab0924997cac6e6cf3abab9c6cc5cc508d74b.zip | |
Implement cancel Button in CreateCarController #25948
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java | 16 | ||||
| -rw-r--r-- | src/main/resources/fxml/createCar.fxml | 2 |
2 files changed, 11 insertions, 7 deletions
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 628f680..7bda75c 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 @@ -23,7 +23,6 @@ import javafx.scene.control.Button; import javafx.scene.control.ButtonType; import javafx.scene.control.CheckBox; import javafx.scene.control.ChoiceBox; -import javafx.scene.control.Label; import javafx.scene.layout.FlowPane; import javafx.stage.Stage; import org.slf4j.Logger; @@ -43,7 +42,7 @@ public class CreateCarController { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private final VehicleService vehicleService; private boolean update = false; - private long vid=-1; + private long vid = -1; public CreateCarController(VehicleService vehicleService) { this.vehicleService = vehicleService; @@ -83,7 +82,6 @@ public class CreateCarController { @FXML public void createCar(ActionEvent actionEvent) { - if (!update) { Vehicle vehicle = Vehicle.builder() @@ -175,19 +173,25 @@ public class CreateCarController { fp_vehicleList.setVisible(true); } - private void setToStart(){ + private void setToStart() { btn_create.setText("Erstellen"); cbx_NEF.setSelected(false); cmb_typ.setValue(VehicleType.BKTW.name()); cmb_Ctyp.setValue(ConstructionType.NORMAL.name()); - update=false; + update = false; } + private void updateVehicle(Vehicle vehicle) { cmb_Ctyp.setValue(vehicle.constructionType().name()); cmb_typ.setValue(vehicle.type().name()); cbx_NEF.setSelected(vehicle.hasNef()); btn_create.setText("Speichern"); - vid=vehicle.id(); + vid = vehicle.id(); update = true; } + + @FXML + public void cancelAction(ActionEvent actionEvent) { + setToStart(); + } } diff --git a/src/main/resources/fxml/createCar.fxml b/src/main/resources/fxml/createCar.fxml index 83acb7c..cefac82 100644 --- a/src/main/resources/fxml/createCar.fxml +++ b/src/main/resources/fxml/createCar.fxml @@ -10,7 +10,7 @@ <children> <ChoiceBox fx:id="cmb_Ctyp" layoutX="14.0" layoutY="14.0" prefWidth="150.0" /> <ChoiceBox fx:id="cmb_typ" layoutX="191.0" layoutY="14.0" prefWidth="150.0" /> - <Button fx:id="btn_cancel" layoutX="500.0" layoutY="14.0" mnemonicParsing="false" text="abbrechen" /> + <Button fx:id="btn_cancel" layoutX="500.0" layoutY="14.0" mnemonicParsing="false" text="abbrechen" onAction="#cancelAction"/> <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" /> |