From ce8561c60fbaaed76221107a3138f7292c545a7c 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 previous Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dominik Säume --- db/nursingHome.db | Bin 20480 -> 20480 bytes .../hitec/nhplus/fixtures/NurseFixture.java | 2 +- .../nhplus/nurse/AllNurseController.java | 6 ++-- .../java/de/hitec/nhplus/nurse/Nurse.java | 27 ++++++++++++------ .../java/de/hitec/nhplus/nurse/NurseDao.java | 20 ++++++------- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/db/nursingHome.db b/db/nursingHome.db index 238897213929fdb2652c3a0ed809fadad8817601..f25badf0e50452f1f1ae63b41747e16a5b5374df 100644 GIT binary patch delta 207 zcmZozz}T>Wae}nq90mpkRv?Cf=!rVUqH`GZiWc(n{bgX`Il#cTnqQnZj_1H;K?QFf z?#4!GHFj}vamFUm$tQVKCcon;VpQFn$h)4AON|X|NMoAHW-0#5+{{4U<_}UrtUSjU znEAJJ@!#g(&VK=D%1VA`UU6o5#*(7c#FE_9yb><{R}5T?d8I|gshkqb;t&=Sw-~cD jV?km`CQt=iZYt0;K2C%dw#~ovfAdY8V7OV${+0j$Bz`ur delta 213 zcmZozz}T>Wae}m<3IhWJD-gqg?L-}8Q56QgqJ_MCe;HVK_A~IU<`?IU(_WlQa+j diff --git a/src/main/java/de/hitec/nhplus/fixtures/NurseFixture.java b/src/main/java/de/hitec/nhplus/fixtures/NurseFixture.java index 2bbb2ce..0ec5bfe 100644 --- a/src/main/java/de/hitec/nhplus/fixtures/NurseFixture.java +++ b/src/main/java/de/hitec/nhplus/fixtures/NurseFixture.java @@ -25,7 +25,7 @@ public class NurseFixture implements Fixture { @Override public void setupTable(Connection connection) { final String SQL = "CREATE TABLE IF NOT EXISTS nurse (" + - "tid INTEGER PRIMARY KEY AUTOINCREMENT, " + + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + "firstname TEXT NOT NULL, " + "surname TEXT NOT NULL, " + "phoneNumber TEXT NOT NULL" + diff --git a/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java b/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java index 2c5e36e..0539494 100644 --- a/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java +++ b/src/main/java/de/hitec/nhplus/nurse/AllNurseController.java @@ -28,9 +28,9 @@ public class AllNurseController { private NurseDao dao; public void initialize() { - this.readAllAndSHowInTableView(); + this.readAllAndShowInTableView(); - this.columnId.setCellValueFactory(new PropertyValueFactory<>("nid")); + this.columnId.setCellValueFactory(new PropertyValueFactory<>("id")); this.columnFirstName.setCellValueFactory(new PropertyValueFactory<>("firstName")); this.columnFirstName.setCellFactory(TextFieldTableCell.forTableColumn()); @@ -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..2d7f6ec 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 int 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..e8d7419 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) @@ -69,7 +69,7 @@ public class NurseDao extends DaoImp { ArrayList list = new ArrayList<>(); while (result.next()) { list.add(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.setInt(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(); }