diff --git a/db/nursingHome.db b/db/nursingHome.db index 7c0c76d..43fecf6 100644 Binary files a/db/nursingHome.db and b/db/nursingHome.db differ diff --git a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java index f1d2349..2fdb0ed 100644 --- a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java +++ b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java @@ -16,6 +16,8 @@ import javafx.scene.control.cell.PropertyValueFactory; import java.sql.SQLException; import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; /** * Controller for all locked treatments. @@ -113,13 +115,12 @@ public class LockedTreatmentController { if (today.isEqual(deleteDate) || today.isAfter(deleteDate)) { try { treatmentDao.delete(selecteditem.getId()); - System.out.println("Wird gelöscht"); } catch (SQLException exception) { exception.printStackTrace(); } } - readAllAndShowInTableView(); } + readAllAndShowInTableView(); } diff --git a/src/main/java/de/hitec/nhplus/treatment/Treatment.java b/src/main/java/de/hitec/nhplus/treatment/Treatment.java index e2646b2..c2ce7ff 100644 --- a/src/main/java/de/hitec/nhplus/treatment/Treatment.java +++ b/src/main/java/de/hitec/nhplus/treatment/Treatment.java @@ -32,7 +32,7 @@ public class Treatment { private final SimpleStringProperty description; private final SimpleStringProperty remarks; private final SimpleBooleanProperty locked; - private int sperrfrist; + private final int sperrfrist = 10; /** * This constructor allows instantiating a {@link Treatment} object, @@ -58,8 +58,6 @@ public class Treatment { this.description = new SimpleStringProperty(description); this.remarks = new SimpleStringProperty(remarks); this.locked = new SimpleBooleanProperty(false); - - sperrfrist = 10; } /**