From 56ee690dcab67163748b1225a72d45958c903c62 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 12 Nov 2015 23:01:34 +0100 Subject: [PATCH] Variablenname Stationshistorie; Icon; Binding an Patiententabelle Basics --- src/main/java/de/uniluebeck/mi/projmi6/Main.java | 3 +- .../mi/projmi6/controller/FallController.java | 5 + .../mi/projmi6/controller/MainController.java | 12 +- .../controller/PatientTablesController.java | 169 +++++++++++++-------- .../controller/StationsHistorieController.java | 31 ++++ src/main/resources/diagnose.fxml | 8 +- src/main/resources/fall.fxml | 3 +- src/main/resources/icon.png | Bin 0 -> 27766 bytes src/main/resources/main.fxml | 2 +- src/main/resources/patient_tables.fxml | 12 +- src/main/resources/stationshistorie.fxml | 32 ++-- 11 files changed, 181 insertions(+), 96 deletions(-) create mode 100644 src/main/resources/icon.png diff --git a/src/main/java/de/uniluebeck/mi/projmi6/Main.java b/src/main/java/de/uniluebeck/mi/projmi6/Main.java index c0a84f5..0cf6ad0 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/Main.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/Main.java @@ -5,6 +5,7 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.Stage; public class Main extends Application { @@ -19,7 +20,7 @@ public class Main extends Application { MainController mainController = new MainController(); fxmlLoader.setControllerFactory(mainController.getControllerFactory()); - + primaryStage.getIcons().add(new Image("icon.png")); Parent root = fxmlLoader.load(); primaryStage.setTitle("KIS Gruppe 06"); 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 6012f25..cf6341b 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java @@ -21,6 +21,11 @@ public class FallController { } @FXML + public void initialize(){ + fallEinweisenderArzt.disableProperty().bind(fallSelbsteinweisung.selectedProperty()); + } + + @FXML private Button btnFallAufnNow; @FXML 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 d211963..5633fef 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -2,9 +2,7 @@ package de.uniluebeck.mi.projmi6.controller; import de.uniluebeck.mi.projmi6.model.Mitarbeiter; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.ChoiceBox; -import javafx.scene.control.ProgressIndicator; +import javafx.scene.control.*; import javafx.util.Callback; import java.util.Set; @@ -27,6 +25,8 @@ public class MainController { private ProgressIndicator progressIndicator; @FXML private Button btnFallCreate; + @FXML + private SplitPane fallOverview; private Callback, Object> controllerFactory = clazz -> { if(clazz.equals(MainController.class)) { @@ -66,6 +66,8 @@ public class MainController { } + + public Callback, Object> getControllerFactory(){ return controllerFactory; } @@ -114,8 +116,8 @@ public class MainController { @FXML - private void init(){ - + private void initialize(){ + fallOverview.disableProperty().bind(patientTablesController.selectedPatientProperty().isNull()); } 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 d645afc..667ec03 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java @@ -5,6 +5,10 @@ package de.uniluebeck.mi.projmi6.controller; */ import de.uniluebeck.mi.projmi6.model.Patient; import javafx.beans.binding.Bindings; +import javafx.beans.binding.ObjectBinding; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyObjectProperty; +import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -13,6 +17,8 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.image.Image; +import javafx.stage.Modality; import javafx.stage.Stage; import java.io.IOException; @@ -26,6 +32,85 @@ public class PatientTablesController{ private MainController mainController; + @FXML + private Label lblTablePatientEmpty; + + @FXML + private Label lblTableStationEmpty; + + @FXML + private Button btnPatCreate; + + @FXML + private Button btnPatEdit; + + @FXML + private TableView tblPatientOverview; + + @FXML + private TableColumn colPatPatId; + + @FXML + private TableColumn colPatGeburtsname; + + @FXML + private TableColumn colPatNachname; + + @FXML + private TableColumn colPatVorname; + + @FXML + private TableColumn colPatGebDatum; + + @FXML + private TableColumn colPatStrasse; + + @FXML + private TableColumn colPatPlz; + + @FXML + private TableColumn colPatOrt; + + @FXML + private TableColumn colPatCave; + + + + + @FXML + private ToggleButton btnEntlassenePatientenZeigen; + + @FXML + private ComboBox cmbStationenFilter; + + @FXML + private TableView tblStationOverview; + + @FXML + private TableColumn colStatPatId; + + @FXML + private TableColumn colStatFullName; + + @FXML + private TableColumn colStatGebDatum; + + @FXML + private TableColumn colStatAlter; + + @FXML + private TableColumn colStatAufnahmedatum; + + @FXML + private TableColumn colStatEntlassungsdatum; + + @FXML + private Tab stationOverviewTab, patientOverviewTab; + + @FXML + private TabPane patientOverviewTabPane; + + public PatientTablesController(MainController mainController){ this.mainController = mainController; } @@ -44,6 +129,9 @@ public class PatientTablesController{ }); return tableRow; }); + lblTablePatientEmpty.setText("Liste ist leer."); + lblTableStationEmpty.setText("Daten werden geladen..."); + ObservableList patientList = FXCollections.observableArrayList(); @@ -65,7 +153,6 @@ public class PatientTablesController{ initColumns(); } - private void initColumns(){ colPatPatId.setCellValueFactory(cellDataFeatures -> cellDataFeatures.getValue().patIDProperty().asString()); colPatGeburtsname.setCellValueFactory(new PropertyValueFactory<>("geburtsname")); @@ -81,6 +168,7 @@ public class PatientTablesController{ colPatCave.setCellValueFactory(new PropertyValueFactory<>("cave")); } + @FXML private void clickedCreatePatient (){ showEditWindow(null); @@ -92,7 +180,6 @@ public class PatientTablesController{ showEditWindow(tblPatientOverview.getSelectionModel().getSelectedItem()); } - private void showEditWindow(Patient patient){ FXMLLoader fxmlLoader = new FXMLLoader(); fxmlLoader.setLocation(getClass().getClassLoader().getResource("patient_edit.fxml")); @@ -109,75 +196,29 @@ public class PatientTablesController{ stage.setTitle(patient==null ? "Neuen Patienten erstellen": "Patient bearbeiten"); stage.setScene(new Scene(root, 600, 600)); + stage.getIcons().add(new Image("icon.png")); + + stage.initModality(Modality.WINDOW_MODAL); + stage.initOwner(btnPatEdit.getScene().getWindow()); PatientEditorController patientEditorController = (PatientEditorController)fxmlLoader.getController(); patientEditorController.setPatient(patient); stage.show(); } - @FXML - private Button btnPatCreate; - - @FXML - private Button btnPatEdit; - - @FXML - private TableView tblPatientOverview; - - @FXML - private TableColumn colPatPatId; - - @FXML - private TableColumn colPatGeburtsname; - - @FXML - private TableColumn colPatNachname; - - @FXML - private TableColumn colPatVorname; - - @FXML - private TableColumn colPatGebDatum; - - @FXML - private TableColumn colPatStrasse; - - @FXML - private TableColumn colPatPlz; - - @FXML - private TableColumn colPatOrt; - - @FXML - private TableColumn colPatCave; - - - - - @FXML - private ToggleButton btnEntlassenePatientenZeigen; - - @FXML - private ComboBox cmbStationenFilter; - - @FXML - private TableView tblStationOverview; - - @FXML - private TableColumn colStatPatId; - - @FXML - private TableColumn colStatFullName; - - @FXML - private TableColumn colStatGebDatum; - @FXML - private TableColumn colStatAlter; + public ObjectBinding selectedPatientProperty(){ - @FXML - private TableColumn colStatAufnahmedatum; + return Bindings.createObjectBinding(() ->{ + return patientOverviewTabPane.getSelectionModel().getSelectedItem().equals(patientOverviewTab) + ? tblPatientOverview.getSelectionModel().getSelectedItem() + : (Patient)tblStationOverview.getSelectionModel().getSelectedItem(); //TODO + }, tblPatientOverview.getSelectionModel().selectedItemProperty(), + tblStationOverview.getSelectionModel().selectedItemProperty(), + patientOverviewTabPane.getSelectionModel().selectedItemProperty()); + } - @FXML - private TableColumn colStatEntlassungsdatum; + public Patient getSelectedPatient(){ + return selectedPatientProperty().get(); + } } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java index bd1b79e..ec0ae1c 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java @@ -1,16 +1,47 @@ package de.uniluebeck.mi.projmi6.controller; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; + /** * Created by 631806 on 12.11.15. */ public class StationsHistorieController { private MainController mainController; + @FXML + private TableViewtblStationsHistorie; + + @FXML + private Button btnStatHistCancel, btnStatHistSave; + + @FXML + private Label statHistCreator, statHistCreatTime, statHistEditor, statHistEditTime; + + @FXML + private TableColumn colStatHistAbteilung, colStatHistStation, colStatHistAufnahmeDatum, colStatHistEntlassungsDatum; public StationsHistorieController(MainController mainController){ this.mainController = mainController; } + @FXML + private void clickedCancel(){ + + } + + @FXML + private void clickedSave(){ + + } + + @FXML + private void clickedCreateAufenthalt(){ + + } } diff --git a/src/main/resources/diagnose.fxml b/src/main/resources/diagnose.fxml index 9c1adc7..afc557a 100644 --- a/src/main/resources/diagnose.fxml +++ b/src/main/resources/diagnose.fxml @@ -66,10 +66,10 @@