From e4c48d568e763383d88443ad2f6363fb8184d74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20S=C3=A4ume?= Date: Mon, 29 Apr 2024 17:03:57 +0200 Subject: [PATCH] NOTICKET: Update Nurse Model, Dao and Controller to Reflect privous Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dominik Säume --- .../nhplus/nurse/AllNurseController.java | 4 +-- .../java/de/hitec/nhplus/nurse/Nurse.java | 27 +++++++++++++------ .../java/de/hitec/nhplus/nurse/NurseDao.java | 18 ++++++------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java b/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java index 2c5e36e..8b312d2 100644 --- a/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java +++ b/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 { diff --git a/src/main/java/de/hitec/nhplus/nurse/Nurse.java b/src/main/java/de/hitec/nhplus/nurse/Nurse.java index 25f3cf2..fc23fd6 100644 --- a/src/main/java/de/hitec/nhplus/nurse/Nurse.java +++ b/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() { - return nid.get(); + public long getId() { + return id.get(); } - public SimpleLongProperty nidProperty() { - return nid; + public SimpleIntegerProperty idProperty() { + 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(); + + } } diff --git a/src/main/java/de/hitec/nhplus/nurse/NurseDao.java b/src/main/java/de/hitec/nhplus/nurse/NurseDao.java index fce3b4d..fa0570a 100644 --- a/src/main/java/de/hitec/nhplus/nurse/NurseDao.java +++ b/src/main/java/de/hitec/nhplus/nurse/NurseDao.java @@ -30,12 +30,12 @@ public class NurseDao extends DaoImp { } @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 { @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 { "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 { } @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(); }