parent
275aa3252a
commit
85a5461386
7 changed files with 144 additions and 86 deletions
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||
<data-source source="LOCAL" name="nursingHome.db" uuid="5a5b8be1-080b-4129-b89d-42f1ea832b90">
|
||||
<data-source source="LOCAL" name="Database" uuid="5a5b8be1-080b-4129-b89d-42f1ea832b90">
|
||||
<driver-ref>sqlite.xerial</driver-ref>
|
||||
<synchronize>true</synchronize>
|
||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||
|
|
Binary file not shown.
|
@ -1,17 +1,17 @@
|
|||
package de.hitec.nhplus.fixtures;
|
||||
|
||||
import de.hitec.nhplus.Main;
|
||||
import de.hitec.nhplus.datastorage.DaoFactory;
|
||||
import de.hitec.nhplus.medication.Ingredient;
|
||||
import de.hitec.nhplus.medication.Medication;
|
||||
import de.hitec.nhplus.medication.database.MedicationDao;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
import de.hitec.nhplus.Main;
|
||||
import de.hitec.nhplus.datastorage.DaoFactory;
|
||||
import de.hitec.nhplus.medication.Ingredient;
|
||||
import de.hitec.nhplus.medication.Medication;
|
||||
import de.hitec.nhplus.medication.database.MedicationDao;
|
||||
|
||||
/**
|
||||
* {@link Fixture} for {@link Medication}.
|
||||
*
|
||||
|
@ -20,11 +20,13 @@ import java.util.*;
|
|||
public class MedicationFixture implements Fixture<Medication> {
|
||||
private static final String SCHEMA = "/de/hitec/nhplus/medication/database/Medication.sql";
|
||||
private static final String INGREDIENT_SCHEMA = "/de/hitec/nhplus/medication/database/Medication_Ingredient.sql";
|
||||
private static final String ALTERNATIVE_SCHEMA = "/de/hitec/nhplus/medication/database/Medication_Alternative.sql";
|
||||
|
||||
@Override
|
||||
public void dropTable(Connection connection) throws SQLException {
|
||||
connection.createStatement().execute("DROP TABLE IF EXISTS medication");
|
||||
connection.createStatement().execute("DROP TABLE IF EXISTS medication_ingredient");
|
||||
connection.createStatement().execute("DROP TABLE IF EXISTS medication_ingredient");
|
||||
connection.createStatement().execute("DROP TABLE IF EXISTS medication_alternative");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -32,16 +34,25 @@ public class MedicationFixture implements Fixture<Medication> {
|
|||
|
||||
final InputStream schema = Main.class.getResourceAsStream(SCHEMA);
|
||||
final InputStream ingredientSchema = Main.class.getResourceAsStream(INGREDIENT_SCHEMA);
|
||||
final InputStream alternativeSchema = Main.class.getResourceAsStream(ALTERNATIVE_SCHEMA);
|
||||
|
||||
assert schema != null;
|
||||
assert ingredientSchema != null;
|
||||
assert alternativeSchema != null;
|
||||
|
||||
String SQL = new Scanner(schema, StandardCharsets.UTF_8)
|
||||
.useDelimiter("\\A")
|
||||
.next();
|
||||
.useDelimiter("\\A")
|
||||
.next();
|
||||
String ingredientSQL = ";" + new Scanner(ingredientSchema, StandardCharsets.UTF_8)
|
||||
.useDelimiter("\\A")
|
||||
.next();
|
||||
.useDelimiter("\\A")
|
||||
.next();
|
||||
String alternativeSQL = ";" + new Scanner(alternativeSchema, StandardCharsets.UTF_8)
|
||||
.useDelimiter("\\A")
|
||||
.next();
|
||||
|
||||
connection.createStatement().execute(SQL);
|
||||
connection.createStatement().execute(ingredientSQL);
|
||||
connection.createStatement().execute(alternativeSQL);
|
||||
|
||||
}
|
||||
|
||||
|
@ -67,81 +78,87 @@ public class MedicationFixture implements Fixture<Medication> {
|
|||
Ingredient warfarinnatrium = new Ingredient("Warfarinnatrium");
|
||||
|
||||
medications.add(new Medication(
|
||||
"Metformin",
|
||||
"AstraZeneca",
|
||||
List.of(
|
||||
metforminhydrochlorid,
|
||||
cellulose,
|
||||
povidon,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Übelkeit, Durchfall, Laktatazidose (selten)",
|
||||
"Oral",
|
||||
100
|
||||
"Metformin",
|
||||
"AstraZeneca",
|
||||
List.of(
|
||||
metforminhydrochlorid,
|
||||
cellulose,
|
||||
povidon,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Übelkeit, Durchfall, Laktatazidose (selten)",
|
||||
"Oral",
|
||||
100,
|
||||
new ArrayList<>()
|
||||
));
|
||||
medications.add(new Medication(
|
||||
"Lisinopril",
|
||||
"Teva Pharmaceuticals",
|
||||
List.of(
|
||||
lisinoprilDihydrat,
|
||||
mannitol,
|
||||
calciumphosphat,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Schwindel, trockener Husten",
|
||||
"Oral",
|
||||
150
|
||||
"Lisinopril",
|
||||
"Teva Pharmaceuticals",
|
||||
List.of(
|
||||
lisinoprilDihydrat,
|
||||
mannitol,
|
||||
calciumphosphat,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Schwindel, trockener Husten",
|
||||
"Oral",
|
||||
150,
|
||||
new ArrayList<>()
|
||||
));
|
||||
medications.add(new Medication(
|
||||
"Simvastatin",
|
||||
"Mylan",
|
||||
List.of(
|
||||
simvastatin,
|
||||
laktose,
|
||||
cellulose,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Muskelschmerzen, Leberprobleme(selten)",
|
||||
"Oral",
|
||||
80
|
||||
"Simvastatin",
|
||||
"Mylan",
|
||||
List.of(
|
||||
simvastatin,
|
||||
laktose,
|
||||
cellulose,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Muskelschmerzen, Leberprobleme(selten)",
|
||||
"Oral",
|
||||
80,
|
||||
new ArrayList<>()
|
||||
));
|
||||
medications.add(new Medication(
|
||||
"Enoxaparin",
|
||||
"Sanofi",
|
||||
List.of(
|
||||
enoxaparinNatrium,
|
||||
benzylalkohol,
|
||||
wasser
|
||||
),
|
||||
"Blutungen, Reaktionen an der Injektionsstelle",
|
||||
"Unterhautinjektion",
|
||||
120
|
||||
"Enoxaparin",
|
||||
"Sanofi",
|
||||
List.of(
|
||||
enoxaparinNatrium,
|
||||
benzylalkohol,
|
||||
wasser
|
||||
),
|
||||
"Blutungen, Reaktionen an der Injektionsstelle",
|
||||
"Unterhautinjektion",
|
||||
120,
|
||||
new ArrayList<>()
|
||||
));
|
||||
medications.add(new Medication(
|
||||
"Levothyroxin",
|
||||
"Sandoz",
|
||||
List.of(
|
||||
levothyroxinnatrium,
|
||||
laktose,
|
||||
staerke,
|
||||
akaziengummi
|
||||
),
|
||||
"Herzrasen, Gewichtsverlust",
|
||||
"Oral",
|
||||
90
|
||||
"Levothyroxin",
|
||||
"Sandoz",
|
||||
List.of(
|
||||
levothyroxinnatrium,
|
||||
laktose,
|
||||
staerke,
|
||||
akaziengummi
|
||||
),
|
||||
"Herzrasen, Gewichtsverlust",
|
||||
"Oral",
|
||||
90,
|
||||
new ArrayList<>()
|
||||
));
|
||||
medications.add(new Medication(
|
||||
"Warfarin",
|
||||
"Apotex Inc.",
|
||||
List.of(
|
||||
warfarinnatrium,
|
||||
laktose,
|
||||
staerke,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Blutungen, Blutergüsse",
|
||||
"Oral",
|
||||
110
|
||||
"Warfarin",
|
||||
"Apotex Inc.",
|
||||
List.of(
|
||||
warfarinnatrium,
|
||||
laktose,
|
||||
staerke,
|
||||
magnesiumstearat
|
||||
),
|
||||
"Blutungen, Blutergüsse",
|
||||
"Oral",
|
||||
110,
|
||||
new ArrayList<>()
|
||||
));
|
||||
MedicationDao dao = DaoFactory.getInstance().createMedicationDAO();
|
||||
Map<String, Medication> medicationsByName = new HashMap<>();
|
||||
|
|
|
@ -23,6 +23,7 @@ public class Medication {
|
|||
private final SimpleStringProperty possibleSideEffects;
|
||||
private final SimpleStringProperty administrationMethod;
|
||||
private final SimpleIntegerProperty currentStock;
|
||||
private final SimpleListProperty<Medication> alternativeMedication;
|
||||
|
||||
/**
|
||||
* This constructor allows instantiating a {@link Medication} object,
|
||||
|
@ -37,7 +38,8 @@ public class Medication {
|
|||
List<Ingredient> ingredients,
|
||||
String possibleSideEffects,
|
||||
String administrationMethod,
|
||||
int currentStock
|
||||
int currentStock,
|
||||
List<Medication> alternativeMedication
|
||||
) {
|
||||
this.name = new SimpleStringProperty(name);
|
||||
this.manufacturer = new SimpleStringProperty(manufacturer);
|
||||
|
@ -45,6 +47,7 @@ public class Medication {
|
|||
this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects);
|
||||
this.administrationMethod = new SimpleStringProperty(administrationMethod);
|
||||
this.currentStock = new SimpleIntegerProperty(currentStock);
|
||||
this.alternativeMedication = new SimpleListProperty<>(FXCollections.observableArrayList(alternativeMedication));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -57,7 +60,8 @@ public class Medication {
|
|||
List<Ingredient> ingredients,
|
||||
String possibleSideEffects,
|
||||
String administrationMethod,
|
||||
int currentStock
|
||||
int currentStock,
|
||||
List<Medication> alternativeMedication
|
||||
) {
|
||||
this.id = new SimpleIntegerProperty(id);
|
||||
this.name = new SimpleStringProperty(name);
|
||||
|
@ -66,6 +70,7 @@ public class Medication {
|
|||
this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects);
|
||||
this.administrationMethod = new SimpleStringProperty(administrationMethod);
|
||||
this.currentStock = new SimpleIntegerProperty(currentStock);
|
||||
this.alternativeMedication = new SimpleListProperty<>(FXCollections.observableArrayList(alternativeMedication));
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
|
@ -124,6 +129,18 @@ public class Medication {
|
|||
this.possibleSideEffects.set(possibleSideEffects);
|
||||
}
|
||||
|
||||
public ObservableList<Medication> getAlternativeMedication() {
|
||||
return alternativeMedication.get();
|
||||
}
|
||||
|
||||
public SimpleListProperty<Medication> alternativeMedicationProperty() {
|
||||
return alternativeMedication;
|
||||
}
|
||||
|
||||
public void setAlternativeMedication(ObservableList<Medication> alternativeMedication) {
|
||||
this.alternativeMedication.set(alternativeMedication);
|
||||
}
|
||||
|
||||
public String getAdministrationMethod() {
|
||||
return administrationMethod.get();
|
||||
}
|
||||
|
@ -162,6 +179,7 @@ public class Medication {
|
|||
.add("Possible Side Effects: " + this.getPossibleSideEffects())
|
||||
.add("Administration Method: " + this.getAdministrationMethod())
|
||||
.add("Current Stock: " + this.getCurrentStock())
|
||||
.add("Alternative Medication" + this.getAlternativeMedication())
|
||||
.toString();
|
||||
}
|
||||
|
||||
|
|
|
@ -70,7 +70,8 @@ public class MedicationModalController {
|
|||
new ArrayList<>(),
|
||||
"",
|
||||
"",
|
||||
0
|
||||
0,
|
||||
new ArrayList<>()
|
||||
);
|
||||
this.buttonSave.setDisable(true);
|
||||
}
|
||||
|
@ -161,10 +162,11 @@ public class MedicationModalController {
|
|||
alternativeMediaction.add(new Medication(
|
||||
null,
|
||||
null,
|
||||
List.of(),
|
||||
new ArrayList<>(),
|
||||
null,
|
||||
null,
|
||||
-1
|
||||
-1,
|
||||
new ArrayList<>()
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,6 +63,18 @@ public class MedicationDao implements Dao<Medication> {
|
|||
ingredientStatement.setString(2, ingredient.getName());
|
||||
ingredientStatement.execute();
|
||||
}
|
||||
|
||||
final String alternativeMedicationSQL = """
|
||||
INSERT INTO medication_alternative
|
||||
(id, alternativeId)
|
||||
VALUES (?, ?);
|
||||
""";
|
||||
for (Medication alternative : medication.getAlternativeMedication()) {
|
||||
PreparedStatement alternativeStatement = this.connection.prepareStatement(alternativeMedicationSQL);
|
||||
alternativeStatement.setInt(1, newId);
|
||||
alternativeStatement.setInt(2, alternative.getId());
|
||||
alternativeStatement.execute();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -82,7 +94,7 @@ public class MedicationDao implements Dao<Medication> {
|
|||
@Override
|
||||
public List<Medication> readAll() throws SQLException {
|
||||
final String SQL = """
|
||||
SELECT medication.*, medication_ingredient.name
|
||||
SELECT medication.*, medication_ingredient.name, medication_alternative.alternativeId
|
||||
FROM medication LEFT JOIN
|
||||
medication_ingredient ON medication.id = medication_ingredient.id
|
||||
""";
|
||||
|
@ -103,7 +115,8 @@ public class MedicationDao implements Dao<Medication> {
|
|||
new ArrayList<>(),
|
||||
result.getString(4),
|
||||
result.getString(5),
|
||||
result.getInt(6)
|
||||
result.getInt(6),
|
||||
new ArrayList<>()
|
||||
);
|
||||
medications.add(medication);
|
||||
}
|
||||
|
@ -188,10 +201,11 @@ public class MedicationDao implements Dao<Medication> {
|
|||
result.getInt(1),
|
||||
result.getString(2),
|
||||
result.getString(3),
|
||||
List.of(),
|
||||
new ArrayList<>(),
|
||||
result.getString(4),
|
||||
result.getString(5),
|
||||
result.getInt(6)
|
||||
result.getInt(6),
|
||||
new ArrayList<>()
|
||||
);
|
||||
|
||||
List<Ingredient> ingredients = new ArrayList<>();
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
CREATE TABLE medication_alternative
|
||||
(
|
||||
id INTEGER NOT NULL ,
|
||||
alternativeId INTEGER NOT NULL ,
|
||||
FOREIGN KEY (id) REFERENCES medication (id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (alternativeId) REFERENCES medication (id) ON DELETE CASCADE
|
||||
)
|
Loading…
Reference in a new issue