From 1f539a4e20f794cfc8f05b8578a0a82c85574c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20S=C3=A4ume?= <Dominik.Saeume@hmmh.de>
Date: Wed, 22 May 2024 21:23:38 +0200
Subject: [PATCH] NOTICKET: Bugfixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
---
 .../hitec/nhplus/medication/MedicationListCell.java |  2 +-
 .../hitec/nhplus/medication/AllMedicationView.fxml  |  9 +++------
 .../nhplus/medication/DeprecatedMedicationView.fxml |  9 +++------
 .../de/hitec/nhplus/nurse/AllNurseView.fxml         |  3 ---
 .../de/hitec/nhplus/nurse/LockedNurseView.fxml      |  3 ---
 .../de/hitec/nhplus/patient/AllPatientView.fxml     |  3 ---
 .../de/hitec/nhplus/treatment/AllTreatmentView.fxml |  9 ++-------
 .../hitec/nhplus/treatment/LockedTreatmentView.fxml | 13 +++----------
 8 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/src/main/java/de/hitec/nhplus/medication/MedicationListCell.java b/src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
index fe82287..fe61fff 100644
--- a/src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
+++ b/src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
@@ -38,7 +38,7 @@ public class MedicationListCell extends ListCell<Medication> {
         ObservableList<Medication> list = FXCollections.observableArrayList();
         list.setAll(allOtherMedications);
         comboBox.setItems(list);
-        comboBox.setPromptText("Alternatve Auswählen");
+        comboBox.setPromptText("Alternative Auswählen");
         comboBox.setCellFactory(this::comboBoxFactory);
         comboBox.setButtonCell(comboBoxButtonFactory());
         comboBox.valueProperty().addListener(this::onComboBoxChange);
diff --git a/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml b/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml
index d4de0e6..20c58eb 100644
--- a/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml
+++ b/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml
@@ -31,12 +31,12 @@
                 />
                 <TableColumn
                         fx:id="columnIngredient"
-                        minWidth="140.0"
+                        minWidth="220.0"
                         text="Inhaltsstoffe"
                 />
                 <TableColumn
                         fx:id="columnPossibleSideEffects"
-                        minWidth="200.0"
+                        minWidth="400.0"
                         text="Mögliche Nebenwirkungen"
                 />
                 <TableColumn
@@ -51,13 +51,10 @@
                 />
                 <TableColumn
                     fx:id="columnAlternativeMedication"
-                    minWidth="100.0"
+                    minWidth="220.0"
                     text="Alternative Medikamente"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml b/src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml
index 6a89e05..9a73190 100644
--- a/src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml
+++ b/src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml
@@ -31,12 +31,12 @@
                 />
                 <TableColumn
                         fx:id="columnIngredient"
-                        minWidth="140.0"
+                        minWidth="220.0"
                         text="Inhaltsstoffe"
                 />
                 <TableColumn
                         fx:id="columnPossibleSideEffects"
-                        minWidth="200.0"
+                        minWidth="400.0"
                         text="Mögliche Nebenwirkungen"
                 />
                 <TableColumn
@@ -51,13 +51,10 @@
                 />
                 <TableColumn
                         fx:id="columnAlternativeMedication"
-                        minWidth="100.0"
+                        minWidth="220.0"
                         text="Alternative Medikamente"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
index 10b589a..e05254e 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
@@ -38,9 +38,6 @@
                         text="Telefonnummer"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
index dcd2d65..800cd1a 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
@@ -45,9 +45,6 @@
                 />
 
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
index 50941c6..dc13b98 100644
--- a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
+++ b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
@@ -54,9 +54,6 @@
                         text="Raum"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index 4ccbfec..b57a3f0 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -25,19 +25,17 @@
                 />
                 <TableColumn
                         fx:id="columnPatientName"
-                        minWidth="80.0"
+                        minWidth="140.0"
                         text="Patient"
                 />
                 <TableColumn
                         fx:id="columnNurseName"
-                        minWidth="80.0"
+                        minWidth="140.0"
                         text="Pflegekraft"
                 />
                 <TableColumn
                         fx:id="columnDate"
-                        maxWidth="-1.0"
                         minWidth="140.0"
-                        prefWidth="150.0"
                         text="Datum"
                 />
                 <TableColumn
@@ -56,9 +54,6 @@
                         text="Kurzbeschreibung"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
index 2680436..d94b5c1 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
@@ -21,31 +21,24 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
-                        prefWidth="102.0"
                         text="ID"
                 />
                 <TableColumn
                         fx:id="columnPatient"
-                        minWidth="40.0"
-                        prefWidth="102.0"
+                        minWidth="140.0"
                         text="Patient"
                 />
                 <TableColumn
                         fx:id="columnNurse"
-                        minWidth="40.0"
-                        prefWidth="102.0"
+                        minWidth="140.0"
                         text="Pflegekraft"
                 />
                 <TableColumn
                         fx:id="columnDeleteDate"
-                        minWidth="40.0"
-                        prefWidth="102.0"
+                        minWidth="80.0"
                         text="Löschung am"
                 />
             </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
         </TableView>
     </center>
     <bottom>