#18: WIP
This commit is contained in:
parent
d0dbea49e5
commit
66c676469e
6 changed files with 325 additions and 24 deletions
|
@ -1,12 +1,15 @@
|
||||||
package de.hitec.nhplus.medication;
|
package de.hitec.nhplus.medication;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import de.hitec.nhplus.Main;
|
import de.hitec.nhplus.Main;
|
||||||
import de.hitec.nhplus.datastorage.DaoFactory;
|
import de.hitec.nhplus.datastorage.DaoFactory;
|
||||||
import de.hitec.nhplus.medication.database.MedicationDao;
|
import de.hitec.nhplus.medication.database.MedicationDao;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.event.ActionEvent;
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
|
@ -16,10 +19,6 @@ import javafx.scene.control.cell.PropertyValueFactory;
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.SQLException;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The controller for viewing all {@link Medication}s.
|
* The controller for viewing all {@link Medication}s.
|
||||||
*
|
*
|
||||||
|
@ -57,14 +56,14 @@ public class AllMedicationController {
|
||||||
this.columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
|
this.columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
|
||||||
this.columnManufacturer.setCellValueFactory(new PropertyValueFactory<>("manufacturer"));
|
this.columnManufacturer.setCellValueFactory(new PropertyValueFactory<>("manufacturer"));
|
||||||
this.columnIngredient.setCellValueFactory(
|
this.columnIngredient.setCellValueFactory(
|
||||||
cellData -> new SimpleStringProperty(
|
cellData -> new SimpleStringProperty(
|
||||||
cellData
|
cellData
|
||||||
.getValue()
|
.getValue()
|
||||||
.getIngredients()
|
.getIngredients()
|
||||||
.stream()
|
.stream()
|
||||||
.map(ingredient -> ingredient.getName())
|
.map(ingredient -> ingredient.getName())
|
||||||
.collect(Collectors.joining("\n"))
|
.collect(Collectors.joining("\n"))
|
||||||
));
|
));
|
||||||
this.columnPossibleSideEffects.setCellValueFactory(new PropertyValueFactory<>("possibleSideEffects"));
|
this.columnPossibleSideEffects.setCellValueFactory(new PropertyValueFactory<>("possibleSideEffects"));
|
||||||
this.columnAdministrationMethod.setCellValueFactory(new PropertyValueFactory<>("administrationMethod"));
|
this.columnAdministrationMethod.setCellValueFactory(new PropertyValueFactory<>("administrationMethod"));
|
||||||
this.columnCurrentStock.setCellValueFactory(new PropertyValueFactory<>("currentStock"));
|
this.columnCurrentStock.setCellValueFactory(new PropertyValueFactory<>("currentStock"));
|
||||||
|
@ -84,6 +83,15 @@ public class AllMedicationController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void createMedication(Medication medication) {
|
||||||
|
dao = DaoFactory.getInstance().createMedicationDAO();
|
||||||
|
try {
|
||||||
|
dao.create(medication);
|
||||||
|
} catch (SQLException exception) {
|
||||||
|
exception.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public void handleNewMedication() {
|
public void handleNewMedication() {
|
||||||
try {
|
try {
|
||||||
|
@ -95,7 +103,7 @@ public class AllMedicationController {
|
||||||
Stage stage = new Stage();
|
Stage stage = new Stage();
|
||||||
|
|
||||||
MedicationModalController controller = loader.getController();
|
MedicationModalController controller = loader.getController();
|
||||||
controller.initialize();
|
controller.initialize(stage, this, null);
|
||||||
|
|
||||||
stage.setScene(scene);
|
stage.setScene(scene);
|
||||||
stage.setTitle("NHPlus - Neues Medikament");
|
stage.setTitle("NHPlus - Neues Medikament");
|
||||||
|
|
|
@ -17,7 +17,7 @@ public class Ingredient {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name.get();
|
return name.getValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
public SimpleStringProperty nameProperty() {
|
public SimpleStringProperty nameProperty() {
|
||||||
|
|
|
@ -0,0 +1,92 @@
|
||||||
|
package de.hitec.nhplus.medication;
|
||||||
|
|
||||||
|
import javafx.beans.value.ObservableValue;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.control.Button;
|
||||||
|
import javafx.scene.control.ListCell;
|
||||||
|
import javafx.scene.control.ListView;
|
||||||
|
import javafx.scene.control.TextField;
|
||||||
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.text.Text;
|
||||||
|
|
||||||
|
public class IngredientListCell extends ListCell<Ingredient> {
|
||||||
|
private final TextField textField;
|
||||||
|
private final Button deleteButton;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
public IngredientListCell() {
|
||||||
|
this.setPadding(new Insets(CELL_PADDING));
|
||||||
|
|
||||||
|
textField = new TextField();
|
||||||
|
textField.setPromptText("Inhaltsstoff");
|
||||||
|
textField.textProperty().addListener(this::onTextFieldUpdate);
|
||||||
|
|
||||||
|
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(this));
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateItem(Ingredient item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
if (empty || item == null) {
|
||||||
|
setGraphic(null);
|
||||||
|
} else {
|
||||||
|
String oldText = textField.getText();
|
||||||
|
String newText = oldText != null && !oldText.isEmpty() ? oldText : item.getName();
|
||||||
|
textField.setText(newText);
|
||||||
|
|
||||||
|
BorderPane cellPane = new BorderPane();
|
||||||
|
cellPane.setCenter(textField);
|
||||||
|
cellPane.setRight(deleteButton);
|
||||||
|
BorderPane.setMargin(deleteButton, new Insets(0, 0, 0, CELL_SPACING));
|
||||||
|
setGraphic(cellPane);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onTextFieldUpdate(ObservableValue<? extends String> observable, String oldValue, String newValue) {
|
||||||
|
commitEdit(new Ingredient(textField.getText()));
|
||||||
|
|
||||||
|
textField.setMinWidth(getTextFieldRequiredWidth(textField));
|
||||||
|
|
||||||
|
ListView<Ingredient> listView = getListView();
|
||||||
|
double max = listView.lookupAll("*")
|
||||||
|
.stream()
|
||||||
|
.filter(node -> node instanceof IngredientListCell)
|
||||||
|
.mapToDouble(node -> getTextFieldRequiredWidth(((IngredientListCell) node).textField))
|
||||||
|
.max()
|
||||||
|
.orElse(0);
|
||||||
|
|
||||||
|
getListView().setMinWidth(max + totalSpacing);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double getTextFieldRequiredWidth(TextField textField) {
|
||||||
|
Text textNode = new Text(textField.getText());
|
||||||
|
textNode.setFont(textField.getFont());
|
||||||
|
return textNode.getLayoutBounds().getWidth()
|
||||||
|
+ textField.getPadding().getLeft()
|
||||||
|
+ textField.getPadding().getRight()
|
||||||
|
+ BUILTIN_BORDER_WIDTH * 2;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,8 +1,86 @@
|
||||||
package de.hitec.nhplus.medication;
|
package de.hitec.nhplus.medication;
|
||||||
|
|
||||||
|
import de.hitec.nhplus.treatment.AllTreatmentController;
|
||||||
|
import javafx.collections.FXCollections;
|
||||||
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.control.ListView;
|
||||||
|
import javafx.scene.control.TextArea;
|
||||||
|
import javafx.scene.control.TextField;
|
||||||
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class MedicationModalController {
|
public class MedicationModalController {
|
||||||
|
|
||||||
public void initialize(){
|
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public ListView<Ingredient> listViewIngredients;
|
||||||
|
@FXML
|
||||||
|
public TextField textFieldName;
|
||||||
|
@FXML
|
||||||
|
public TextField textFieldManufacturer;
|
||||||
|
@FXML
|
||||||
|
public TextField textFieldAdministrationMethod;
|
||||||
|
@FXML
|
||||||
|
public TextField textFieldCurrentStock;
|
||||||
|
@FXML
|
||||||
|
public TextArea textAreaPossibleSideEffects;
|
||||||
|
|
||||||
|
private Stage stage;
|
||||||
|
|
||||||
|
private Medication medication;
|
||||||
|
private final ObservableList<Ingredient> ingredients = FXCollections.observableArrayList();
|
||||||
|
private AllMedicationController controller;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void initialize(Stage stage, AllMedicationController controller, Medication medication) {
|
||||||
|
this.stage = stage;
|
||||||
|
this.controller=controller;
|
||||||
|
this.medication = medication != null ? medication : new Medication(
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
new ArrayList<>(),
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
listViewIngredients.setCellFactory(cellData -> new IngredientListCell());
|
||||||
|
listViewIngredients.setItems(ingredients);
|
||||||
|
|
||||||
|
showData();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showData(){
|
||||||
|
ingredients.setAll(medication.getIngredients());
|
||||||
|
textFieldName.setText(medication.getName());
|
||||||
|
textFieldManufacturer.setText(medication.getManufacturer());
|
||||||
|
textFieldAdministrationMethod.setText(medication.getAdministrationMethod());
|
||||||
|
textFieldCurrentStock.setText(String.valueOf(medication.getCurrentStock()));
|
||||||
|
textAreaPossibleSideEffects.setText(medication.getPossibleSideEffects());
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void handleSave() {
|
||||||
|
this.medication.setName(textFieldName.getText());
|
||||||
|
this.medication.setManufacturer(textFieldManufacturer.getText());
|
||||||
|
this.medication.setAdministrationMethod(textFieldAdministrationMethod.getText());
|
||||||
|
this.medication.setCurrentStock(Integer.parseInt(textFieldCurrentStock.getText()));
|
||||||
|
this.medication.setPossibleSideEffects(textAreaPossibleSideEffects.getText());
|
||||||
|
this.medication.setIngredients(ingredients);
|
||||||
|
|
||||||
|
controller.createMedication(medication);
|
||||||
|
controller.readAllAndShowInTableView();
|
||||||
|
stage.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void handleCancel() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
public void handleAddIngredient() {
|
||||||
|
ingredients.add(new Ingredient(null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,141 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.geometry.*?>
|
||||||
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
<?import javafx.geometry.Insets?>
|
|
||||||
<?import javafx.scene.control.Label?>
|
|
||||||
<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"
|
||||||
fx:controller="de.hitec.nhplus.medication.MedicationModalController"
|
fx:controller="de.hitec.nhplus.medication.MedicationModalController"
|
||||||
>
|
>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets top="8" left="8" bottom="8" right="8"/>
|
<Insets top="8" left="8" bottom="8" right="8"/>
|
||||||
</padding>
|
</padding>
|
||||||
|
<top>
|
||||||
|
<GridPane hgap="8.0">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="NEVER"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS"/>
|
||||||
|
<ColumnConstraints hgrow="NEVER"/>
|
||||||
|
<ColumnConstraints hgrow="NEVER"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS"/>
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
|
||||||
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
|
||||||
|
</rowConstraints>
|
||||||
|
|
||||||
|
<!-- Row 0-->
|
||||||
|
<Label
|
||||||
|
GridPane.rowIndex="0"
|
||||||
|
GridPane.columnIndex="0"
|
||||||
|
text="Name:"
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
fx:id="textFieldName"
|
||||||
|
GridPane.rowIndex="0"
|
||||||
|
GridPane.columnIndex="1"
|
||||||
|
/>
|
||||||
|
<Label
|
||||||
|
GridPane.rowIndex="0"
|
||||||
|
GridPane.columnIndex="3"
|
||||||
|
text="Hersteller:"
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
fx:id="textFieldManufacturer"
|
||||||
|
GridPane.rowIndex="0"
|
||||||
|
GridPane.columnIndex="4"
|
||||||
|
/>
|
||||||
|
<!-- Row 1 -->
|
||||||
|
<Label
|
||||||
|
GridPane.rowIndex="1"
|
||||||
|
GridPane.columnIndex="0"
|
||||||
|
text="Verabreichungsmethode:"
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
fx:id="textFieldAdministrationMethod"
|
||||||
|
GridPane.rowIndex="1"
|
||||||
|
GridPane.columnIndex="1"
|
||||||
|
/>
|
||||||
|
<Label
|
||||||
|
GridPane.rowIndex="1"
|
||||||
|
GridPane.columnIndex="3"
|
||||||
|
text="Lagerbestand:"
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
fx:id="textFieldCurrentStock"
|
||||||
|
GridPane.rowIndex="1"
|
||||||
|
GridPane.columnIndex="4"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</GridPane>
|
||||||
|
</top>
|
||||||
<center>
|
<center>
|
||||||
<Label text="Test"/>
|
<BorderPane>
|
||||||
|
<padding>
|
||||||
|
<Insets top="8" bottom="8"/>
|
||||||
|
</padding>
|
||||||
|
<left>
|
||||||
|
<BorderPane>
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets right="8"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
<top>
|
||||||
|
<Label text="Inhaltsstoffe:"/>
|
||||||
|
</top>
|
||||||
|
<center>
|
||||||
|
<ListView fx:id="listViewIngredients" minWidth="200">
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets top="8"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
</ListView>
|
||||||
|
</center>
|
||||||
|
<bottom>
|
||||||
|
<AnchorPane>
|
||||||
|
<BorderPane.margin>
|
||||||
|
<Insets top="8"/>
|
||||||
|
</BorderPane.margin>
|
||||||
|
<Button
|
||||||
|
onAction="#handleAddIngredient"
|
||||||
|
text="+"
|
||||||
|
AnchorPane.leftAnchor="0"
|
||||||
|
AnchorPane.rightAnchor="0"
|
||||||
|
/>
|
||||||
|
</AnchorPane>
|
||||||
|
</bottom>
|
||||||
|
</BorderPane>
|
||||||
|
</left>
|
||||||
|
<center>
|
||||||
|
<BorderPane>
|
||||||
|
<top>
|
||||||
|
<Label text="Nebenwirkungen"/>
|
||||||
|
</top>
|
||||||
|
<center>
|
||||||
|
<TextArea fx:id="textAreaPossibleSideEffects"/>
|
||||||
|
</center>
|
||||||
|
</BorderPane>
|
||||||
|
</center>
|
||||||
|
</BorderPane>
|
||||||
</center>
|
</center>
|
||||||
|
<bottom>
|
||||||
|
<BorderPane>
|
||||||
|
<right>
|
||||||
|
<HBox spacing="8.0">
|
||||||
|
<Button
|
||||||
|
fx:id="buttonSave"
|
||||||
|
prefWidth="90"
|
||||||
|
mnemonicParsing="false"
|
||||||
|
onAction="#handleSave"
|
||||||
|
text="Speichern"
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
prefWidth="90"
|
||||||
|
mnemonicParsing="false"
|
||||||
|
onAction="#handleCancel"
|
||||||
|
text="Abbrechen"
|
||||||
|
/>
|
||||||
|
</HBox>
|
||||||
|
</right>
|
||||||
|
</BorderPane>
|
||||||
|
</bottom>
|
||||||
</BorderPane>
|
</BorderPane>
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
fx:id="textAreaRemarks"
|
fx:id="textAreaRemarks"
|
||||||
HBox.hgrow="ALWAYS"
|
HBox.hgrow="ALWAYS"
|
||||||
/>
|
/>
|
||||||
<VBox>
|
<VBox spacing="8.0">
|
||||||
<Button
|
<Button
|
||||||
fx:id="buttonSave"
|
fx:id="buttonSave"
|
||||||
prefWidth="90"
|
prefWidth="90"
|
||||||
|
|
Loading…
Reference in a new issue