#27: Implementing Alternative Medications for the View
This commit is contained in:
parent
6e58574909
commit
203aaf2804
8 changed files with 240 additions and 32 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||||
<data-source source="LOCAL" name="Database" uuid="5a5b8be1-080b-4129-b89d-42f1ea832b90">
|
<data-source source="LOCAL" name="nursingHome.db" uuid="5a5b8be1-080b-4129-b89d-42f1ea832b90">
|
||||||
<driver-ref>sqlite.xerial</driver-ref>
|
<driver-ref>sqlite.xerial</driver-ref>
|
||||||
<synchronize>true</synchronize>
|
<synchronize>true</synchronize>
|
||||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||||
|
|
|
@ -52,6 +52,10 @@ public class AllMedicationController {
|
||||||
private final ObservableList<Medication> medications = FXCollections.observableArrayList();
|
private final ObservableList<Medication> medications = FXCollections.observableArrayList();
|
||||||
private MedicationDao dao;
|
private MedicationDao dao;
|
||||||
|
|
||||||
|
public MedicationDao getDao() {
|
||||||
|
return dao;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialization method that is called after the binding of all the fields.
|
* Initialization method that is called after the binding of all the fields.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -164,4 +164,11 @@ public class Medication {
|
||||||
.add("Current Stock: " + this.getCurrentStock())
|
.add("Current Stock: " + this.getCurrentStock())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getComboBoxString() {
|
||||||
|
return new StringJoiner(System.lineSeparator())
|
||||||
|
.add("Name: " + this.getName())
|
||||||
|
.add("Hersteller: " + this.getManufacturer())
|
||||||
|
.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
129
src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
Normal file
129
src/main/java/de/hitec/nhplus/medication/MedicationListCell.java
Normal file
|
@ -0,0 +1,129 @@
|
||||||
|
package de.hitec.nhplus.medication;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javafx.beans.value.ObservableValue;
|
||||||
|
import javafx.collections.FXCollections;
|
||||||
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.control.Button;
|
||||||
|
import javafx.scene.control.ListCell;
|
||||||
|
import javafx.scene.control.ListView;
|
||||||
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.text.Text;
|
||||||
|
import org.controlsfx.control.SearchableComboBox;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A custom implementation of the {@link ListCell} for {@link Ingredient}s.
|
||||||
|
* This implementation contains an automatic resizing of the parent {@link ListView}.
|
||||||
|
*
|
||||||
|
* @author Dominik Säume
|
||||||
|
*/
|
||||||
|
public class MedicationListCell extends ListCell<Medication> {
|
||||||
|
private final Button deleteButton;
|
||||||
|
private SearchableComboBox<Medication> comboBox;
|
||||||
|
private static final double BUILTIN_BORDER_WIDTH = 1;
|
||||||
|
private static final double CELL_SPACING = 4;
|
||||||
|
private static final double CELL_PADDING = 4;
|
||||||
|
private static final double BUTTON_PADDING_X = 8;
|
||||||
|
private static final double BUTTON_PADDING_Y = 4;
|
||||||
|
private final double totalSpacing;
|
||||||
|
private final List<Medication> allOtherMedications;
|
||||||
|
|
||||||
|
public MedicationListCell(List<Medication> allOtherMedications) {
|
||||||
|
this.allOtherMedications = allOtherMedications;
|
||||||
|
this.setPadding(new Insets(CELL_PADDING));
|
||||||
|
|
||||||
|
comboBox = new SearchableComboBox();
|
||||||
|
ObservableList<Medication> list = FXCollections.observableArrayList();
|
||||||
|
list.setAll(allOtherMedications);
|
||||||
|
comboBox.setItems(list);
|
||||||
|
comboBox.setPromptText("Alternatve Auswählen");
|
||||||
|
comboBox.setCellFactory(this::comboBoxFactory);
|
||||||
|
comboBox.setButtonCell(comboBoxButtonFactory());
|
||||||
|
comboBox.valueProperty().addListener(this::onComboBoxChange);
|
||||||
|
|
||||||
|
deleteButton = new Button("-");
|
||||||
|
deleteButton.setPadding(new Insets(
|
||||||
|
BUTTON_PADDING_Y,
|
||||||
|
BUTTON_PADDING_X,
|
||||||
|
BUTTON_PADDING_Y,
|
||||||
|
BUTTON_PADDING_X
|
||||||
|
));
|
||||||
|
deleteButton.setOnAction(event -> getListView().getItems().remove(getItem()));
|
||||||
|
|
||||||
|
// Calculate Delete Button Width
|
||||||
|
Text textNode = new Text(deleteButton.getText());
|
||||||
|
textNode.setFont(deleteButton.getFont());
|
||||||
|
double calculatedDeleteButtonWidth = textNode.getLayoutBounds().getWidth() + BUTTON_PADDING_X * 2;
|
||||||
|
|
||||||
|
totalSpacing = BUILTIN_BORDER_WIDTH * 2 // List View
|
||||||
|
+ CELL_PADDING * 2
|
||||||
|
+ CELL_SPACING
|
||||||
|
+ calculatedDeleteButtonWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onComboBoxChange(
|
||||||
|
ObservableValue<? extends Medication> observableValue,
|
||||||
|
Medication oldValue,
|
||||||
|
Medication newValue
|
||||||
|
) {
|
||||||
|
ListView<Medication> listView = getListView();
|
||||||
|
double max = listView.lookupAll("*")
|
||||||
|
.stream()
|
||||||
|
.filter(node -> node instanceof MedicationListCell)
|
||||||
|
.mapToDouble(node -> getComboBoxWidth())
|
||||||
|
.max()
|
||||||
|
.orElse(0);
|
||||||
|
|
||||||
|
listView.setMinWidth(max + totalSpacing);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateItem(Medication item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
if (empty || item == null) {
|
||||||
|
setGraphic(null);
|
||||||
|
} else {
|
||||||
|
BorderPane cellPane = new BorderPane();
|
||||||
|
cellPane.setCenter(comboBox);
|
||||||
|
cellPane.setRight(deleteButton);
|
||||||
|
BorderPane.setMargin(deleteButton, new Insets(0, 0, 0, CELL_SPACING));
|
||||||
|
setGraphic(cellPane);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private double getComboBoxWidth(){
|
||||||
|
return comboBox.getWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
private ListCell comboBoxFactory(Object param) {
|
||||||
|
return new ListCell<Medication>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateItem(Medication med, boolean empty) {
|
||||||
|
super.updateItem(med, empty);
|
||||||
|
setText(
|
||||||
|
empty || med == null
|
||||||
|
? null
|
||||||
|
: med.getComboBoxString()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private ListCell comboBoxButtonFactory() {
|
||||||
|
return new ListCell<Medication>() {
|
||||||
|
@Override
|
||||||
|
protected void updateItem(Medication med, boolean empty) {
|
||||||
|
super.updateItem(med, empty);
|
||||||
|
setText(
|
||||||
|
empty || med == null
|
||||||
|
? comboBox.getPromptText()
|
||||||
|
: med.getComboBoxString()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,6 +1,11 @@
|
||||||
package de.hitec.nhplus.medication;
|
package de.hitec.nhplus.medication;
|
||||||
|
|
||||||
import de.hitec.nhplus.treatment.Treatment;
|
import static de.hitec.nhplus.utils.Validator.*;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
|
@ -11,12 +16,6 @@ import javafx.scene.control.TextArea;
|
||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Predicate;
|
|
||||||
|
|
||||||
import static de.hitec.nhplus.utils.Validator.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The controller for creating and editing a specific {@link Medication}.
|
* The controller for creating and editing a specific {@link Medication}.
|
||||||
*
|
*
|
||||||
|
@ -38,21 +37,25 @@ public class MedicationModalController {
|
||||||
public TextArea textAreaPossibleSideEffects;
|
public TextArea textAreaPossibleSideEffects;
|
||||||
@FXML
|
@FXML
|
||||||
public Button buttonSave;
|
public Button buttonSave;
|
||||||
|
@FXML
|
||||||
|
public ListView<Medication> listViewAlternativeMedication;
|
||||||
|
|
||||||
private Stage stage;
|
private Stage stage;
|
||||||
private Medication medication;
|
private Medication medication;
|
||||||
private final ObservableList<Ingredient> ingredients = FXCollections.observableArrayList();
|
private final ObservableList<Ingredient> ingredients = FXCollections.observableArrayList();
|
||||||
|
private final ObservableList<Medication> alternativeMediaction = FXCollections.observableArrayList();
|
||||||
private AllMedicationController controller;
|
private AllMedicationController controller;
|
||||||
private boolean isNewMedication = false;
|
private boolean isNewMedication = false;
|
||||||
|
private List<Medication> allOtherMedications;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialization method that is called after the binding of all the fields.
|
* Initialization method that is called after the binding of all the fields.
|
||||||
*/
|
*/
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize(
|
public void initialize(
|
||||||
Stage stage,
|
Stage stage,
|
||||||
AllMedicationController controller,
|
AllMedicationController controller,
|
||||||
Medication medication
|
Medication medication
|
||||||
) {
|
) {
|
||||||
this.stage = stage;
|
this.stage = stage;
|
||||||
this.controller = controller;
|
this.controller = controller;
|
||||||
|
@ -62,25 +65,29 @@ public class MedicationModalController {
|
||||||
} else {
|
} else {
|
||||||
isNewMedication = true;
|
isNewMedication = true;
|
||||||
this.medication = new Medication(
|
this.medication = new Medication(
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
new ArrayList<>(),
|
new ArrayList<>(),
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
this.buttonSave.setDisable(true);
|
this.buttonSave.setDisable(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
listViewIngredients.setCellFactory(cellData -> new IngredientListCell());
|
listViewIngredients.setCellFactory(cellData -> new IngredientListCell());
|
||||||
listViewIngredients.setItems(ingredients);
|
listViewIngredients.setItems(ingredients);
|
||||||
|
|
||||||
showData();
|
showData();
|
||||||
|
|
||||||
|
listViewAlternativeMedication.setCellFactory(cellData -> new MedicationListCell(allOtherMedications));
|
||||||
|
listViewAlternativeMedication.setItems(alternativeMediaction);
|
||||||
|
|
||||||
ChangeListener<String> inputMedicationValidationListener = (observableValue, oldText, newText) -> {
|
ChangeListener<String> inputMedicationValidationListener = (observableValue, oldText, newText) -> {
|
||||||
boolean isValid = isValidMedicationName(textFieldName.getText())
|
boolean isValid = isValidMedicationName(textFieldName.getText())
|
||||||
&& isValidMedicationManufacturer(textFieldManufacturer.getText())
|
&& isValidMedicationManufacturer(textFieldManufacturer.getText())
|
||||||
&& isValidMedicationAdministrationMethod(textFieldAdministrationMethod.getText())
|
&& isValidMedicationAdministrationMethod(textFieldAdministrationMethod.getText())
|
||||||
&& isValidStock(textFieldCurrentStock.getText());
|
&& isValidStock(textFieldCurrentStock.getText());
|
||||||
|
|
||||||
this.buttonSave.setDisable(!isValid);
|
this.buttonSave.setDisable(!isValid);
|
||||||
};
|
};
|
||||||
|
@ -96,6 +103,17 @@ public class MedicationModalController {
|
||||||
*/
|
*/
|
||||||
private void showData() {
|
private void showData() {
|
||||||
ingredients.setAll(medication.getIngredients());
|
ingredients.setAll(medication.getIngredients());
|
||||||
|
try {
|
||||||
|
allOtherMedications = controller.getDao().readAll();
|
||||||
|
if (!isNewMedication) {
|
||||||
|
allOtherMedications = allOtherMedications
|
||||||
|
.stream()
|
||||||
|
.filter(med -> med.getId() != medication.getId())
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
} catch (Exception exception) {
|
||||||
|
exception.printStackTrace();
|
||||||
|
}
|
||||||
textFieldName.setText(medication.getName());
|
textFieldName.setText(medication.getName());
|
||||||
textFieldManufacturer.setText(medication.getManufacturer());
|
textFieldManufacturer.setText(medication.getManufacturer());
|
||||||
textFieldAdministrationMethod.setText(medication.getAdministrationMethod());
|
textFieldAdministrationMethod.setText(medication.getAdministrationMethod());
|
||||||
|
@ -111,12 +129,12 @@ public class MedicationModalController {
|
||||||
this.medication.setCurrentStock(Integer.parseInt(textFieldCurrentStock.getText()));
|
this.medication.setCurrentStock(Integer.parseInt(textFieldCurrentStock.getText()));
|
||||||
this.medication.setPossibleSideEffects(textAreaPossibleSideEffects.getText());
|
this.medication.setPossibleSideEffects(textAreaPossibleSideEffects.getText());
|
||||||
this.medication.setIngredients(ingredients
|
this.medication.setIngredients(ingredients
|
||||||
.stream()
|
.stream()
|
||||||
.map(Ingredient::getName)
|
.map(Ingredient::getName)
|
||||||
.distinct()
|
.distinct()
|
||||||
.filter(Predicate.not(String::isEmpty))
|
.filter(Predicate.not(String::isEmpty))
|
||||||
.map(Ingredient::new)
|
.map(Ingredient::new)
|
||||||
.toList()
|
.toList()
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isNewMedication) {
|
if (isNewMedication) {
|
||||||
|
@ -138,4 +156,15 @@ public class MedicationModalController {
|
||||||
public void handleAddIngredient() {
|
public void handleAddIngredient() {
|
||||||
ingredients.add(new Ingredient(""));
|
ingredients.add(new Ingredient(""));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void handleAddAlternativeMedication() {
|
||||||
|
alternativeMediaction.add(new Medication(
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
List.of(),
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
-1
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ module de.hitec.nhplus {
|
||||||
requires javafx.fxml;
|
requires javafx.fxml;
|
||||||
requires java.sql;
|
requires java.sql;
|
||||||
requires org.xerial.sqlitejdbc;
|
requires org.xerial.sqlitejdbc;
|
||||||
|
requires org.controlsfx.controls;
|
||||||
|
|
||||||
exports de.hitec.nhplus;
|
exports de.hitec.nhplus;
|
||||||
opens de.hitec.nhplus to javafx.fxml;
|
opens de.hitec.nhplus to javafx.fxml;
|
||||||
|
|
|
@ -49,6 +49,11 @@
|
||||||
minWidth="100.0"
|
minWidth="100.0"
|
||||||
text="Lagerbestand"
|
text="Lagerbestand"
|
||||||
/>
|
/>
|
||||||
|
<TableColumn
|
||||||
|
fx:id="columnAlternativeMedication"
|
||||||
|
minWidth="100.0"
|
||||||
|
text="Alternative Medikamente"
|
||||||
|
/>
|
||||||
</columns>
|
</columns>
|
||||||
<columnResizePolicy>
|
<columnResizePolicy>
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
<?import javafx.geometry.*?>
|
<?import javafx.geometry.*?>
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
<?import org.controlsfx.control.SearchableComboBox?>
|
||||||
<BorderPane
|
<BorderPane
|
||||||
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
|
@ -77,16 +78,13 @@
|
||||||
</padding>
|
</padding>
|
||||||
<left>
|
<left>
|
||||||
<BorderPane>
|
<BorderPane>
|
||||||
<BorderPane.margin>
|
|
||||||
<Insets right="8"/>
|
|
||||||
</BorderPane.margin>
|
|
||||||
<top>
|
<top>
|
||||||
<Label text="Inhaltsstoffe:"/>
|
<Label text="Inhaltsstoffe:"/>
|
||||||
</top>
|
</top>
|
||||||
<center>
|
<center>
|
||||||
<ListView fx:id="listViewIngredients" minWidth="200">
|
<ListView fx:id="listViewIngredients" minWidth="200">
|
||||||
<BorderPane.margin>
|
<BorderPane.margin>
|
||||||
<Insets top="8"/>
|
<Insets top="4"/>
|
||||||
</BorderPane.margin>
|
</BorderPane.margin>
|
||||||
</ListView>
|
</ListView>
|
||||||
</center>
|
</center>
|
||||||
|
@ -105,10 +103,45 @@
|
||||||
</bottom>
|
</bottom>
|
||||||
</BorderPane>
|
</BorderPane>
|
||||||
</left>
|
</left>
|
||||||
<center>
|
<right>
|
||||||
<BorderPane>
|
<BorderPane>
|
||||||
<top>
|
<top>
|
||||||
<Label text="Nebenwirkungen"/>
|
<Label text="Alternative Medikamente:"/>
|
||||||
|
</top>
|
||||||
|
<center>
|
||||||
|
<ListView fx:id="listViewAlternativeMedication" minWidth="200">
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets top="4"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
</ListView>
|
||||||
|
</center>
|
||||||
|
<bottom>
|
||||||
|
<AnchorPane>
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets top="8"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
<Button
|
||||||
|
onAction="#handleAddAlternativeMedication"
|
||||||
|
text="+"
|
||||||
|
AnchorPane.leftAnchor="0"
|
||||||
|
AnchorPane.rightAnchor="0"
|
||||||
|
/>
|
||||||
|
</AnchorPane>
|
||||||
|
</bottom>
|
||||||
|
</BorderPane>
|
||||||
|
</right>
|
||||||
|
<center>
|
||||||
|
<BorderPane>
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets left="8" right="8"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
<top>
|
||||||
|
<Label text="Nebenwirkungen">
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets bottom="4"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
|
||||||
|
</Label>
|
||||||
</top>
|
</top>
|
||||||
<center>
|
<center>
|
||||||
<TextArea fx:id="textAreaPossibleSideEffects"/>
|
<TextArea fx:id="textAreaPossibleSideEffects"/>
|
||||||
|
|
Loading…
Reference in a new issue