From f6bff6fb96fbdf1bd7809221576bd6ab11426e5e Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 2 May 2018 16:30:54 +0200
Subject: Initialize values in inputQualification, implement onCancelClicked
---
.../controller/CreateNewEmployeeController.java | 27 +++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
(limited to 'src/main/java')
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
index 5721c28..d7f1a73 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
@@ -7,6 +7,9 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeExceptio
import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
import java.lang.invoke.MethodHandles;
import java.time.LocalDate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javafx.collections.FXCollections;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
@@ -16,6 +19,7 @@ import javafx.scene.control.CheckBox;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.TextField;
+import javafx.stage.Stage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -31,15 +35,32 @@ public class CreateNewEmployeeController {
@FXML private Hyperlink btnCancel;
@FXML private Button btnCreate;
@FXML private TextField inputName;
- @FXML private ChoiceBox inputQualification;
+ @FXML private ChoiceBox<String> inputQualification;
public CreateNewEmployeeController(EmployeeService employeeService) {
this.employeeService = employeeService;
}
+ @FXML
+ public void initialize() {
+ inputQualification.setItems(
+ FXCollections.observableArrayList(
+ Stream.of(
+ EducationLevel.RS,
+ EducationLevel.NFS,
+ EducationLevel.NKV,
+ EducationLevel.NKA,
+ EducationLevel.NKI,
+ EducationLevel.NA)
+ .map(Enum::toString)
+ .collect(Collectors.toList())));
+
+ inputQualification.setValue(EducationLevel.RS.toString());
+ }
+
@FXML
public void onCancelClicked() {
- throw new UnsupportedOperationException();
+ ((Stage)inputQualification.getScene().getWindow()).close();
}
@FXML
@@ -92,6 +113,6 @@ public class CreateNewEmployeeController {
return EducationLevel.RS;
}
return EducationLevel.valueOf(
- inputQualification.getSelectionModel().getSelectedItem().toString());
+ inputQualification.getSelectionModel().getSelectedItem());
}
}
--
cgit v1.2.3-70-g09d2