NOTICKET: Mergin Structure of Refactor & Nurse Module Together
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
This commit is contained in:
parent
74a83c4587
commit
8302543c30
9 changed files with 16 additions and 23 deletions
Binary file not shown.
|
@ -1,5 +1,6 @@
|
|||
package de.hitec.nhplus.datastorage;
|
||||
|
||||
import de.hitec.nhplus.nurse.NurseDao;
|
||||
import de.hitec.nhplus.patient.PatientDao;
|
||||
import de.hitec.nhplus.treatment.TreatmentDao;
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package de.hitec.nhplus.fixtures;
|
||||
|
||||
import de.hitec.nhplus.datastorage.DaoFactory;
|
||||
import de.hitec.nhplus.datastorage.NurseDao;
|
||||
import de.hitec.nhplus.model.Nurse;
|
||||
import de.hitec.nhplus.nurse.NurseDao;
|
||||
import de.hitec.nhplus.nurse.Nurse;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
|
|
|
@ -57,14 +57,4 @@ public class MainWindowController {
|
|||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void handleShowAllNurses(ActionEvent event){
|
||||
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/AllNurseView.fxml"));
|
||||
try {
|
||||
mainBorderPane.setCenter(loader.load());
|
||||
}catch (IOException exception){
|
||||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package de.hitec.nhplus.controller;
|
||||
package de.hitec.nhplus.nurse;
|
||||
|
||||
import de.hitec.nhplus.datastorage.DaoFactory;
|
||||
import de.hitec.nhplus.datastorage.NurseDao;
|
||||
import de.hitec.nhplus.model.Nurse;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.fxml.FXML;
|
|
@ -1,5 +1,6 @@
|
|||
package de.hitec.nhplus.model;
|
||||
package de.hitec.nhplus.nurse;
|
||||
|
||||
import de.hitec.nhplus.main.Person;
|
||||
import javafx.beans.property.SimpleLongProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package de.hitec.nhplus.datastorage;
|
||||
package de.hitec.nhplus.nurse;
|
||||
|
||||
import de.hitec.nhplus.model.Nurse;
|
||||
import de.hitec.nhplus.datastorage.DaoImp;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
|
@ -30,12 +30,12 @@ public class NurseDao extends DaoImp<Nurse> {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getReadByIDStatement(long nid) {
|
||||
protected PreparedStatement getReadByIDStatement(int nid) {
|
||||
PreparedStatement preparedStatement = null;
|
||||
try {
|
||||
final String SQL = "SELECT * FROM nurse WHERE nid = ?";
|
||||
preparedStatement = this.connection.prepareStatement(SQL);
|
||||
preparedStatement.setLong(1, nid);
|
||||
preparedStatement.setInt(1, nid);
|
||||
} catch (SQLException exception) {
|
||||
exception.printStackTrace();
|
||||
}
|
||||
|
@ -101,12 +101,12 @@ public class NurseDao extends DaoImp<Nurse> {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getDeleteStatement(long nid) {
|
||||
protected PreparedStatement getDeleteStatement(int nid) {
|
||||
PreparedStatement preparedStatement = null;
|
||||
try {
|
||||
final String SQL = "DELETE FROM nurse WHERE nid = ?";
|
||||
preparedStatement = this.connection.prepareStatement(SQL);
|
||||
preparedStatement.setLong(1, nid);
|
||||
preparedStatement.setInt(1, nid);
|
||||
} catch (SQLException exception) {
|
||||
exception.printStackTrace();
|
||||
}
|
|
@ -15,4 +15,7 @@ module de.hitec.nhplus {
|
|||
|
||||
exports de.hitec.nhplus.treatment;
|
||||
opens de.hitec.nhplus.treatment to javafx.base, javafx.fxml;
|
||||
|
||||
exports de.hitec.nhplus.nurse;
|
||||
opens de.hitec.nhplus.nurse to javafx.base, javafx.fxml;
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
|
||||
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.AllNurseController">
|
||||
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.nurse.AllNurseController">
|
||||
<children>
|
||||
<TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0" AnchorPane.bottomAnchor="70.0"
|
||||
AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
|
Loading…
Reference in a new issue