NOTICKET: Update Nurse Model, Dao and Controller to Reflect privous Cleanup

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

src/main/java/de/hitec/nhplus/nurse/AllNurseController.java

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

src/main/java/de/hitec/nhplus/nurse/Nurse.java

@@ -1,11 +1,11 @@
 package de.hitec.nhplus.nurse;
 
 import de.hitec.nhplus.main.Person;
-import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 
 public class Nurse extends Person {
-    private SimpleLongProperty nid;
+    private SimpleIntegerProperty id;
     private final SimpleStringProperty phoneNumber;
 
     public Nurse(
@@ -18,13 +18,13 @@ public class Nurse extends Person {
     }
 
     public Nurse(
-            long nid,
+            int id,
             String firstName,
             String surname,
             String phoneNumber
     ) {
         super(firstName, surname);
-        this.nid = new SimpleLongProperty(nid);
+        this.id = new SimpleIntegerProperty(id);
         this.phoneNumber = new SimpleStringProperty(phoneNumber);
     }
 
@@ -32,12 +32,12 @@ public class Nurse extends Person {
         this.phoneNumber.set(phoneNumber);
     }
 
-    public long getNid() {
+    public long getId() {
-        return nid.get();
+        return id.get();
     }
 
-    public SimpleLongProperty nidProperty() {
+    public SimpleIntegerProperty idProperty() {
-        return nid;
+        return id;
     }
 
     public String getPhoneNumber() {
@@ -47,4 +47,15 @@ public class Nurse extends Person {
     public SimpleStringProperty phoneNumberProperty() {
         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();
+
+    }
 }

src/main/java/de/hitec/nhplus/nurse/NurseDao.java

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

src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml

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

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

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

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

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