From 9ac68941e9c14fda7b8be2c0f2c5731db6c17a5c Mon Sep 17 00:00:00 2001
From: Dorian Nemec <dorian.nemec@octagen.de>
Date: Fri, 17 May 2024 08:53:58 +0200
Subject: [PATCH] #7 Visible UI for locked treatments #2 all visible UIs

---
 db/nursingHome.db                             | Bin 28672 -> 28672 bytes
 .../treatment/LockedTreatmentController.java  |  22 ++++++++++++++++++
 .../nhplus/treatment/LockedTreatmentView.fxml |  19 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/db/nursingHome.db b/db/nursingHome.db
index adcfa93e10fe3076d88d4433914e4fa0ddffa308..262eb5dc15564de7ecafe2545549e545414e66dc 100644
GIT binary patch
delta 271
zcmZp8z}WDBae|Z(vkn6T13M7Iz~YHIMp8ggy`qJ@+>H!u9BB-EtGViU_i&`~WOGm5
zY$(9VKDm+oDRYac=jImnW=2*wN1tHV$vm9B%uNjLi&yh9O7Q(<5D_;wXKZpUNleN~
z%}q_oOl}PJW}iHl^AdBDpV#Cl9)-!1xZY3B<h5sR%<-5k!vALSYQ7LAM&`|o{EUKp
zXBk-dR|)XH;=j+oi+|N-L50cuo(#Nt%<_ySeCEuGj9?QJOEUBG*m%uAqD85RCAq12
zC0uzxL7-RoIgykIaB`Y5i!<hx78R#5bDL~_qrXm`kz?{~|IE!S34iz(1qc8D$GJ<K

delta 259
zcmZp8z}WDBae|Z((?<pd26iBZfteF^jHG~~dPNI)IcGAku{SdCt>#_9FUa1=6VBbZ
z*-(I!eR3oF)5+eP3t7_=bBa?Zf8^|C;rq+@V)9JxOF#y*<>q`IK1SxoV7JLLxXl>Z
zC!gn@$LKmak4J%#ZF4`5E+cajgVW+hF2>2L`9hc&L^d<>GYazUXJFx9$IJhU|33dZ
z{<E6}6(;k0GVtm#%QKb~r6!i}8o^k(sd*(_c_lyx^D*Y8rer23mSpDh88a&)czJ9B
moScTt;*5EvMa8Mi+y<N9=&zG!<eWU)KXWrn!XN%c0RjN@k4ZcL

diff --git a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
index 1d36d3d..9152026 100644
--- a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
@@ -4,6 +4,7 @@ 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;
@@ -32,6 +33,12 @@ public class LockedTreatmentController {
     public TableView<Treatment> tableView;
     @FXML
     public TableColumn<Treatment, Long> columnId;
+    @FXML
+    private TableColumn<Treatment, String> columnPatient;
+    @FXML
+    private TableColumn<Treatment, String> columnNurse;
+    @FXML
+    private TableColumn<Treatment, String> columnDeleteDate;
 
     private final ObservableList<Treatment> treatments = FXCollections.observableArrayList();
     private NurseDao nurseDao;
@@ -47,6 +54,21 @@ public class LockedTreatmentController {
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
 
+        this.columnPatient.setCellValueFactory(
+                cellData -> {
+                    Patient patient = cellData.getValue().getPatient();
+                    return new SimpleStringProperty(patient.getSurName() + ", " + patient.getFirstName());
+                }
+        );
+
+        this.columnNurse.setCellValueFactory(
+                cellData -> {
+                    Nurse nurse = cellData.getValue().getNurse();
+                    return new SimpleStringProperty(nurse.getSurName() + ", " + nurse.getFirstName());
+                }
+        );
+
+        this.columnDeleteDate.setCellValueFactory(new PropertyValueFactory<>("coming soon"));
         this.tableView.setItems(this.treatments);
     }
 
diff --git a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
index 4505be7..6f501c8 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
@@ -24,6 +24,25 @@
                         prefWidth="102.0"
                         text="ID"
                 />
+                <TableColumn
+                        fx:id="columnPatient"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Patient"
+                />
+                <TableColumn
+                        fx:id="columnNurse"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Pflegekraft"
+                />
+                <TableColumn
+                        fx:id="columnDeleteDate"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Geloescht am"
+                />
+
             </columns>
             <columnResizePolicy>
                 <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>