diff --git a/db/nursingHome.db b/db/nursingHome.db index 0319281..7c0c76d 100644 Binary files a/db/nursingHome.db and b/db/nursingHome.db differ diff --git a/src/main/java/de/hitec/nhplus/main/MainWindowController.java b/src/main/java/de/hitec/nhplus/main/MainWindowController.java index 4472722..5b7b4e4 100644 --- a/src/main/java/de/hitec/nhplus/main/MainWindowController.java +++ b/src/main/java/de/hitec/nhplus/main/MainWindowController.java @@ -142,7 +142,7 @@ public class MainWindowController { private void loadLockedTreatmentPage() { try { BorderPane treatmentsPane = FXMLLoader.load( - Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/LockedTreatmentView.fxml")) + Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/LockedTreatmentView.fxml")) ); lockedTreatmentPage.getChildren().setAll(treatmentsPane); AnchorPane.setTopAnchor(treatmentsPane, 0d); diff --git a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java index f458a79..f1d2349 100644 --- a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java +++ b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java @@ -1,11 +1,8 @@ package de.hitec.nhplus.treatment; import de.hitec.nhplus.datastorage.DaoFactory; -import de.hitec.nhplus.nurse.LockedNurseController; import de.hitec.nhplus.nurse.Nurse; -import de.hitec.nhplus.nurse.database.NurseDao; import de.hitec.nhplus.patient.Patient; -import de.hitec.nhplus.patient.database.PatientDao; import de.hitec.nhplus.treatment.database.TreatmentDao; import de.hitec.nhplus.utils.DateConverter; import javafx.beans.property.SimpleStringProperty; @@ -66,7 +63,8 @@ public class LockedTreatmentController { return new SimpleStringProperty(nurse.getSurName() + ", " + nurse.getFirstName()); } ); - this.columnDeleteDate.setCellValueFactory(cellData -> new SimpleStringProperty(DateConverter.convertLocalDateToString(cellData.getValue().calculateDeleteDate()))); + this.columnDeleteDate.setCellValueFactory(cellData -> new SimpleStringProperty( + DateConverter.convertLocalDateToString(cellData.getValue().calculateDeleteDate()))); this.tableView.setItems(this.treatments);