From c3854629c38b14caa114cee863491808d5abe628 Mon Sep 17 00:00:00 2001 From: Johannes Oehm Date: Sun, 15 Nov 2015 16:31:04 +0100 Subject: [PATCH] FallController Anbindung Fall MySql text --- src/main/java/de/uniluebeck/mi/projmi6/Main.java | 3 +- .../mi/projmi6/controller/DiagnoseController.java | 4 +- .../mi/projmi6/controller/FallController.java | 116 +++++++++++++++++---- .../mi/projmi6/controller/MainController.java | 8 +- .../java/de/uniluebeck/mi/projmi6/model/Fall.java | 9 +- src/main/resources/fall.fxml | 10 +- 6 files changed, 119 insertions(+), 31 deletions(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/Main.java b/src/main/java/de/uniluebeck/mi/projmi6/Main.java index d4937da..18cd949 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/Main.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/Main.java @@ -53,9 +53,8 @@ public class Main extends Application { new Kasse(2, "TK", "Strasse 2", false) )); - Mitarbeiter mitarbeiter = new Mitarbeiter(); mainController.setMitarbeiter(FXCollections.observableArrayList( - mitarbeiter + //TODO )); mainController.setStationen(FXCollections.observableArrayList(DBHandler.getAllStationen())); diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java index 798f74f..d3b1595 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java @@ -98,9 +98,9 @@ public class DiagnoseController { private void copyDiagnoseDataIntoFields(){ diagDiagnoseArzt.setValue(diagnose.getArzt()); - diagFreitext.setText(diagnose.getFreitext()); + //diagFreitext.setText(diagnose.getFreitext()); diagDiagnoseArt.setValue(diagnose.getDiagArt()); - diagDiagnose.setValue(diagnose.getIcd10Code()); + //diagDiagnose.setValue(diagnose.getIcd10Code()); diagCreator.setText(Integer.toString(diagnose.getErsteller())); diagCreateTime.setText(diagnose.getErstellDatumZeit().toString()); diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java index 25f3317..23137e3 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java @@ -3,10 +3,12 @@ package de.uniluebeck.mi.projmi6.controller; /** * Created by 631806 on 12.11.15. */ +import de.uniluebeck.mi.projmi6.model.Diagnose; import de.uniluebeck.mi.projmi6.model.Fall; import de.uniluebeck.mi.projmi6.model.FallArt; import de.uniluebeck.mi.projmi6.model.Kasse; import de.uniluebeck.mi.projmi6.view.DateTimePicker; +import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -42,13 +44,17 @@ public class FallController { @FXML private TextField fallEinweisenderArzt; - @FXML private CheckBox fallSelbsteinweisung; + + @FXML - private Label fallCreator; + private ComboBox fallHauptdiagnose; + @FXML + private Label fallCreator; + @FXML private Label fallEditor; @FXML private Label fallCreateTime; @@ -68,36 +74,73 @@ public class FallController { private GridPane fallFields; + private SimpleObjectProperty fallProperty = new SimpleObjectProperty<>(); + + public Fall getFallProperty() { + return fallProperty.get(); + } + + public SimpleObjectProperty fallPropertyProperty() { + return fallProperty; + } + + public void setFallProperty(Fall fallProperty) { + this.fallProperty.set(fallProperty); + } + public enum State { CREATE, EDIT, VIEW } + SimpleObjectProperty state = new SimpleObjectProperty<>(State.VIEW); + @FXML public void initialize(){ fallEinweisenderArzt.disableProperty().bind(fallSelbsteinweisung.selectedProperty()); fallFallart.setItems(FXCollections.observableArrayList(FallArt.values())); fallKasse.setItems(mainController.getKassen()); - } - @FXML - void clickedFallAufnNow(ActionEvent event) { + btnFallEnableEdit.visibleProperty().bind( + state.isEqualTo(State.VIEW).and(fallProperty.isNotNull()) + ); + btnFallAbort.visibleProperty().bind( + state.isNotEqualTo(State.VIEW) + ); + btnFallSave.visibleProperty().bind( + state.isEqualTo(State.VIEW) + ); + + btnFallCancel.visibleProperty().bind( + state.isEqualTo(State.VIEW).and(fallProperty.isNotNull()) + ); + + + fallFields.disableProperty().bind(state.isEqualTo(State.VIEW)); + fallProperty.addListener(((observable, oldValue, newValue) -> { + if(state.get() == State.VIEW){ + copyFallDataIntoField(fallProperty.get()); + } + })); } - @FXML - void clickedFallEntlNow(ActionEvent event) { + + public void editFall(){ + this.state.set(State.EDIT); } + @FXML void clickedFallEnableEdit(ActionEvent event) { - + editFall(); } @FXML void clickedFallCancel(ActionEvent event) { - + this.state.set(State.VIEW); + copyFallDataIntoField(fallProperty.get()); } @FXML @@ -112,20 +155,10 @@ public class FallController { public void createNewFall() { clearFields(); - - setEditable(true); - - - btnFallSave.setVisible(true); - btnFallAbort.setVisible(true); - btnFallCancel.setVisible(false); - btnFallEnableEdit.setVisible(false); + this.state.set(State.CREATE); } - private void setEditable(boolean editable){ - fallFields.setDisable(!editable); - } private void clearFields(){ @@ -145,13 +178,56 @@ public class FallController { fallVersichertennummer.setText(""); fallKasse.setValue(null); + fallHauptdiagnose.setValue(null); + fallHauptdiagnose.setItems(null); fallFallart.setValue(null); } private void copyFieldDataIntoFall(Fall fall){ + if(fall==null){ + clearFields(); + return; + } + fall.setAufnahmeDatum(dtTmAufnahme.getDateTime()); fall.setEntlassungsDatum(dtTmEntlassung.getDateTime()); + if(fallSelbsteinweisung.isSelected()) { + fall.setSelbsteinweisung(true); + fall.setEinweisenderArzt(null); + }else{ + // fall.setEinweisenderArzt(fallEinweisenderArzt.getText()); TODO + fall.setSelbsteinweisung(false); + } + fall.setVersichertenNummer(fallVersichertennummer.getText()); + fall.setKasse(fallKasse.getValue()); + fall.setFallArt(fallFallart.getValue()); + + //fall.setVorstellDatum(); //TODO + } + + + private void copyFallDataIntoField(Fall fall){ + dtTmAufnahme.setDateTime(fall.getAufnahmeDatum()); + dtTmEntlassung.setDateTime(fall.getEntlassungsDatum()); + + //fallPatID.setText(fall.getPatient().getVorname()+" "+fall.getPatient().getNachname()); //TODO + + fallCreateTime.setText(fall.getErstellDatumZeit().toString()); + fallCreator.setText(Integer.toString(fall.getErsteller())); + fallEditTime.setText(fall.getBearbeitetDatumZeit().toString()); + fallEditor.setText(Integer.toString(fall.getBearbeiter())); + + // fallEinweisenderArzt.setText(fall.getEinweisenderArzt()); + fallSelbsteinweisung.setSelected(fall.getSelbsteinweisung()); + + fallVersichertennummer.setText(fall.getVersichertenNummer()); + fallKasse.setValue(fall.getKasse()); + + //fallHauptdiagnose.setValue(fall.getHauptDiagnose()); TODO + // fallHauptdiagnose.setItems(fall.getD); TODO + + //fallFallart.setValue(fall.getFallArt()); } } 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 2155122..68679a3 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -195,9 +195,15 @@ public class MainController { fallOverview.disableProperty().bind(patientTablesController.selectedPatientProperty().isNull()); cmbUserChoose.itemsProperty().bind(this.mitarbeiterProperty()); patientTablesController.selectedPatientProperty().addListener((observableValue,oldValue,newValue)-> { - //lvFall.setItems(FXCollections.observableArrayList(DBHandler.getFallsForPatientId(newValue.getPatID()))); + try { + lvFall.setItems(FXCollections.observableArrayList(DBHandler.getFaelleByPatID(newValue.getPatID()))); + }catch (Exception e){ + + } }); + + } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Fall.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Fall.java index 4b9fbd4..4831479 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Fall.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Fall.java @@ -16,7 +16,7 @@ public class Fall extends Version { private Kasse kasse; private Diagnose hauptDiagnose; private Mitarbeiter einweisenderArzt; - private Enum fallArt; + private FallArt fallArt; private SimpleBooleanProperty selbsteinweisung = new SimpleBooleanProperty(this, "selbsteinweisung"); private SimpleStringProperty versichertenNummer = new SimpleStringProperty(this, "versichertenNummer"); private SimpleBooleanProperty storniert = new SimpleBooleanProperty(this, "storniert"); @@ -99,7 +99,12 @@ public class Fall extends Version { return fallArt; } - public void setFallArt(Enum fallArt) { + @Override + public String toString() { + return getAufnahmeDatum().toString(); + } + + public void setFallArt(FallArt fallArt) { this.fallArt = fallArt; } diff --git a/src/main/resources/fall.fxml b/src/main/resources/fall.fxml index 6e740f0..b8d4f48 100644 --- a/src/main/resources/fall.fxml +++ b/src/main/resources/fall.fxml @@ -46,15 +46,17 @@ +