#7 Visible UI for locked treatments #2 all visible UIs

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);
     }
 

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"/>