diff --git a/src/main/java/de/uniluebeck/mi/projmi6/Main.java b/src/main/java/de/uniluebeck/mi/projmi6/Main.java index 7e91a76..f4505e0 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/Main.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/Main.java @@ -1,5 +1,6 @@ package de.uniluebeck.mi.projmi6; +import de.uniluebeck.mi.projmi6.controller.MainController; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -10,8 +11,18 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception { - Parent root = FXMLLoader.load(getClass().getClassLoader().getResource("main.fxml")); - primaryStage.setTitle("Hello World"); + System.out.println(getClass().getClassLoader().getResource("").toExternalForm()); + + FXMLLoader fxmlLoader = new FXMLLoader(); + fxmlLoader.setLocation(getClass().getClassLoader().getResource("main.fxml")); + + MainController mainController = new MainController(); + fxmlLoader.setControllerFactory(mainController.getControllerFactory()); + + + Parent root = fxmlLoader.load(); + + primaryStage.setTitle("KIS Gruppe 06"); primaryStage.setScene(new Scene(root, 800, 600)); primaryStage.show(); } 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 305d63d..49e7f7e 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java @@ -7,6 +7,7 @@ package de.uniluebeck.mi.projmi6.controller; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; +import javafx.event.ActionEvent; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.TextArea; 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 8f9595a..e8f59a2 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,14 @@ package de.uniluebeck.mi.projmi6.controller; /** * Created by 631806 on 12.11.15. */ - import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.*; +import javafx.scene.control.Button; +import javafx.scene.control.CheckBox; +import javafx.scene.control.ComboBox; +import javafx.scene.control.DatePicker; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; public class FallController { 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 e5e5531..806641a 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -4,14 +4,55 @@ import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; import javafx.scene.control.ProgressIndicator; +import javafx.util.Callback; + +import java.util.Set; public class MainController { private FallController fallController; + private DiagnoseController diagnoseController; + private PatientEditorController patientEditorController; + private PatientTablesController patientTablesController; + private SettingsController settingsController; + private UntersuchungenController untersuchungenController; + private StationsHistorieController stationsHistorieController; public MainController(){ fallController = new FallController(); + diagnoseController = new DiagnoseController(); + patientEditorController = new PatientEditorController(); + patientTablesController = new PatientTablesController(); + settingsController = new SettingsController(); + untersuchungenController = new UntersuchungenController(); + stationsHistorieController = new StationsHistorieController(); + } + + public Callback, Object> getControllerFactory(){ + return clazz -> { + if(clazz.equals(MainController.class)) { + return this; + }else if(clazz.equals(FallController.class)){ + return fallController; + }else if(clazz.equals(DiagnoseController.class)){ + return diagnoseController; + }else if(clazz.equals(PatientEditorController.class)) { + return patientEditorController; + }else if(clazz.equals(PatientTablesController.class)){ + return patientTablesController; + }else if(clazz.equals(SettingsController.class)){ + return settingsController; + } else if(clazz.equals(UntersuchungenController.class)) { + return untersuchungenController; + }else if(clazz.equals(StationsHistorieController.class)){ + return stationsHistorieController; + }else { + System.err.println("Keine Controller-Klasse des Typs "+clazz+" gefunden!!!"); + return null; + } + + }; } @@ -19,6 +60,27 @@ public class MainController { return fallController; } + public DiagnoseController getDiagnoseController(){ + return diagnoseController; + } + + public PatientEditorController getPatientEditorController(){ + return patientEditorController; + } + + public PatientTablesController getPatientTablesController(){ + return patientTablesController; + } + + public SettingsController getSettingsController(){ + return settingsController; + } + + public UntersuchungenController getUntersuchungenController(){ + return untersuchungenController; + } + + @FXML private ChoiceBox cmbUserChoose; diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java index 4f9e9bd..8877f68 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java @@ -3,10 +3,14 @@ package de.uniluebeck.mi.projmi6.controller; /** * Created by 631806 on 12.11.15. */ - -import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.*; +import javafx.scene.control.Button; +import javafx.scene.control.ComboBox; +import javafx.scene.control.DatePicker; +import javafx.scene.control.Label; +import javafx.scene.control.TextArea; +import javafx.event.ActionEvent; +import javafx.scene.control.TextField; public class PatientEditorController { diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java new file mode 100644 index 0000000..013aee1 --- /dev/null +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java @@ -0,0 +1,7 @@ +package de.uniluebeck.mi.projmi6.controller; + +/** + * Created by 631806 on 12.11.15. + */ +public class StationsHistorieController { +} diff --git a/src/main/resources/diagnose.fxml b/src/main/resources/diagnose.fxml index 99c0be6..786b296 100644 --- a/src/main/resources/diagnose.fxml +++ b/src/main/resources/diagnose.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/fall.fxml b/src/main/resources/fall.fxml index 2292b9f..24a2089 100644 --- a/src/main/resources/fall.fxml +++ b/src/main/resources/fall.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml index fa9c4a6..4e9fc75 100644 --- a/src/main/resources/main.fxml +++ b/src/main/resources/main.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/patient_edit.fxml b/src/main/resources/patient_edit.fxml index b4d46fe..d5eb6e5 100644 --- a/src/main/resources/patient_edit.fxml +++ b/src/main/resources/patient_edit.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/patient_tables.fxml b/src/main/resources/patient_tables.fxml index c666fee..4d65d60 100644 --- a/src/main/resources/patient_tables.fxml +++ b/src/main/resources/patient_tables.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/settings.fxml b/src/main/resources/settings.fxml index 8682ae8..91dd603 100644 --- a/src/main/resources/settings.fxml +++ b/src/main/resources/settings.fxml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/stationshistorie.fxml b/src/main/resources/stationshistorie.fxml index 54fbc41..27c74aa 100644 --- a/src/main/resources/stationshistorie.fxml +++ b/src/main/resources/stationshistorie.fxml @@ -6,7 +6,7 @@ - diff --git a/src/main/resources/untersuchungen.fxml b/src/main/resources/untersuchungen.fxml index fd694c6..dfc66c7 100644 --- a/src/main/resources/untersuchungen.fxml +++ b/src/main/resources/untersuchungen.fxml @@ -4,7 +4,7 @@ + xmlns="http://javafx.com/javafx/8" fx:controller="de.uniluebeck.mi.projmi6.controller.UntersuchungenController">