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 68679a3..4dd8b43 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -9,6 +9,8 @@ import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.util.Callback; +import java.util.ArrayList; +import java.util.List; import java.util.Set; public class MainController { @@ -192,13 +194,20 @@ public class MainController { @FXML private void initialize(){ - fallOverview.disableProperty().bind(patientTablesController.selectedPatientProperty().isNull()); cmbUserChoose.itemsProperty().bind(this.mitarbeiterProperty()); + + fallOverview.disableProperty().bind(patientTablesController.selectedPatientProperty().isNull()); + + patientTablesController.selectedPatientProperty().addListener((observableValue,oldValue,newValue)-> { - try { - lvFall.setItems(FXCollections.observableArrayList(DBHandler.getFaelleByPatID(newValue.getPatID()))); + System.out.println("Neuer Patient gewaehlt"); + try { + List faelle = DBHandler.getFaelleByPatID(newValue.getPatID()); + System.out.println(faelle); + System.out.println("Liste der Faelle hat "+ faelle.size()+ " Eintrage "); + lvFall.setItems(FXCollections.observableArrayList(faelle)); }catch (Exception e){ - + e.printStackTrace(); } }); 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 21d6759..0cfbd58 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java @@ -146,6 +146,14 @@ public class PatientTablesController{ } + patientObjectBinding = Bindings.createObjectBinding(() ->{ + return patientOverviewTabPane.getSelectionModel().getSelectedItem().equals(patientOverviewTab) + ? tblPatientOverview.getSelectionModel().getSelectedItem() + : null; //(Patient)tblStationOverview.getSelectionModel().getSelectedItem(); //TODO + }, tblPatientOverview.getSelectionModel().selectedItemProperty(), + tblStationOverview.getSelectionModel().selectedItemProperty(), + patientOverviewTabPane.getSelectionModel().selectedItemProperty()); + tblPatientOverview.setItems(patientList); initColumnsPatient(); @@ -216,16 +224,10 @@ public class PatientTablesController{ } - public ObjectBinding selectedPatientProperty(){ - - return Bindings.createObjectBinding(() ->{ - return patientOverviewTabPane.getSelectionModel().getSelectedItem().equals(patientOverviewTab) - ? tblPatientOverview.getSelectionModel().getSelectedItem() - : null; //(Patient)tblStationOverview.getSelectionModel().getSelectedItem(); //TODO - }, tblPatientOverview.getSelectionModel().selectedItemProperty(), - tblStationOverview.getSelectionModel().selectedItemProperty(), - patientOverviewTabPane.getSelectionModel().selectedItemProperty()); + private ObjectBinding patientObjectBinding = null; + public ObjectBinding selectedPatientProperty(){ + return patientObjectBinding; } public Patient getSelectedPatient(){