From 415a48b79a61be6c615ee2bd5e8ccf3891f057d1 Mon Sep 17 00:00:00 2001
From: Dorian Nemec <dorian.nemec@octagen.de>
Date: Tue, 21 May 2024 11:20:32 +0200
Subject: [PATCH 1/4] #Bugfix start

---
 db/nursingHome.db                             | Bin 28672 -> 28672 bytes
 .../nhplus/nurse/LockedNurseController.java   |   2 --
 2 files changed, 2 deletions(-)

diff --git a/db/nursingHome.db b/db/nursingHome.db
index 0cdc030c68d5c1da965119ae1d0f20ad97ae6082..402e5b3f0a1bb2e84ddf58fb33aa2042a6a78702 100644
GIT binary patch
delta 187
zcmZp8z}WDBae_4C(}^<9j88WvEa4a9<etUAFTkh5yNNf5=NL~K_h;_I+_N@I3CM7>
zFfcImPPURxP*>;XV&G&{6c-m2<zO;0Ff!3KFx53OG&Hm_GzSqDC8@<FC8?VaO0N-S
zWS^X;FTuz?xm~|rM2~_0HvcyMiTwHezWjRpEPVU;_H7naSi(1XpIw2xEIT`csHh^p
laEL2NdvS@OrKzc|p^>h!p^1Tk;bvd^6ahw#&71uF6aYx<F&F><

delta 187
zcmV;s07U<Q-~oW(0gxL3-H{wa0o}1+qz@Jf3fBM+5Dp{_vJFxU#tdc)^9#cZHnSQK
z918@23JD97IvZdoZDn$LWo{s1Wod07Q*?D`Y-eF^XD%Q|VPa(<c5iMVNn&MkZ)ah%
z!5gd-0S1$9FBky|lZP*V6ea)<+Yh!6kq>VVO%Emy1P;CqzOxY^qz;q5K5!osMQmwv
pVPa);XidYsY;0w6F*!9jEif}JFgG<ZF)*`DKV%RA3A3_KP9W4gI{*Lx

diff --git a/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java b/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
index 0f1d932..e722b3e 100644
--- a/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
+++ b/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
@@ -109,7 +109,6 @@ public class LockedNurseController {
         readAllAndShowInTableView();
 
     }
-
     @FXML
     public void handleMouseClick() {
         Nurse nurse = tableView.getSelectionModel().getSelectedItem();
@@ -137,5 +136,4 @@ public class LockedNurseController {
         }
         readAllAndShowInTableView();
     }
-
 }
-- 
2.45.2


From 37ffa78f44326a2a0a71795133e3615db072c7c9 Mon Sep 17 00:00:00 2001
From: arminribic <aribic@neusta.de>
Date: Tue, 21 May 2024 11:35:07 +0200
Subject: [PATCH 2/4] =?UTF-8?q?UI=20angepasst(sch=C3=B6ner=20gemacht)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/de/hitec/nhplus/main/MainWindowView.fxml     | 2 ++
 src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml | 1 +
 .../resources/de/hitec/nhplus/nurse/LockedNurseView.fxml   | 1 +
 .../resources/de/hitec/nhplus/patient/AllPatientView.fxml  | 1 +
 .../de/hitec/nhplus/treatment/AllTreatmentView.fxml        | 7 ++++---
 .../de/hitec/nhplus/treatment/LockedTreatmentView.fxml     | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml b/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
index fdb8bef..6a81c28 100644
--- a/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
+++ b/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
@@ -7,6 +7,8 @@
         tabClosingPolicy="UNAVAILABLE"
         xmlns="http://javafx.com/javafx/17.0.2-ea"
         xmlns:fx="http://javafx.com/fxml/1"
+        minWidth="1200"
+        minHeight="700"
         fx:controller="de.hitec.nhplus.main.MainWindowController"
 >
     <Tab fx:id="patientTab" text="Patienten">
diff --git a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
index 10b589a..27c9cea 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
@@ -17,6 +17,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
index b7c1ed3..c3b8d96 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
@@ -21,6 +21,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
index 50941c6..4ad6c9e 100644
--- a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
+++ b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
@@ -20,6 +20,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index 4ccbfec..c8169a9 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -21,6 +21,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
@@ -42,17 +43,17 @@
                 />
                 <TableColumn
                         fx:id="columnBegin"
-                        minWidth="140.0"
+                        minWidth="40.0"
                         text="Beginn"
                 />
                 <TableColumn
                         fx:id="columnEnd"
-                        minWidth="140.0"
+                        minWidth="40.0"
                         text="Ende"
                 />
                 <TableColumn
                         fx:id="columnDescription"
-                        minWidth="200.0"
+                        minWidth="50.0"
                         text="Kurzbeschreibung"
                 />
             </columns>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
index 2680436..1e943d5 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
@@ -21,7 +21,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
-                        prefWidth="102.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
-- 
2.45.2


From 0ac8f3eb1bbe03761c78bb5f7efb5de11fa1500a Mon Sep 17 00:00:00 2001
From: arminribic <aribic@neusta.de>
Date: Tue, 21 May 2024 13:16:45 +0200
Subject: [PATCH 3/4] =?UTF-8?q?UI=20der=20AllTreatmentView.fxml=20angepass?=
 =?UTF-8?q?t(sch=C3=B6ner=20gemacht)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nhplus/treatment/AllTreatmentView.fxml     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index c8169a9..31d1d9e 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -27,33 +27,39 @@
                 <TableColumn
                         fx:id="columnPatientName"
                         minWidth="80.0"
+                        prefWidth="150"
                         text="Patient"
                 />
                 <TableColumn
                         fx:id="columnNurseName"
                         minWidth="80.0"
+                        prefWidth="150"
                         text="Pflegekraft"
                 />
                 <TableColumn
                         fx:id="columnDate"
-                        maxWidth="-1.0"
-                        minWidth="140.0"
-                        prefWidth="150.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="90.0"
                         text="Datum"
                 />
                 <TableColumn
                         fx:id="columnBegin"
-                        minWidth="40.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="60"
                         text="Beginn"
                 />
                 <TableColumn
                         fx:id="columnEnd"
-                        minWidth="40.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="60"
                         text="Ende"
                 />
                 <TableColumn
                         fx:id="columnDescription"
-                        minWidth="50.0"
+                        minWidth="80.0"
                         text="Kurzbeschreibung"
                 />
             </columns>
-- 
2.45.2


From bf86f9fc84ef06c7e69890aebc773b87907172e7 Mon Sep 17 00:00:00 2001
From: arminribic <aribic@neusta.de>
Date: Tue, 21 May 2024 13:56:22 +0200
Subject: [PATCH 4/4] Logik des AllTreatmentController angepasst

---
 .../de/hitec/nhplus/treatment/AllTreatmentController.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
index 055c4be..4d97ff0 100644
--- a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
@@ -322,6 +322,13 @@ public class AllTreatmentController {
         }catch (SQLException exception){
             exception.printStackTrace();
         }
+        if (selectedItem.calculateDeleteDate().isBefore(LocalDate.now())){
+            try {
+                dao.delete(selectedItem.getId());
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
         readAllAndShowInTableView();
     }
 
-- 
2.45.2