SZUT/nhplus
5
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 1 Wiki Activity Actions

Refaktoring #21

Merged
SZUT-Dominik merged 12 commits from refactor into main 2024-04-30 12:21:17 +00:00
Conversation 1 Commits 12 Files changed 148 +66 -76
23 changed files with 66 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit eedd275e5e - Show all commits

3
.idea/sqldialects.xml
View file

@ -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>

BIN
db/nursingHome.db
View file

Binary file not shown.

3
src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
View file

@ -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;

2
src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
View file

@ -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;

4
src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java
View file

@ -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.model.Patient;
import de.hitec.nhplus.patient.PatientDao;
import de.hitec.nhplus.patient.Patient;
import java.sql.Connection;
import java.sql.SQLException;

6
src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
View file

@ -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.model.Patient;
import de.hitec.nhplus.model.Treatment;
import de.hitec.nhplus.treatment.TreatmentDao;
import de.hitec.nhplus.patient.Patient;
import de.hitec.nhplus.treatment.Treatment;
import java.sql.Connection;
import java.sql.SQLException;

2
src/main/java/de/hitec/nhplus/controller/MainWindowController.java → src/main/java/de/hitec/nhplus/main/MainWindowController.java
View file

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

2
src/main/java/de/hitec/nhplus/model/Person.java → src/main/java/de/hitec/nhplus/main/Person.java
View file

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

4
src/main/java/de/hitec/nhplus/controller/AllPatientController.java → src/main/java/de/hitec/nhplus/patient/AllPatientController.java
View file

@ -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;

4
src/main/java/de/hitec/nhplus/model/Patient.java → src/main/java/de/hitec/nhplus/patient/Patient.java
View file

@ -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;

5
src/main/java/de/hitec/nhplus/datastorage/PatientDao.java → src/main/java/de/hitec/nhplus/patient/PatientDao.java
View file

@ -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.*;

0
src/main/java/de/hitec/nhplus/controller/AllNurseController.java → src/main/java/de/hitec/nhplus/treatment/AllNurseController.java
View file

8
src/main/java/de/hitec/nhplus/controller/AllTreatmentController.java → src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
View file

@ -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.datastorage.TreatmentDao;
import de.hitec.nhplus.model.Patient;
import de.hitec.nhplus.model.Treatment;
import de.hitec.nhplus.patient.PatientDao;
import de.hitec.nhplus.patient.Patient;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;

6
src/main/java/de/hitec/nhplus/controller/NewTreatmentController.java → src/main/java/de/hitec/nhplus/treatment/NewTreatmentController.java
View file

@ -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.model.Patient;
import de.hitec.nhplus.model.Treatment;
import de.hitec.nhplus.patient.Patient;
import de.hitec.nhplus.utils.DateConverter;
import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML;

2
src/main/java/de/hitec/nhplus/model/Treatment.java → src/main/java/de/hitec/nhplus/treatment/Treatment.java
View file

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

8
src/main/java/de/hitec/nhplus/controller/TreatmentController.java → src/main/java/de/hitec/nhplus/treatment/TreatmentController.java
View file

@ -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.datastorage.TreatmentDao;
import de.hitec.nhplus.patient.PatientDao;
import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.stage.Stage;
import de.hitec.nhplus.model.Patient;
import de.hitec.nhplus.model.Treatment;
import de.hitec.nhplus.patient.Patient;
import de.hitec.nhplus.utils.DateConverter;
import java.sql.SQLException;

4
src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java → src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java
View file

@ -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.*;

17
src/main/java/module-info.java
View file

@ -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;
exports de.hitec.nhplus.model;
opens de.hitec.nhplus to javafx.fxml;
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;
}

2
src/main/resources/de/hitec/nhplus/AllPatientView.fxml
View file

@ -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>

2
src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml
View file

@ -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>

30
src/main/resources/de/hitec/nhplus/MainWindowView.fxml
View file

@ -1,36 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.geometry.*?>
<?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"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.MainWindowController">
<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">
<left>
<VBox id="vBox" alignment="CENTER" spacing="50.0" styleClass="vBox" stylesheets="@Application.css"
BorderPane.alignment="CENTER">
<VBox id="vBox" alignment="CENTER" spacing="50.0" styleClass="vBox" stylesheets="@Application.css" BorderPane.alignment="CENTER">
<children>
<Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false"
onAction="#handleShowAllPatient" prefWidth="105.0" text="Patienten/innen">
<Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" 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>
</Button>
<Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false"
onAction="#handleShowAllTreatments" prefWidth="105.0" text="Behandlungen">
</opaqueInsets></Button>
<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>
</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>
</VBox.margin></Button>
</children>
</VBox>
</left>

2
src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml
View file

@ -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">

2
src/main/resources/de/hitec/nhplus/TreatmentView.fxml
View file

@ -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">