Merge remote-tracking branch 'origin/master'

src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java

@@ -5,14 +5,13 @@ package de.uniluebeck.mi.projmi6.controller;
  */
 
 import de.uniluebeck.mi.projmi6.model.*;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
+import javafx.scene.control.*;
 import javafx.event.ActionEvent;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
 
 public class DiagnoseController {
 
@@ -22,11 +21,33 @@ public class DiagnoseController {
         this.mainController = mainController;
     }
 
+
+    public ObservableList<Diagnose> getDiagnosen() {
+        return diagnosen.get();
+    }
+
+    public SimpleObjectProperty<ObservableList<Diagnose>> diagnosenProperty() {
+        return diagnosen;
+    }
+
+    public void setDiagnosen(ObservableList<Diagnose> diagnosen) {
+        this.diagnosen.set(diagnosen);
+    }
+
+    private SimpleObjectProperty<ObservableList<Diagnose>> diagnosen = new SimpleObjectProperty<>();
+
+
+
+    @FXML
+    private ListView diagnoseList;
+
     @FXML
     public void initialize(){
         diagDiagnose.itemsProperty().bind(mainController.icd10CodesProperty());
         diagDiagnoseArt.setItems(FXCollections.observableArrayList(DiagArt.values()));
         diagDiagnoseArzt.itemsProperty().bind(mainController.mitarbeiterProperty());
+        diagnoseList.itemsProperty().bind(diagnosen);
+
     }
 
 

src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java

@@ -237,11 +237,18 @@ public class MainController {
         lvFall.getSelectionModel().selectedItemProperty().addListener(((observable, oldValue, newValue) -> {
             System.out.println("Changed choosen Fall");
 
-            if(newValue==null) return;
+            if(newValue==null) {
+                System.out.println("TODO: Clear tables cuz fall = null!");
+                return;
+            }
             try {
                 List<Untersuchung> untersuchungList = DBHandler.getUntersuchungByFall(newValue);
                 System.out.println("untersuchungenList"+untersuchungList);
                 untersuchungenController.untersuchungenProperty().set(FXCollections.observableArrayList(untersuchungList));
+
+                List<Diagnose> diagnoseList = DBHandler.getDiagnosenByFall(newValue);
+                System.out.println("diagnoseList ="+diagnoseList);
+                diagnoseController.diagnosenProperty().set(FXCollections.observableArrayList(diagnoseList));
             }catch(Exception e){
                 e.printStackTrace();
             }

src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java

@@ -78,6 +78,8 @@ public class UntersuchungenController {
     @FXML
     public void initialize(){
         untsOpsCode.itemsProperty().bind(mainController.opsCodesProperty());
+        untsList.itemsProperty().bind(untersuchungen);
+
     }
 
     @FXML

src/main/java/de/uniluebeck/mi/projmi6/model/Untersuchung.java

@@ -62,6 +62,11 @@ public class Untersuchung extends Version {
         return untersuchungsdatum;
     }
 
+    @Override
+    public String toString() {
+        return getUntersuchungsdatum()+": "+getOpscode().getText();
+    }
+
     public void setUntersuchungsdatum(LocalDateTime untersuchungsdatum) {
         this.untersuchungsdatum.set(untersuchungsdatum);
     }

src/main/resources/diagnose.fxml

@@ -17,7 +17,7 @@
 	                    <Button fx:id="btnDiagCreate" mnemonicParsing="false" onAction="#clickedDiagCreate" text="Neue Diagnose erstellen" />
 	                </items>
 	            </ToolBar>
-	            <ListView prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+	            <ListView prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" fx:id="diagnoseList"/>
 	        </children>
 	    </VBox>
 	    <VBox>