SZUT/nhplus
5
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 1 Wiki Activity Actions

NOTICKET: Bugfixes
All checks were successful
Javadoc Deploy / Javadoc (push) Successful in 37s
Details
Quality Check / Linting Check (push) Successful in 13s
Details
Quality Check / Javadoc Check (push) Successful in 22s
Details

Browse source 
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
This commit is contained in:
Dominik Säume 2024-05-22 21:23:38 +02:00
parent 457adf7252
commit 1f539a4e20
Signed by: SZUT-Dominik
GPG key ID: 67D15BB250B41E7C
8 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
View file

@ -38,7 +38,7 @@ public class MedicationListCell extends ListCell<Medication> {
ObservableList<Medication> list = FXCollections.observableArrayList(); ObservableList<Medication> list = FXCollections.observableArrayList();
list.setAll(allOtherMedications); list.setAll(allOtherMedications);
comboBox.setItems(list); comboBox.setItems(list);
comboBox.setPromptText("Alternatve Auswählen"); comboBox.setPromptText("Alternative Auswählen");
comboBox.setCellFactory(this::comboBoxFactory); comboBox.setCellFactory(this::comboBoxFactory);
comboBox.setButtonCell(comboBoxButtonFactory()); comboBox.setButtonCell(comboBoxButtonFactory());
comboBox.valueProperty().addListener(this::onComboBoxChange); comboBox.valueProperty().addListener(this::onComboBoxChange);

9
src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml
View file

@ -31,12 +31,12 @@
/> />
<TableColumn <TableColumn
fx:id="columnIngredient" fx:id="columnIngredient"
minWidth="140.0" minWidth="220.0"
text="Inhaltsstoffe" text="Inhaltsstoffe"
/> />
<TableColumn <TableColumn
fx:id="columnPossibleSideEffects" fx:id="columnPossibleSideEffects"
minWidth="200.0" minWidth="400.0"
text="Mögliche Nebenwirkungen" text="Mögliche Nebenwirkungen"
/> />
<TableColumn <TableColumn
@ -51,13 +51,10 @@
/> />
<TableColumn <TableColumn
fx:id="columnAlternativeMedication" fx:id="columnAlternativeMedication"
minWidth="100.0" minWidth="220.0"
text="Alternative Medikamente" text="Alternative Medikamente"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

9
src/main/resources/de/hitec/nhplus/medication/DeprecatedMedicationView.fxml
View file

@ -31,12 +31,12 @@
/> />
<TableColumn <TableColumn
fx:id="columnIngredient" fx:id="columnIngredient"
minWidth="140.0" minWidth="220.0"
text="Inhaltsstoffe" text="Inhaltsstoffe"
/> />
<TableColumn <TableColumn
fx:id="columnPossibleSideEffects" fx:id="columnPossibleSideEffects"
minWidth="200.0" minWidth="400.0"
text="Mögliche Nebenwirkungen" text="Mögliche Nebenwirkungen"
/> />
<TableColumn <TableColumn
@ -51,13 +51,10 @@
/> />
<TableColumn <TableColumn
fx:id="columnAlternativeMedication" fx:id="columnAlternativeMedication"
minWidth="100.0" minWidth="220.0"
text="Alternative Medikamente" text="Alternative Medikamente"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

3
src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
View file

@ -38,9 +38,6 @@
text="Telefonnummer" text="Telefonnummer"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

3
src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
View file

@ -45,9 +45,6 @@
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

3
src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
View file

@ -54,9 +54,6 @@
text="Raum" text="Raum"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

9
src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
View file

@ -25,19 +25,17 @@
/> />
<TableColumn <TableColumn
fx:id="columnPatientName" fx:id="columnPatientName"
minWidth="80.0" minWidth="140.0"
text="Patient" text="Patient"
/> />
<TableColumn <TableColumn
fx:id="columnNurseName" fx:id="columnNurseName"
minWidth="80.0" minWidth="140.0"
text="Pflegekraft" text="Pflegekraft"
/> />
<TableColumn <TableColumn
fx:id="columnDate" fx:id="columnDate"
maxWidth="-1.0"
minWidth="140.0" minWidth="140.0"
prefWidth="150.0"
text="Datum" text="Datum"
/> />
<TableColumn <TableColumn
@ -56,9 +54,6 @@
text="Kurzbeschreibung" text="Kurzbeschreibung"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>

13
src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
View file

@ -21,31 +21,24 @@
<TableColumn <TableColumn
fx:id="columnId" fx:id="columnId"
minWidth="40.0" minWidth="40.0"
prefWidth="102.0"
text="ID" text="ID"
/> />
<TableColumn <TableColumn
fx:id="columnPatient" fx:id="columnPatient"
minWidth="40.0" minWidth="140.0"
prefWidth="102.0"
text="Patient" text="Patient"
/> />
<TableColumn <TableColumn
fx:id="columnNurse" fx:id="columnNurse"
minWidth="40.0" minWidth="140.0"
prefWidth="102.0"
text="Pflegekraft" text="Pflegekraft"
/> />
<TableColumn <TableColumn
fx:id="columnDeleteDate" fx:id="columnDeleteDate"
minWidth="40.0" minWidth="80.0"
prefWidth="102.0"
text="Löschung am" text="Löschung am"
/> />
</columns> </columns>
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
</TableView> </TableView>
</center> </center>
<bottom> <bottom>