diff --git a/src/main/java/de/uniluebeck/mi/projmi6/Main.java b/src/main/java/de/uniluebeck/mi/projmi6/Main.java index a6c0977..101f7ad 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/Main.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/Main.java @@ -1,6 +1,7 @@ package de.uniluebeck.mi.projmi6; import de.uniluebeck.mi.projmi6.controller.MainController; +import de.uniluebeck.mi.projmi6.model.Kasse; import de.uniluebeck.mi.projmi6.model.Mitarbeiter; import de.uniluebeck.mi.projmi6.model.OpsCode; import javafx.application.Application; @@ -47,6 +48,10 @@ public class Main extends Application { new OpsCode("876-3", "Darmspiegelung", 20) )); + mainController.setKassen(FXCollections.observableArrayList( + new Kasse(2, "TK", "Strasse 2", false) + )); + Mitarbeiter mitarbeiter = new Mitarbeiter(); mainController.setMitarbeiter(FXCollections.observableArrayList( mitarbeiter diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java index d9d5905..8a057b9 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -23,6 +23,9 @@ public class MainController { private SimpleObjectProperty> opsCodes = new SimpleObjectProperty<>(); private SimpleObjectProperty> icd10Codes = new SimpleObjectProperty<>(); + private SimpleObjectProperty> mitarbeiter = new SimpleObjectProperty<>(); + private SimpleObjectProperty> kassen = new SimpleObjectProperty<>(); + public ObservableList getMitarbeiter() { return mitarbeiter.get(); @@ -36,8 +39,6 @@ public class MainController { this.mitarbeiter.set(mitarbeiter); } - private SimpleObjectProperty> mitarbeiter = new SimpleObjectProperty<>(); - public ObservableList getKassen() { return kassen.get(); } @@ -50,7 +51,6 @@ public class MainController { this.kassen.set(kassen); } - private SimpleObjectProperty> kassen = new SimpleObjectProperty<>(); private int parallelTaskCount = 0; @@ -62,8 +62,11 @@ public class MainController { private ProgressIndicator progressIndicator; @FXML private Button btnFallCreate; + @FXML private SplitPane fallOverview; + + private Callback, Object> controllerFactory = clazz -> { if(clazz.equals(MainController.class)) { return this; @@ -170,6 +173,8 @@ public class MainController { private void initialize(){ fallOverview.disableProperty().bind(patientTablesController.selectedPatientProperty().isNull()); cmbUserChoose.itemsProperty().bind(this.mitarbeiterProperty()); + + } } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java index 00ac2da..8f07e36 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java @@ -3,6 +3,7 @@ package de.uniluebeck.mi.projmi6.controller; /** * Created by 631806 on 12.11.15. */ +import de.uniluebeck.mi.projmi6.model.Kasse; import de.uniluebeck.mi.projmi6.model.Patient; import javafx.collections.FXCollections; import javafx.fxml.FXML; @@ -17,6 +18,7 @@ public class PatientEditorController { */ private Patient patient = null; + private MainController mainController; @FXML private Label patChangeTime; @@ -57,7 +59,7 @@ public class PatientEditorController { @FXML private TextField patVersicherungsnummer; @FXML - private ComboBox patVersicherung; + private ComboBox patVersicherung; @FXML private TextArea patCave; @@ -72,10 +74,17 @@ public class PatientEditorController { public void initialize(){ patGeschlecht.setItems(FXCollections.observableArrayList(Patient.Geschlecht.values())); patFamilienstand.setItems(FXCollections.observableArrayList(Patient.Familienstand.values())); + patVersicherung.setItems(mainController.getKassen()); + } + public PatientEditorController(MainController mainController){ + this.mainController = mainController; } + + + public void setPatient(Patient patient){ this.patient = patient; if(patient==null){ diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java index 3a24bc3..8524087 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java @@ -3,6 +3,7 @@ package de.uniluebeck.mi.projmi6.controller; /** * Created by Johannes on 12.11.15. */ +import de.uniluebeck.mi.projmi6.db.DBHandler; import de.uniluebeck.mi.projmi6.model.Patient; import javafx.beans.binding.Bindings; import javafx.beans.binding.ObjectBinding; @@ -23,6 +24,7 @@ import javafx.stage.Stage; import java.io.IOException; import java.rmi.server.ExportException; +import java.sql.SQLException; import java.time.LocalDate; /** @@ -133,20 +135,13 @@ public class PatientTablesController{ lblTableStationEmpty.setText("Daten werden geladen..."); - ObservableList patientList = FXCollections.observableArrayList(); - - Patient patient = new Patient(); - patient.setPatID(1337); - patient.setNachname("Mustermann"); - patient.setVorname("Max"); - patient.setGeburtsdatum(LocalDate.of(1990, 12, 12)); - patient.setStrasse("Beckergrube"); - patient.setHausnummer("20"); - patient.setPlz("23552"); - patient.setOrt("Luebeck"); - patient.setCave("voellig langweilig"); + ObservableList patientList = null; + try { + patientList = FXCollections.observableArrayList(DBHandler.getAllPatients()); + } catch (SQLException e) { + e.printStackTrace(); + } - patientList.add(patient); tblPatientOverview.setItems(patientList); @@ -183,12 +178,15 @@ public class PatientTablesController{ private void showEditWindow(Patient patient){ FXMLLoader fxmlLoader = new FXMLLoader(); fxmlLoader.setLocation(getClass().getClassLoader().getResource("patient_edit.fxml")); + PatientEditorController patientEditorController = new PatientEditorController(mainController); + fxmlLoader.setControllerFactory(clazz -> patientEditorController); Parent root = null; try{ root = fxmlLoader.load(); }catch (IOException e){ e.printStackTrace(); + return; } Stage stage = new Stage(); @@ -200,7 +198,6 @@ public class PatientTablesController{ stage.initModality(Modality.WINDOW_MODAL); stage.initOwner(btnPatEdit.getScene().getWindow()); - PatientEditorController patientEditorController = (PatientEditorController)fxmlLoader.getController(); patientEditorController.setPatient(patient); stage.show(); } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java index 9b624ae..ae77eec 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java @@ -15,7 +15,7 @@ public class DBHandler { public static final String SELECT_ALL_PATIENTS = "SELECT * FROM `patient`"; - public List getAllPatients() throws SQLException { + public static List getAllPatients() throws SQLException { Statement statement = null; ResultSet rs = null; statement = MySqlConnFactory.getConnection().createStatement(); diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Kasse.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Kasse.java index a43a0b2..df2a8b1 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Kasse.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Kasse.java @@ -12,6 +12,18 @@ public class Kasse { private SimpleStringProperty name = new SimpleStringProperty(this, "name"); private SimpleBooleanProperty privat = new SimpleBooleanProperty(this, "privat"); + public Kasse(){ + + } + + + public Kasse(int id, String name, String adresse, boolean privat){ + kassenID.set(id); + this.name.set(name); + this.adresse.set(adresse); + this.privat.set(privat); + } + public String getAdresse() { return adresse.get(); } @@ -59,4 +71,9 @@ public class Kasse { public void setPrivat(boolean privat) { this.privat.set(privat); } + + @Override + public String toString() { + return getName() + " (" +(getPrivat()?"privat":"gesetzlich")+")" ; + } } diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml index d26217b..c518c17 100644 --- a/src/main/resources/main.fxml +++ b/src/main/resources/main.fxml @@ -27,6 +27,7 @@