SZUT/nhplus
5
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 1 Wiki Activity Actions

task/#17 Treatement -> Nurse Relation #36

Merged
SZUT-Dominik merged 4 commits from task/refactor-dao into main 2024-05-15 09:29:52 +00:00
Conversation 0 Commits 4 Files changed 10 +23 -12
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 082c6a7a2f - Show all commits

35
src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
View file

@ -186,32 +186,43 @@ public class AllTreatmentController {
@FXML @FXML
public void handleNewTreatment() { public void handleNewTreatment() {
try { String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem(); Patient patient = searchInPatientList(selectedPatient);
Patient patient = searchInPatientList(selectedPatient);
String selectedNurse = this.comboBoxNurseSelection.getSelectionModel().getSelectedItem(); if(patient == null) {
Nurse nurse = searchInNurseList(selectedNurse);
newTreatmentWindow(patient, nurse);
} catch (NullPointerException exception) {
Alert alert = new Alert(Alert.AlertType.INFORMATION); Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Information"); alert.setTitle("Information");
alert.setHeaderText("Patient für die Behandlung fehlt!"); alert.setHeaderText("Patient für die Behandlung fehlt!");
alert.setContentText("Wählen Sie über die Combobox einen Patienten aus!"); alert.setContentText("Wählen Sie über die Combobox einen Patienten aus!");
alert.showAndWait(); alert.showAndWait();
return;
} }
String selectedNurse = this.comboBoxNurseSelection.getSelectionModel().getSelectedItem();
Nurse nurse = searchInNurseList(selectedNurse);
if(nurse == null) {
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Information");
alert.setHeaderText("Pfleger für die Behandlung fehlt!");
alert.setContentText("Wählen Sie über die Combobox einen Pfleger aus!");
alert.showAndWait();
return;
}
newTreatmentWindow(patient, nurse);
} }
@FXML @FXML
public void handleMouseClick() { public void handleMouseClick() {
tableView.setOnMouseClicked(event -> tableView.setOnMouseClicked(event ->
{ {
if (event.getClickCount() == 2 && (tableView.getSelectionModel().getSelectedItem() != null)) { if (event.getClickCount() != 2 || (tableView.getSelectionModel().getSelectedItem() == null)) {
int index = this.tableView.getSelectionModel().getSelectedIndex(); return;
Treatment treatment = this.treatments.get(index);
treatmentWindow(treatment, treatment.getNurse());
} }
int index = this.tableView.getSelectionModel().getSelectedIndex();
Treatment treatment = this.treatments.get(index);
treatmentWindow(treatment, treatment.getNurse());
}); });
} }