diff --git a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java index 1cf0526..1d36d3d 100644 --- a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java +++ b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java @@ -32,12 +32,6 @@ public class LockedTreatmentController { public TableView tableView; @FXML public TableColumn columnId; - @FXML - public TableColumn columnFirstName; - @FXML - public TableColumn columnSurName; - @FXML - public TableColumn columnDeleteDate; private final ObservableList treatments = FXCollections.observableArrayList(); private NurseDao nurseDao; @@ -52,9 +46,6 @@ public class LockedTreatmentController { this.readAllAndShowInTableView(); this.columnId.setCellValueFactory(new PropertyValueFactory<>("id")); - this.columnFirstName.setCellValueFactory(new PropertyValueFactory<>("firstName")); - this.columnSurName.setCellValueFactory(new PropertyValueFactory<>("surName")); - this.columnDeleteDate.setCellValueFactory(cellData -> new SimpleStringProperty("coming soon")); this.tableView.setItems(this.treatments); } diff --git a/src/main/java/de/hitec/nhplus/treatment/Treatment.java b/src/main/java/de/hitec/nhplus/treatment/Treatment.java index 7175fd7..949df4f 100644 --- a/src/main/java/de/hitec/nhplus/treatment/Treatment.java +++ b/src/main/java/de/hitec/nhplus/treatment/Treatment.java @@ -67,7 +67,7 @@ public class Treatment { LocalTime end, String description, String remarks, - boolean isLocked + Boolean isLocked ) { this.id = new SimpleIntegerProperty(id); this.patient = new SimpleObjectProperty<>(patient); diff --git a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java index 24161a8..ce82860 100644 --- a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java +++ b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java @@ -147,7 +147,7 @@ public class TreatmentDao extends DaoImp { } public List readAllLocked() throws SQLException { - final String SQL = "SELECT * FROM treatment WHERE isLocked=true"; + final String SQL = "SELECT * FROM treatment WHERE isLocked = true"; return getListFromResultSet(this.connection.prepareStatement(SQL).executeQuery()); }