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

#24 Bugfix #47

Merged
SZUT-Armin merged 1 commit from story/sperren-und-loeschen-von-pflegern-bugfix into main 2024-05-21 08:49:49 +00:00
Conversation 0 Commits 1 Files changed 2 +6 -1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
View file

@ -113,6 +113,11 @@ public class LockedNurseController {
@FXML @FXML
public void handleMouseClick() { public void handleMouseClick() {
Nurse nurse = tableView.getSelectionModel().getSelectedItem(); Nurse nurse = tableView.getSelectionModel().getSelectedItem();
if(nurse == null)
{
return;
}
boolean canBeDeleted = nurse.calculateDeleteDate().isBefore(LocalDate.now()); boolean canBeDeleted = nurse.calculateDeleteDate().isBefore(LocalDate.now());
buttonDelete.setDisable(!canBeDeleted); buttonDelete.setDisable(!canBeDeleted);
} }

2
src/main/resources/de/hitec/nhplus/treatment/database/Treatment.sql
View file

@ -10,5 +10,5 @@ CREATE TABLE treatment
remark TEXT NOT NULL, remark TEXT NOT NULL,
isLocked BOOLEAN NOT NULL DEFAULT false, isLocked BOOLEAN NOT NULL DEFAULT false,
FOREIGN KEY (patientId) REFERENCES patient (id) ON DELETE CASCADE, FOREIGN KEY (patientId) REFERENCES patient (id) ON DELETE CASCADE,
FOREIGN KEY (nurseId) REFERENCES nurse (id) ON DELETE SET NULL FOREIGN KEY (nurseId) REFERENCES nurse (id) ON DELETE CASCADE
) )