NOTICKET: Bugfixes
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
This commit is contained in:
parent
457adf7252
commit
1f539a4e20
8 changed files with 12 additions and 39 deletions
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -38,9 +38,6 @@
|
|||
text="Telefonnummer"
|
||||
/>
|
||||
</columns>
|
||||
<columnResizePolicy>
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||
</columnResizePolicy>
|
||||
</TableView>
|
||||
</center>
|
||||
<bottom>
|
||||
|
|
|
@ -45,9 +45,6 @@
|
|||
/>
|
||||
|
||||
</columns>
|
||||
<columnResizePolicy>
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||
</columnResizePolicy>
|
||||
</TableView>
|
||||
</center>
|
||||
<bottom>
|
||||
|
|
|
@ -54,9 +54,6 @@
|
|||
text="Raum"
|
||||
/>
|
||||
</columns>
|
||||
<columnResizePolicy>
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||
</columnResizePolicy>
|
||||
</TableView>
|
||||
</center>
|
||||
<bottom>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue