From 3954c9491ae0dd003625faad0dc63541b85ed859 Mon Sep 17 00:00:00 2001 From: Johannes Oehm Date: Thu, 19 Nov 2015 17:19:23 +0100 Subject: [PATCH] =?UTF-8?q?Button=20f=C3=BCr=20Senden=20von=20HL7-Nachrich?= =?UTF-8?q?ten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mi/projmi6/controller/FallController.java | 28 ++++++++++++++++++++-- .../mi/projmi6/controller/MainController.java | 28 +++++++++++++++++++++- src/main/resources/fall.fxml | 19 +++++++++++---- 3 files changed, 67 insertions(+), 8 deletions(-) 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 c66d77f..58c8536 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java @@ -114,6 +114,7 @@ public class FallController { fallKasse.setItems(mainController.getStammdaten().getKassen()); + initButtons(); fallFields.disableProperty().bind(state.isEqualTo(State.VIEW)); @@ -156,8 +157,23 @@ public class FallController { state.isEqualTo(State.VIEW).and(fallProperty.isNotNull()) ); btnFallCancel.visibleProperty().bind(btnFallCancel.managedProperty()); + + btnFallSendHl7.managedProperty().bind( + state.isEqualTo(State.VIEW).and(fallProperty.isNotNull()) + ); + btnFallSendHl7.visibleProperty().bind(btnFallSendHl7.managedProperty()); } + @FXML + Button btnFallSendHl7; + + @FXML + private void clickedSendHl7(){ + /* Natascha */ + //TODO send funny message + Fall fall = fallProperty.get(); + Patient patient = mainController.getPatientTablesController().getSelectedPatient(); + } public void editFall(){ this.state.set(State.EDIT); @@ -171,7 +187,15 @@ public class FallController { @FXML void clickedFallCancel(ActionEvent event) { - //Fall Stornieren... + if(fallProperty.get()!=null){ + fallProperty.get().setStorniert(true); + try { + DBHandler.setFall(fallProperty.get(), mainController.getCurrentMitarbeiter().getMitarbID(), true); + }catch (Exception e){ + e.printStackTrace(); + } + mainController.refreshCasesFromDb(mainController.getPatientTablesController().getSelectedPatient()); + } } @FXML @@ -281,7 +305,7 @@ public class FallController { dtTmAufnahme.setDateTime(fall.getAufnahmeDatum()); dtTmEntlassung.setDateTime(fall.getEntlassungsDatum()); - fallPatID.setText(fallProperty.get().getPatient()+""); //(fall.getPatient().getVorname()+" "+fall.getPatient().getNachname()); //TODO + fallPatID.setText(fallProperty.get().getPatient() + ""); //(fall.getPatient().getVorname()+" "+fall.getPatient().getNachname()); //TODO fallCreateTime.setText(fall.getErstellDatumZeit() !=null ? fall.getErstellDatumZeit().toString():""); fallCreator.setText(Integer.toString(fall.getErsteller())); 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 99a3fbb..0e6972e 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -11,6 +11,8 @@ import javafx.collections.ObservableList; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.paint.Color; +import javafx.scene.text.Text; import javafx.util.Callback; import javax.swing.*; @@ -215,9 +217,33 @@ public class MainController { fallController.fallPropertyProperty().bind(lvFall.getSelectionModel().selectedItemProperty()); - lvFall.getSelectionModel().selectedItemProperty().addListener((observableValue, oldValue, newValue) ->{ + lvFall.getSelectionModel().selectedItemProperty().addListener((observableValue, oldValue, newValue) -> { refreshCaseData(newValue); }); + + lvFall.setCellFactory(lv -> { + return new ListCell() { + @Override + protected void updateItem(Fall item, boolean empty) { + super.updateItem(item, empty); + if (item == null || empty) { + this.setText(null); + this.setGraphic(null); + return; + } + setText(item.toString()); + if (item.getStorniert()) { + System.out.println("Storniertes Item"); + setGraphic(new Label(" ")); + setTextFill(Color.GRAY); //TODO + } else { + setTextFill(Color.BLACK); + setGraphic(null); + } + } + }; + }); + } diff --git a/src/main/resources/fall.fxml b/src/main/resources/fall.fxml index a76114f..728b3af 100644 --- a/src/main/resources/fall.fxml +++ b/src/main/resources/fall.fxml @@ -67,7 +67,16 @@ - +