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

Compare commits

base: SZUT:e4c48d568e763383d88443ad2f6363fb8184d74c
Branches Tags
SZUT:main
SZUT:v1.0.0
..
compare: SZUT:f4b51c0749472147b2c0caa4a4508c59320d9135
Branches Tags
SZUT:main
SZUT:v1.0.0

No commits in common. "e4c48d568e763383d88443ad2f6363fb8184d74c" and "f4b51c0749472147b2c0caa4a4508c59320d9135" have entirely different histories.
e4c48d568e ... f4b51c0749

6 changed files with 77 additions and 131 deletions
Show stats Expand all files Collapse all files

4
src/main/java/de/hitec/nhplus/nurse/AllNurseController.java
View file

@ -28,7 +28,7 @@ public class AllNurseController {
private NurseDao dao; private NurseDao dao;
public void initialize() { public void initialize() {
this.readAllAndShowInTableView(); this.readAllAndSHowInTableView();
this.columnId.setCellValueFactory(new PropertyValueFactory<>("nid")); this.columnId.setCellValueFactory(new PropertyValueFactory<>("nid"));
@ -45,7 +45,7 @@ public class AllNurseController {
this.tableView.setItems(this.nurses); this.tableView.setItems(this.nurses);
} }
private void readAllAndShowInTableView(){ private void readAllAndSHowInTableView(){
this.nurses.clear(); this.nurses.clear();
this.dao = DaoFactory.getDaoFactory().createNurseDAO(); this.dao = DaoFactory.getDaoFactory().createNurseDAO();
try { try {

27
src/main/java/de/hitec/nhplus/nurse/Nurse.java
View file

@ -1,11 +1,11 @@
package de.hitec.nhplus.nurse; package de.hitec.nhplus.nurse;
import de.hitec.nhplus.main.Person; import de.hitec.nhplus.main.Person;
import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleLongProperty;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
public class Nurse extends Person { public class Nurse extends Person {
private SimpleIntegerProperty id; private SimpleLongProperty nid;
private final SimpleStringProperty phoneNumber; private final SimpleStringProperty phoneNumber;
public Nurse( public Nurse(
@ -18,13 +18,13 @@ public class Nurse extends Person {
} }
public Nurse( public Nurse(
int id, long nid,
String firstName, String firstName,
String surname, String surname,
String phoneNumber String phoneNumber
) { ) {
super(firstName, surname); super(firstName, surname);
this.id = new SimpleIntegerProperty(id); this.nid = new SimpleLongProperty(nid);
this.phoneNumber = new SimpleStringProperty(phoneNumber); this.phoneNumber = new SimpleStringProperty(phoneNumber);
} }
@ -32,12 +32,12 @@ public class Nurse extends Person {
this.phoneNumber.set(phoneNumber); this.phoneNumber.set(phoneNumber);
} }
public long getId() { public long getNid() {
return id.get(); return nid.get();
} }
public SimpleIntegerProperty idProperty() { public SimpleLongProperty nidProperty() {
return id; return nid;
} }
public String getPhoneNumber() { public String getPhoneNumber() {
@ -47,15 +47,4 @@ public class Nurse extends Person {
public SimpleStringProperty phoneNumberProperty() { public SimpleStringProperty phoneNumberProperty() {
return phoneNumber; return phoneNumber;
} }
@Override
public String toString() {
return new StringBuilder()
.append("Nurse").append(System.lineSeparator())
.append("Firstname: ").append(this.getFirstName()).append(System.lineSeparator())
.append("Surname: ").append(this.getSurname()).append(System.lineSeparator())
.append("PhoneNumber: ").append(this.getPhoneNumber()).append(System.lineSeparator())
.toString();
}
} }

18
src/main/java/de/hitec/nhplus/nurse/NurseDao.java
View file

@ -30,12 +30,12 @@ public class NurseDao extends DaoImp<Nurse> {
} }
@Override @Override
protected PreparedStatement getReadByIDStatement(int id) { protected PreparedStatement getReadByIDStatement(int nid) {
PreparedStatement preparedStatement = null; PreparedStatement preparedStatement = null;
try { try {
final String SQL = "SELECT * FROM nurse WHERE id = ?"; final String SQL = "SELECT * FROM nurse WHERE nid = ?";
preparedStatement = this.connection.prepareStatement(SQL); preparedStatement = this.connection.prepareStatement(SQL);
preparedStatement.setInt(1, id); preparedStatement.setInt(1, nid);
} catch (SQLException exception) { } catch (SQLException exception) {
exception.printStackTrace(); exception.printStackTrace();
} }
@ -45,7 +45,7 @@ public class NurseDao extends DaoImp<Nurse> {
@Override @Override
protected Nurse getInstanceFromResultSet(ResultSet result) throws SQLException { protected Nurse getInstanceFromResultSet(ResultSet result) throws SQLException {
return new Nurse( return new Nurse(
result.getInt(1), result.getLong(1),
result.getString(2), result.getString(2),
result.getString(3), result.getString(3),
result.getString(4) result.getString(4)
@ -88,12 +88,12 @@ public class NurseDao extends DaoImp<Nurse> {
"firstname = ?, " + "firstname = ?, " +
"surname = ?, " + "surname = ?, " +
"phoneNumber = ?, " + "phoneNumber = ?, " +
"WHERE id = ?"; "WHERE nid = ?";
preparedStatement = this.connection.prepareStatement(SQL); preparedStatement = this.connection.prepareStatement(SQL);
preparedStatement.setString(1, nurse.getFirstName()); preparedStatement.setString(1, nurse.getFirstName());
preparedStatement.setString(2, nurse.getSurname()); preparedStatement.setString(2, nurse.getSurname());
preparedStatement.setString(3, nurse.getPhoneNumber()); preparedStatement.setString(3, nurse.getPhoneNumber());
preparedStatement.setLong(4, nurse.getId()); preparedStatement.setLong(4, nurse.getNid());
} catch (SQLException exception) { } catch (SQLException exception) {
exception.printStackTrace(); exception.printStackTrace();
} }
@ -101,12 +101,12 @@ public class NurseDao extends DaoImp<Nurse> {
} }
@Override @Override
protected PreparedStatement getDeleteStatement(int id) { protected PreparedStatement getDeleteStatement(int nid) {
PreparedStatement preparedStatement = null; PreparedStatement preparedStatement = null;
try { try {
final String SQL = "DELETE FROM nurse WHERE id = ?"; final String SQL = "DELETE FROM nurse WHERE nid = ?";
preparedStatement = this.connection.prepareStatement(SQL); preparedStatement = this.connection.prepareStatement(SQL);
preparedStatement.setInt(1, id); preparedStatement.setInt(1, nid);
} catch (SQLException exception) { } catch (SQLException exception) {
exception.printStackTrace(); exception.printStackTrace();
} }

106
src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
View file

@ -3,86 +3,42 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane <?import javafx.scene.text.Font?>
xmlns="http://javafx.com/javafx/11.0.1" <BorderPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
xmlns:fx="http://javafx.com/fxml/1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.nurse.AllNurseController">
fx:controller="de.hitec.nhplus.nurse.AllNurseController" <children>
>
<padding>
<Insets top="8" left="8" right="8" bottom="8"/>
</padding>
<center>
<TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0"> <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0">
<columns> <columns>
<TableColumn <TableColumn fx:id="columnId" maxWidth="1200.0" minWidth="5.0" prefWidth="5.0" text="ID"/>
fx:id="columnId" <TableColumn fx:id="columnSurname" maxWidth="7500.0" minWidth="20.0" prefWidth="100.0" text="Nachname"/>
minWidth="40.0" <TableColumn fx:id="columnFirstName" maxWidth="7500.0" prefWidth="75.0" text="Vorname"/>
text="ID" <TableColumn fx:id="columnPhoneNumber" maxWidth="7500.0" prefWidth="75.0" text="Telefonnummer"/>
/>
<TableColumn
fx:id="columnSurname"
minWidth="140.0"
text="Nachname"
/>
<TableColumn
fx:id="columnFirstName"
minWidth="140.0"
text="Vorname"
/>
<TableColumn
fx:id="columnPhoneNumber"
minWidth="140.0"
text="Telefonnummer"
/>
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy> </columnResizePolicy>
</TableView> </TableView>
</center> <HBox layoutX="420.0" layoutY="450.0" spacing="10.0">
<bottom> <children>
<BorderPane> <TextField fx:id="txfSurname" prefHeight="26.0" prefWidth="220.0" promptText="Nachname"/>
<BorderPane.margin> <TextField fx:id="txfFirstname" prefHeight="26.0" prefWidth="220.0" promptText="Vorname"/>
<Insets top="8.0"/> <TextField fx:id="txfPhoneNumber" prefWidth="160.0" promptText="Telefonnummer"/>
</BorderPane.margin> <Button fx:id="btnAdd" mnemonicParsing="false" prefWidth="90.0" text="Hinzufügen"/>
<center> <Button fx:id="btnDelete" mnemonicParsing="false" prefWidth="90.0" text="Löschen"/>
<HBox spacing="8.0"> </children>
<padding> </HBox>
<Insets right="8.0"/> <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" prefWidth="200.0" spacing="25.0">
</padding> <children>
<TextField <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Pfleger/innen"
fx:id="textFieldSurname" textAlignment="CENTER">
prefWidth="200.0" <font>
promptText="Nachname" <Font size="36.0"/>
/> </font>
<TextField </Label>
fx:id="textFieldFirstname" </children>
prefWidth="200.0" </HBox>
promptText="Vorname" </children>
/> <padding>
<TextField <Insets top="10.0"/>
fx:id="textFieldPhoneNumber" </padding>
prefWidth="200.0"
promptText="Telefonnummer"
/>
</HBox>
</center>
<right>
<HBox spacing="8.0">
<Button
fx:id="buttonAdd"
mnemonicParsing="false"
prefWidth="90.0"
text="Hinzufügen"
/>
<Button
fx:id="buttonDelete"
mnemonicParsing="false"
prefWidth="90.0"
text="Löschen"
/>
</HBox>
</right>
</BorderPane>
</bottom>
</BorderPane> </BorderPane>

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

@ -78,42 +78,42 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
</rowConstraints> </rowConstraints>
<!-- Row 0-->
<TextField <TextField
GridPane.rowIndex="0"
GridPane.columnIndex="0"
prefWidth="200.0"
fx:id="textFieldFirstName" fx:id="textFieldFirstName"
minWidth="200.0"
prefHeight="26.0"
prefWidth="200.0"
promptText="Vorname" promptText="Vorname"
/> />
<TextField <TextField
GridPane.rowIndex="0"
GridPane.columnIndex="1"
prefWidth="200.0"
fx:id="textFieldSurname" fx:id="textFieldSurname"
minWidth="200.0"
prefHeight="26.0"
prefWidth="200.0"
promptText="Nachname" promptText="Nachname"
/>
<TextField
GridPane.rowIndex="0"
GridPane.columnIndex="2"
prefWidth="200.0"
fx:id="textFieldDateOfBirth"
promptText="Geburtstag"
/>
<!-- Row 1-->
<TextField
GridPane.rowIndex="1"
GridPane.columnIndex="0"
prefWidth="200.0"
fx:id="textFieldCareLevel"
promptText="Pflegegrad"
/>
<TextField
GridPane.rowIndex="1"
GridPane.columnIndex="1" GridPane.columnIndex="1"
/>
<TextField
fx:id="textFieldDateOfBirth"
minWidth="160.0"
prefWidth="160.0"
promptText="Geburtstag"
GridPane.columnIndex="2"
/>
<TextField
fx:id="textFieldCareLevel"
prefHeight="26.0"
prefWidth="200.0" prefWidth="200.0"
promptText="Pflegegrad"
GridPane.rowIndex="1"
/>
<TextField
fx:id="textFieldRoomNumber" fx:id="textFieldRoomNumber"
prefHeight="26.0"
prefWidth="200.0"
promptText="Raum" promptText="Raum"
GridPane.columnIndex="1"
GridPane.rowIndex="1"
/> />
</GridPane> </GridPane>
</center> </center>

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

@ -65,8 +65,9 @@
<HBox spacing="8.0"> <HBox spacing="8.0">
<ComboBox <ComboBox
fx:id="comboBoxPatientSelection" fx:id="comboBoxPatientSelection"
prefWidth="200.0" minWidth="160.0"
onAction="#handleComboBox" onAction="#handleComboBox"
prefWidth="200.0"
/> />
<Button <Button
mnemonicParsing="false" mnemonicParsing="false"