NOTICKET: Update Package Structure

Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>

.idea/sqldialects.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/patient/PatientDao.java" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java" dialect="GenericSQL" />
     <file url="PROJECT" dialect="SQLite" />
   </component>
 </project>

src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java

@@ -1,5 +1,8 @@
 package de.hitec.nhplus.datastorage;
 
+import de.hitec.nhplus.patient.PatientDao;
+import de.hitec.nhplus.treatment.TreatmentDao;
+
 public class DaoFactory {
 
     private static DaoFactory instance;

src/main/java/de/hitec/nhplus/fixtures/Fixtures.java

@@ -1,7 +1,7 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.ConnectionBuilder;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.Patient;
 
 import java.sql.Connection;
 import java.util.Map;

src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java

@@ -1,8 +1,8 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
+import de.hitec.nhplus.patient.PatientDao;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.Patient;
 
 import java.sql.Connection;
 import java.sql.SQLException;

src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java

@@ -1,9 +1,9 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.TreatmentDao;
+import de.hitec.nhplus.treatment.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.Patient;
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.treatment.Treatment;
 
 import java.sql.Connection;
 import java.sql.SQLException;

src/main/java/de/hitec/nhplus/main/MainWindowController.java

@@ -1,4 +1,4 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.main;
 
 import de.hitec.nhplus.Main;
 import javafx.event.ActionEvent;

src/main/java/de/hitec/nhplus/main/Person.java

@@ -1,4 +1,4 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.main;
 
 import javafx.beans.property.SimpleStringProperty;
 

src/main/java/de/hitec/nhplus/patient/AllPatientController.java

@@ -1,8 +1,6 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.patient;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.model.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;

src/main/java/de/hitec/nhplus/patient/Patient.java

@@ -1,5 +1,7 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.patient;
 
+import de.hitec.nhplus.main.Person;
+import de.hitec.nhplus.treatment.Treatment;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleStringProperty;

src/main/java/de/hitec/nhplus/patient/PatientDao.java

@@ -1,6 +1,7 @@
-package de.hitec.nhplus.datastorage;
+package de.hitec.nhplus.patient;
 
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.datastorage.DaoImp;
+import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.*;

src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java

@@ -1,11 +1,9 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
+import de.hitec.nhplus.patient.PatientDao;
-import de.hitec.nhplus.datastorage.TreatmentDao;
+import de.hitec.nhplus.patient.Patient;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;

src/main/java/de/hitec/nhplus/treatment/NewTreatmentController.java

@@ -1,9 +1,7 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.TreatmentDao;
+import de.hitec.nhplus.patient.Patient;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;

src/main/java/de/hitec/nhplus/treatment/Treatment.java

@@ -1,4 +1,4 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.utils.DateConverter;
 

src/main/java/de/hitec/nhplus/treatment/TreatmentController.java

@@ -1,13 +1,11 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
+import de.hitec.nhplus.patient.PatientDao;
-import de.hitec.nhplus.datastorage.TreatmentDao;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.stage.Stage;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.Patient;
-import de.hitec.nhplus.model.Treatment;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.SQLException;

src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java

@@ -1,6 +1,6 @@
-package de.hitec.nhplus.datastorage;
+package de.hitec.nhplus.treatment;
 
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.datastorage.DaoImp;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.*;

src/main/java/module-info.java

@@ -1,16 +1,19 @@
 module de.hitec.nhplus {
     requires javafx.controls;
     requires javafx.fxml;
-
     requires org.controlsfx.controls;
     requires java.sql;
     requires org.xerial.sqlitejdbc;
 
-    opens de.hitec.nhplus to javafx.fxml;
-    opens de.hitec.nhplus.controller to javafx.fxml;
-    opens de.hitec.nhplus.model to javafx.base;
-
     exports de.hitec.nhplus;
-    exports de.hitec.nhplus.controller;
+    opens de.hitec.nhplus to javafx.fxml;
-    exports de.hitec.nhplus.model;
+
+    exports de.hitec.nhplus.main;
+    opens de.hitec.nhplus.main to javafx.base, javafx.fxml;
+
+    exports de.hitec.nhplus.patient;
+    opens de.hitec.nhplus.patient to javafx.base, javafx.fxml;
+
+    exports de.hitec.nhplus.treatment;
+    opens de.hitec.nhplus.treatment to javafx.base, javafx.fxml;
 }

src/main/resources/de/hitec/nhplus/AllPatientView.fxml

@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.AllPatientController">
+<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.patient.AllPatientController">
    <children>
       <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="120.0" prefHeight="287.0" prefWidth="825.0" AnchorPane.bottomAnchor="100.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
         <columns>

src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml

@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.AllTreatmentController">
+<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.AllTreatmentController">
    <children>
       <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="35.0" onMouseClicked="#handleMouseClick" prefHeight="364.0" prefWidth="825.0" AnchorPane.bottomAnchor="75.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
         <columns>

src/main/resources/de/hitec/nhplus/MainWindowView.fxml

@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
+<?import javafx.geometry.*?>
-<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<BorderPane fx:id="mainBorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+
-            prefHeight="688.0" prefWidth="926.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
+<BorderPane fx:id="mainBorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="688.0" prefWidth="926.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.main.MainWindowController">
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.MainWindowController">
    <left>
-        <VBox id="vBox" alignment="CENTER" spacing="50.0" styleClass="vBox" stylesheets="@Application.css"
+      <VBox id="vBox" alignment="CENTER" spacing="50.0" styleClass="vBox" stylesheets="@Application.css" BorderPane.alignment="CENTER">
-              BorderPane.alignment="CENTER">
          <children>
-                <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false"
+            <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleShowAllPatient" prefWidth="105.0" text="Patienten/innen">
-                        onAction="#handleShowAllPatient" prefWidth="105.0" text="Patienten/innen">
                <VBox.margin>
                   <Insets bottom="50.0" left="10.0" right="10.0" top="50.0" />
                </VBox.margin>
                <opaqueInsets>
                   <Insets />
-                    </opaqueInsets>
+               </opaqueInsets></Button>
-                </Button>
+            <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleShowAllTreatments" prefWidth="105.0" text="Behandlungen">
-                <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false"
-                        onAction="#handleShowAllTreatments" prefWidth="105.0" text="Behandlungen">
                <VBox.margin>
                   <Insets bottom="50.0" left="10.0" right="10.0" top="50.0" />
-                    </VBox.margin>
+               </VBox.margin></Button>
-                </Button>
-                <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false"
-                        onAction="#handleShowAllNurses" prefWidth="105.0" text="Pfleger/innen">
-                    <VBox.margin>
-                        <Insets bottom="50.0" left="10.0" right="10.0" top="50.0"/>
-                    </VBox.margin>
-                </Button>
          </children>
       </VBox>
    </left>

src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 <AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.NewTreatmentController">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.NewTreatmentController">
     <children>
         <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="5.0"
               AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">

src/main/resources/de/hitec/nhplus/TreatmentView.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 <AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.TreatmentController">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.TreatmentController">
     <children>
         <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="15.0"
               AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">