From 8219e24670fe9882cecb9a8934ef2cb91f75ba54 Mon Sep 17 00:00:00 2001 From: Dorian Nemec Date: Fri, 17 May 2024 12:51:02 +0200 Subject: [PATCH] =?UTF-8?q?#7=20Javadoc=20und=20calculateDeleteDate=20erg?= =?UTF-8?q?=C3=A4nzt=20#1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/de/hitec/nhplus/treatment/Treatment.java | 10 +++++++++- .../hitec/nhplus/treatment/database/TreatmentDao.java | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/hitec/nhplus/treatment/Treatment.java b/src/main/java/de/hitec/nhplus/treatment/Treatment.java index a32864f..e2646b2 100644 --- a/src/main/java/de/hitec/nhplus/treatment/Treatment.java +++ b/src/main/java/de/hitec/nhplus/treatment/Treatment.java @@ -19,6 +19,8 @@ import java.util.StringJoiner; * * @author Bernd Heidemann * @author Dominik Säume + * @author Armin Ribic + * @author Dorian Nemec */ public class Treatment { private SimpleIntegerProperty id; @@ -30,6 +32,7 @@ public class Treatment { private final SimpleStringProperty description; private final SimpleStringProperty remarks; private final SimpleBooleanProperty locked; + private int sperrfrist; /** * This constructor allows instantiating a {@link Treatment} object, @@ -55,6 +58,8 @@ public class Treatment { this.description = new SimpleStringProperty(description); this.remarks = new SimpleStringProperty(remarks); this.locked = new SimpleBooleanProperty(false); + + sperrfrist = 10; } /** @@ -188,7 +193,10 @@ public class Treatment { .toString(); } + /** + * Calculates delete date of treatment. + */ public LocalDate calculateDeleteDate() { - return DateConverter.convertStringToLocalDate(getDate()).plusYears(10); + return DateConverter.convertStringToLocalDate(getDate()).plusYears(sperrfrist); } } diff --git a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java index 20c63f0..a02a485 100644 --- a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java +++ b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java @@ -21,6 +21,8 @@ import java.util.List; * * @author Bernd Heidemannn * @author Dominik Säume + * @author Armin Ribic + * @author Dorian Nemec */ public class TreatmentDao extends DaoImp { @@ -147,10 +149,11 @@ public class TreatmentDao extends DaoImp { return statement; } + /** + * Returns all locked treatments. + */ public List readAllLocked() throws SQLException { final String SQL = "SELECT * FROM treatment WHERE isLocked = true"; return getListFromResultSet(this.connection.prepareStatement(SQL).executeQuery()); } - - }