Merge pull request '#7 Sperren & löschung von behandlungsdaten' (#42) from story/sperre-und-loschung-behandlungsdaten into main

Reviewed-on: #42
Reviewed-by: Dominik Säume <dominik.saeume@hmmh.de>

src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java

@@ -58,7 +58,6 @@ public class TreatmentFixture implements Fixture<Treatment> {
         Nurse armin = nursesByName.get("Armin");
 
         treatments.add(new Treatment(
-                1,
                 seppl,
                 ole,
                 convertStringToLocalDate("2023-06-03"),
@@ -70,7 +69,6 @@ public class TreatmentFixture implements Fixture<Treatment> {
                         + "Patient beruhigt sich erst, als alle Wertsachen im Zimmer gefunden worden sind."
         ));
         treatments.add(new Treatment(
-                2,
                 seppl,
                 armin,
                 convertStringToLocalDate("2023-06-05"),
@@ -82,7 +80,6 @@ public class TreatmentFixture implements Fixture<Treatment> {
                         + "Patient wird in seinen Raum zurückbegleitet und erhält Beruhigungsmittel."
         ));
         treatments.add(new Treatment(
-                3,
                 martina,
                 ole,
                 convertStringToLocalDate("2023-06-04"),
@@ -92,80 +89,80 @@ public class TreatmentFixture implements Fixture<Treatment> {
                 "Patient mit Waschlappen gewaschen und frisch angezogen. Patient gewendet."
         ));
         treatments.add(new Treatment(
-                4,
                 seppl,
                 armin,
                 convertStringToLocalDate("2023-06-06"),
                 convertStringToLocalTime("15:10"),
                 convertStringToLocalTime("16:00"),
                 "Spaziergang",
-                "Spaziergang im Park, Patient döst  im Rollstuhl ein")
+                "Spaziergang im Park, Patient döst  im Rollstuhl ein"
-        );
+
+        ));
         treatments.add(new Treatment(
-                8,
                 seppl,
                 ole,
                 convertStringToLocalDate("2023-06-08"),
                 convertStringToLocalTime("15:00"),
                 convertStringToLocalTime("16:00"),
                 "Spaziergang",
-                "Parkspaziergang; Patient ist heute lebhafter und hat klare Momente; erzählt von seiner Tochter")
+                "Parkspaziergang; Patient ist heute lebhafter und hat klare Momente; erzählt von seiner Tochter"
-        );
+        ));
         treatments.add(new Treatment(
-                9,
                 martina,
                 armin,
                 convertStringToLocalDate("2023-06-07"),
                 convertStringToLocalTime("11:00"),
                 convertStringToLocalTime("11:30"),
                 "Waschen",
-                "Waschen per Dusche auf einem Stuhl; Patientin gewendet;")
+                "Waschen per Dusche auf einem Stuhl; Patientin gewendet;"
-        );
+        ));
         treatments.add(new Treatment(
-                12,
                 hans,
                 armin,
                 convertStringToLocalDate("2023-06-08"),
                 convertStringToLocalTime("15:00"),
                 convertStringToLocalTime("15:30"),
                 "Physiotherapie",
-                "Übungen zur Stabilisation und Mobilisierung der Rückenmuskulatur")
+                "Übungen zur Stabilisation und Mobilisierung der Rückenmuskulatur"
-        );
+        ));
         treatments.add(new Treatment(
-                14,
                 ahmet,
                 ole,
                 convertStringToLocalDate("2023-08-24"),
                 convertStringToLocalTime("09:30"),
                 convertStringToLocalTime("10:15"),
                 "KG",
-                "Lympfdrainage"));
+                "Lympfdrainage"
+        ));
         treatments.add(new Treatment(
-                16,
                 elisabeth,
                 armin,
                 convertStringToLocalDate("2023-08-31"),
                 convertStringToLocalTime("13:30"),
                 convertStringToLocalTime("13:45"),
                 "Toilettengang",
-                "Hilfe beim Toilettengang; Patientin klagt über Schmerzen beim Stuhlgang. Gabe von Iberogast")
+                "Hilfe beim Toilettengang; Patientin klagt über Schmerzen beim Stuhlgang. Gabe von Iberogast"
-        );
+        ));
-        treatments.add(new Treatment(
+        Treatment lockedTreatment = new Treatment(
-                17,
                 elisabeth,
                 ole,
                 convertStringToLocalDate("2023-09-01"),
                 convertStringToLocalTime("16:00"),
                 convertStringToLocalTime("17:00"),
                 "KG",
-                "Massage der Extremitäten zur Verbesserung der Durchblutung")
+                "Massage der Extremitäten zur Verbesserung der Durchblutung"
         );
+        lockedTreatment.setLocked(true);
+        treatments.add(lockedTreatment);
 
         TreatmentDao dao = DaoFactory.getInstance().createTreatmentDao();
         Map<String, Treatment> treatmentsById = new HashMap<>();
         for (Treatment treatment : treatments) {
             dao.create(treatment);
+        }
+        for (Treatment treatment : dao.readAll()) {
             treatmentsById.put(String.valueOf(treatment.getId()), treatment);
+
         }
         return treatmentsById;
     }

src/main/java/de/hitec/nhplus/main/MainWindowController.java

@@ -9,6 +9,9 @@ import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
+import de.hitec.nhplus.treatment.Treatment;
+import de.hitec.nhplus.medication.Medication;
+import de.hitec.nhplus.patient.Patient;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -29,10 +32,18 @@ public class MainWindowController {
     @FXML
     private Tab patientTab;
     @FXML
-    private AnchorPane treatmentPage;
+    private AnchorPane activeTreatmentPage;
     @FXML
     private Tab treatmentTab;
     @FXML
+    private TabPane treatmentTabPane;
+    @FXML
+    private Tab activeTreatmentTab;
+    @FXML
+    private AnchorPane lockedTreatmentPage;
+    @FXML
+    private Tab lockedTreatmentTab;
+    @FXML
     private Tab nurseTab;
     @FXML
     private TabPane nurseTabPane;
@@ -58,19 +69,25 @@ public class MainWindowController {
         mainTabPane.getSelectionModel().select(patientTab);
 
         patientTab.setOnSelectionChanged(event -> loadPatientPage());
-        treatmentTab.setOnSelectionChanged(event -> loadTreatmentsPage());
-        nurseTab.setOnSelectionChanged(event -> loadNursePage());
         medicationTab.setOnSelectionChanged(event -> loadMedicationPage());
 
 
+        nurseTab.setOnSelectionChanged(event -> loadNursePage());
         nurseTabPane.getSelectionModel().select(activeNurseTab);
 
         activeNurseTab.setOnSelectionChanged(event -> loadActiveNursePage());
         lockedNurseTab.setOnSelectionChanged(event -> loadLockedNursePage());
+
+        treatmentTab.setOnSelectionChanged(event -> loadTreatmentPage());
+        treatmentTabPane.getSelectionModel().select(activeTreatmentTab);
+
+        activeTreatmentTab.setOnSelectionChanged(event -> loadActiveTreatmentPage());
+        lockedTreatmentTab.setOnSelectionChanged(event -> loadLockedTreatmentPage());
+
     }
 
     /**
-     * Loads the patient page into its tab.
+     * Loads the {@link Patient} page into its tab.
      */
     private void loadPatientPage() {
         try {
@@ -88,14 +105,46 @@ public class MainWindowController {
     }
 
     /**
-     * Loads the {@link } page into its tab.
+     * Loads the {@link Treatment } tab.
      */
-    private void loadTreatmentsPage() {
+    private void loadTreatmentPage() {
+        SelectionModel<Tab> selectionModel = treatmentTabPane.getSelectionModel();
+        Tab selectedTab = selectionModel.getSelectedItem();
+        if (selectedTab == activeTreatmentTab) {
+            loadActiveTreatmentPage();
+        }
+        if (selectedTab == lockedTreatmentTab) {
+            loadLockedTreatmentPage();
+        }
+    }
+
+    /**
+     * Loads the active {@link Treatment} page into its tab.
+     */
+    private void loadActiveTreatmentPage() {
         try {
-            BorderPane treatmentsPane = FXMLLoader.load(
+            BorderPane activeTreatmentPane = FXMLLoader.load(
                     Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/AllTreatmentView.fxml"))
             );
-            treatmentPage.getChildren().setAll(treatmentsPane);
+            activeTreatmentPage.getChildren().setAll(activeTreatmentPane);
+            AnchorPane.setTopAnchor(activeTreatmentPane, 0d);
+            AnchorPane.setBottomAnchor(activeTreatmentPane, 0d);
+            AnchorPane.setLeftAnchor(activeTreatmentPane, 0d);
+            AnchorPane.setRightAnchor(activeTreatmentPane, 0d);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Loads the locked {@link Treatment} page into its tab.
+     */
+    private void loadLockedTreatmentPage() {
+        try {
+            BorderPane treatmentsPane = FXMLLoader.load(
+                  Objects.requireNonNull(Main.class.getResource("/de/hitec/nhplus/treatment/LockedTreatmentView.fxml"))
+            );
+            lockedTreatmentPage.getChildren().setAll(treatmentsPane);
             AnchorPane.setTopAnchor(treatmentsPane, 0d);
             AnchorPane.setBottomAnchor(treatmentsPane, 0d);
             AnchorPane.setLeftAnchor(treatmentsPane, 0d);
@@ -106,7 +155,7 @@ public class MainWindowController {
     }
 
     /**
-     * Loads the nurse page into its tab.
+     * Loads the {@link Nurse} page into its tab.
      */
     private void loadNursePage() {
         SelectionModel<Tab> selectionModel = nurseTabPane.getSelectionModel();
@@ -156,7 +205,7 @@ public class MainWindowController {
     }
 
     /**
-     * Loads the medication page into its tab.
+     * Loads the {@link Medication} page into its tab.
      */
     private void loadMedicationPage() {
         try {

src/main/java/de/hitec/nhplus/medication/IngredientListCell.java

@@ -40,7 +40,7 @@ public class IngredientListCell extends ListCell<Ingredient> {
                 BUTTON_PADDING_Y,
                 BUTTON_PADDING_X
         ));
-        deleteButton.setOnAction(event -> getListView().getItems().remove(this));
+        deleteButton.setOnAction(event -> getListView().getItems().remove(getItem()));
 
         // Calculate Delete Button Width
         Text textNode = new Text(deleteButton.getText());

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

@@ -22,6 +22,8 @@ import java.sql.SQLException;
  *
  * @author Dominik Säume
  * @author Ole Kück
+ * @author Armin Ribic
+ * @author Dorian Nemec
  */
 public class AllNurseController {
     @FXML
@@ -106,6 +108,17 @@ public class AllNurseController {
         this.textFieldPhoneNumber.clear();
     }
 
+    /**
+     * Internal method that stores the changes in the database.
+     */
+    private void doUpdate(TableColumn.CellEditEvent<Nurse, String> event) {
+        try {
+            this.dao.update(event.getRowValue());
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+        }
+    }
+
     @FXML
     public void handleAdd(){
         String surname=this.textFieldSurName.getText();
@@ -137,4 +150,39 @@ public class AllNurseController {
         readAllAndShowInTableView();
     }
 
+    @FXML
+    public void handleOnEditSurname(TableColumn.CellEditEvent<Nurse, String> event) {
+        String newSurName = event.getNewValue();
+        if (!isValidSurName(newSurName)) {
+            showValidationError("Nachname");
+            event.getTableView().refresh();
+            return;
+        }
+        event.getRowValue().setSurName(newSurName);
+        this.doUpdate(event);
+    }
+
+    @FXML
+    public void handleOnEditFirstname(TableColumn.CellEditEvent<Nurse, String> event) {
+        String newFirstName = event.getNewValue();
+        if (!isValidFirstName(newFirstName)) {
+            showValidationError("Vorname");
+            event.getTableView().refresh();
+            return;
+        }
+        event.getRowValue().setFirstName(newFirstName);
+        this.doUpdate(event);
+    }
+
+    @FXML
+    public void handleOnEditPhoneNumber(TableColumn.CellEditEvent<Nurse, String> event) {
+        String newPhoneNumber = event.getNewValue();
+        if (!isValidPhoneNumber(newPhoneNumber)) {
+            showValidationError("Telefonnummer");
+            event.getTableView().refresh();
+            return;
+        }
+        event.getRowValue().setPhoneNumber(newPhoneNumber);
+        this.doUpdate(event);
+    }
 }

src/main/java/de/hitec/nhplus/patient/AllPatientController.java

@@ -154,7 +154,7 @@ public class AllPatientController {
     public void handleOnEditFirstname(TableColumn.CellEditEvent<Patient, String> event) {
         String newFirstName = event.getNewValue();
         if (!isValidFirstName(newFirstName)) {
-            showValidationError("First Name");
+            showValidationError("Vorname");
             event.getTableView().refresh();
             return;
         }
@@ -166,7 +166,7 @@ public class AllPatientController {
     public void handleOnEditSurname(TableColumn.CellEditEvent<Patient, String> event) {
         String newSurName = event.getNewValue();
         if (!isValidSurName(newSurName)) {
-            showValidationError("Sur Name");
+            showValidationError("Nachname");
             event.getTableView().refresh();
             return;
         }
@@ -178,7 +178,7 @@ public class AllPatientController {
     public void handleOnEditDateOfBirth(TableColumn.CellEditEvent<Patient, String> event) {
         String newDateString = event.getNewValue();
         if (!isValidDate(newDateString)) {
-            showValidationError("Date");
+            showValidationError("Geburtstag");
             event.getTableView().refresh();
             return;
         }
@@ -190,7 +190,7 @@ public class AllPatientController {
     public void handleOnEditCareLevel(TableColumn.CellEditEvent<Patient, String> event) {
         String newCareLevel = event.getNewValue();
         if (!isValidCareLevel(newCareLevel)) {
-            showValidationError("Care Level");
+            showValidationError("Pflegegrad");
             event.getTableView().refresh();
             return;
         }
@@ -202,7 +202,7 @@ public class AllPatientController {
     public void handleOnEditRoomNumber(TableColumn.CellEditEvent<Patient, String> event) {
         String newRoomNumber = event.getNewValue();
         if (!isValidRoomNumber(newRoomNumber)) {
-            showValidationError("Room Number");
+            showValidationError("Raum");
             event.getTableView().refresh();
             return;
         }

src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java

@@ -20,6 +20,7 @@ import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.ArrayList;
 
 /**
@@ -27,6 +28,8 @@ import java.util.ArrayList;
  *
  * @author Bernd Heidemann
  * @author Dominik Säume
+ * @author Armin Ribic
+ * @author Dorian Nemec
  */
 public class AllTreatmentController {
 
@@ -61,7 +64,7 @@ public class AllTreatmentController {
     public ComboBox<String> comboBoxNurseSelection;
 
     @FXML
-    private Button buttonDelete;
+    private Button buttonLock;
 
     private final ObservableList<Treatment> treatments = FXCollections.observableArrayList();
     private TreatmentDao dao;
@@ -100,15 +103,16 @@ public class AllTreatmentController {
         this.columnDescription.setCellValueFactory(new PropertyValueFactory<>("description"));
         this.tableView.setItems(this.treatments);
 
-        this.buttonDelete.setDisable(true);
+        this.buttonLock.setDisable(true);
         this.tableView
                 .getSelectionModel()
                 .selectedItemProperty()
                 .addListener((observableValue, oldTreatment, newTreatment) ->
-                        AllTreatmentController.this.buttonDelete.setDisable(newTreatment == null)
+                        AllTreatmentController.this.buttonLock.setDisable(newTreatment == null)
                 );
 
         this.createComboBoxData();
+
     }
 
     /**
@@ -117,7 +121,7 @@ public class AllTreatmentController {
     public void readAllAndShowInTableView() {
         this.dao = DaoFactory.getInstance().createTreatmentDao();
         try {
-            this.treatments.setAll(dao.readAll());
+            this.treatments.setAll(dao.readAllActive());
         } catch (SQLException exception) {
             exception.printStackTrace();
         }
@@ -136,7 +140,7 @@ public class AllTreatmentController {
                 this.patientSelection.add(patient.getSurName());
             }
 
-            nurseList = (ArrayList<Nurse>) nurseDao.readAll();
+            nurseList = (ArrayList<Nurse>) nurseDao.readAllActive();
             for (Nurse nurse : nurseList) {
                 this.nurseSelection.add(nurse.getSurName());
             }
@@ -258,18 +262,6 @@ public class AllTreatmentController {
         }
     }
 
-    @FXML
-    public void handleDelete() {
-        int index = this.tableView.getSelectionModel().getSelectedIndex();
-        Treatment t = this.treatments.remove(index);
-        TreatmentDao dao = DaoFactory.getInstance().createTreatmentDao();
-        try {
-            dao.delete(t.getId());
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-    }
-
     @FXML
     public void handleNewTreatment() {
         String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
@@ -316,4 +308,22 @@ public class AllTreatmentController {
         });
 
     }
+
+    @FXML
+    public void handleLock(){
+        Treatment selectedItem = this.tableView.getSelectionModel().getSelectedItem();
+        if (selectedItem == null){
+            return;
+        }
+
+        try {
+            selectedItem.setLocked(true);
+            this.dao.update(selectedItem);
+        }catch (SQLException exception){
+            exception.printStackTrace();
+        }
+        readAllAndShowInTableView();
+    }
+
+
 }

src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java

@@ -0,0 +1,124 @@
+package de.hitec.nhplus.treatment;
+
+import de.hitec.nhplus.datastorage.DaoFactory;
+import de.hitec.nhplus.nurse.Nurse;
+import de.hitec.nhplus.patient.Patient;
+import de.hitec.nhplus.treatment.database.TreatmentDao;
+import de.hitec.nhplus.utils.DateConverter;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
+
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Controller for all locked treatments.
+ *
+ * @author Armin Ribic
+ * @author Dorian Nemec
+ */
+public class LockedTreatmentController {
+
+    @FXML
+    public Button buttonUnlock;
+    @FXML
+    public TableView<Treatment> tableView;
+    @FXML
+    public TableColumn<Treatment, Long> columnId;
+    @FXML
+    private TableColumn<Treatment, String> columnPatient;
+    @FXML
+    private TableColumn<Treatment, String> columnNurse;
+    @FXML
+    private TableColumn<Treatment, String> columnDeleteDate;
+
+    private final ObservableList<Treatment> treatments = FXCollections.observableArrayList();
+    private TreatmentDao treatmentDao;
+
+    /**
+     * This method allows initializing a {@link LockedTreatmentController} object
+     * that is called after the binding of all the fields.
+     */
+    public void initialize() {
+        this.readAllAndShowInTableView();
+
+        this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
+
+        this.columnPatient.setCellValueFactory(
+                cellData -> {
+                    Patient patient = cellData.getValue().getPatient();
+                    return new SimpleStringProperty(patient.getSurName() + ", " + patient.getFirstName());
+                }
+        );
+
+        this.columnNurse.setCellValueFactory(
+                cellData -> {
+                    Nurse nurse = cellData.getValue().getNurse();
+                    return new SimpleStringProperty(nurse.getSurName() + ", " + nurse.getFirstName());
+                }
+        );
+        this.columnDeleteDate.setCellValueFactory(cellData -> new SimpleStringProperty(
+                DateConverter.convertLocalDateToString(cellData.getValue().calculateDeleteDate())));
+
+
+        this.tableView.setItems(this.treatments);
+    }
+
+    /**
+     * Reads all locked {@link Treatment} data and shows it in the table.
+     */
+    private void readAllAndShowInTableView() {
+        this.treatments.clear();
+
+        this.treatmentDao = DaoFactory.getInstance().createTreatmentDao();
+        try {
+            this.treatments.addAll(this.treatmentDao.readAllLocked());
+            deleteOldTreatments();
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    /**
+     * Deletes all {@link Treatment}s which are older than allowed.
+     */
+    private void deleteOldTreatments() {
+        LocalDate today = LocalDate.now();
+
+        for (Treatment treatment : treatments) {
+            LocalDate deleteDate = treatment.calculateDeleteDate();
+            if (today.isEqual(deleteDate) || today.isAfter(deleteDate)) {
+                try {
+                    treatmentDao.delete(treatment.getId());
+                } catch (SQLException exception) {
+                    exception.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @FXML
+    private void unlockTreatment() {
+        Treatment selectedItem = this.tableView.getSelectionModel().getSelectedItem();
+        if (selectedItem == null) {
+            return;
+        }
+
+        try {
+            selectedItem.setLocked(false);
+            this.treatmentDao.update(selectedItem);
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+        }
+        readAllAndShowInTableView();
+    }
+
+}

src/main/java/de/hitec/nhplus/treatment/Treatment.java

@@ -3,6 +3,7 @@ package de.hitec.nhplus.treatment;
 import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -16,6 +17,8 @@ import java.util.StringJoiner;
  *
  * @author Bernd Heidemann
  * @author Dominik Säume
+ * @author Armin Ribic
+ * @author Dorian Nemec
  */
 public class Treatment {
     private SimpleIntegerProperty id;
@@ -26,6 +29,8 @@ public class Treatment {
     private final SimpleObjectProperty<LocalTime> end;
     private final SimpleStringProperty description;
     private final SimpleStringProperty remarks;
+    private final SimpleBooleanProperty locked;
+    private final static int BLOCKED_YEARS = 10;
 
     /**
      * This constructor allows instantiating a {@link Treatment} object,
@@ -50,6 +55,7 @@ public class Treatment {
         this.end = new SimpleObjectProperty<>(end);
         this.description = new SimpleStringProperty(description);
         this.remarks = new SimpleStringProperty(remarks);
+        this.locked = new SimpleBooleanProperty(false);
     }
 
     /**
@@ -63,7 +69,8 @@ public class Treatment {
             LocalTime begin,
             LocalTime end,
             String description,
-            String remarks
+            String remarks,
+            Boolean isLocked
     ) {
         this.id = new SimpleIntegerProperty(id);
         this.patient = new SimpleObjectProperty<>(patient);
@@ -73,6 +80,26 @@ public class Treatment {
         this.end = new SimpleObjectProperty<>(end);
         this.description = new SimpleStringProperty(description);
         this.remarks = new SimpleStringProperty(remarks);
+        this.locked = new SimpleBooleanProperty(isLocked);
+    }
+
+    /**
+     * Calculates delete date of treatment.
+     */
+    public LocalDate calculateDeleteDate() {
+        return DateConverter.convertStringToLocalDate(getDate()).plusYears(BLOCKED_YEARS);
+    }
+
+    public boolean isLocked() {
+        return locked.get();
+    }
+
+    public SimpleBooleanProperty lockedProperty() {
+        return locked;
+    }
+
+    public void setLocked(boolean locked) {
+        this.locked.set(locked);
     }
 
     public int getId() {
@@ -166,6 +193,8 @@ public class Treatment {
                 .add("End: " + this.getEnd())
                 .add("Description: " + this.getDescription())
                 .add("Remarks: " + this.getRemarks())
+                .add("isLocked: " + this.isLocked())
                 .toString();
     }
+
 }

src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java

@@ -11,6 +11,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,6 +21,8 @@ import java.util.List;
  *
  * @author Bernd Heidemannn
  * @author Dominik Säume
+ * @author Armin Ribic
+ * @author Dorian Nemec
  */
 public class TreatmentDao extends DaoImp<Treatment> {
 
@@ -27,60 +30,22 @@ public class TreatmentDao extends DaoImp<Treatment> {
         super(connection);
     }
 
-    @Override
+    /**
-    protected PreparedStatement getCreateStatement(Treatment treatment) throws SQLException {
+     * Read all database entries of active {@link Treatment}s into a {@link List} of model instances.
-        final String SQL = """
+     */
-                    INSERT INTO treatment
+    public List<Treatment> readAllActive() throws SQLException {
-                    (patientId, nurseId, date, begin, end, description, remark)
+        final String SQL = "SELECT * FROM treatment WHERE isLocked = false";
-                    VALUES (?, ?, ?, ?, ?, ?, ?)
+        return getListFromResultSet(this.connection.prepareStatement(SQL).executeQuery());
-                """;
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setInt(1, treatment.getPatient().getId());
-        statement.setInt(2, treatment.getNurse().getId());
-        statement.setString(3, treatment.getDate());
-        statement.setString(4, treatment.getBegin());
-        statement.setString(5, treatment.getEnd());
-        statement.setString(6, treatment.getDescription());
-        statement.setString(7, treatment.getRemarks());
-        return statement;
     }
 
-    @Override
+    /**
-    protected PreparedStatement getReadByIDStatement(int id) throws SQLException {
+     * Read all database entries of locked {@link Treatment}s into a {@link Treatment} of model instances.
-        final String SQL = "SELECT * FROM treatment WHERE id = ?";
+     */
-        PreparedStatement statement = this.connection.prepareStatement(SQL);
+    public List<Treatment> readAllLocked() throws SQLException {
-        statement.setInt(1, id);
+        final String SQL = "SELECT * FROM treatment WHERE isLocked = true";
-        return statement;
+        return getListFromResultSet(this.connection.prepareStatement(SQL).executeQuery());
     }
 
-    @Override
-    protected Treatment getInstanceFromResultSet(ResultSet result) throws SQLException {
-        return new Treatment(
-                result.getInt(1),
-                DaoFactory.getInstance().createPatientDAO().read(result.getInt(2)),
-                DaoFactory.getInstance().createNurseDAO().read(result.getInt(3)),
-                DateConverter.convertStringToLocalDate(result.getString(4)),
-                DateConverter.convertStringToLocalTime(result.getString(5)),
-                DateConverter.convertStringToLocalTime(result.getString(6)),
-                result.getString(7),
-                result.getString(8)
-        );
-    }
-
-    @Override
-    protected PreparedStatement getReadAllStatement() throws SQLException {
-        final String SQL = "SELECT * FROM treatment";
-        return this.connection.prepareStatement(SQL);
-    }
-
-    @Override
-    protected List<Treatment> getListFromResultSet(ResultSet result) throws SQLException {
-        ArrayList<Treatment> list = new ArrayList<>();
-        while (result.next()) {
-            list.add(getInstanceFromResultSet(result));
-        }
-        return list;
-    }
 
     /**
      * Retrieves a list of {@link Treatment}s associated with a specific
@@ -112,6 +77,63 @@ public class TreatmentDao extends DaoImp<Treatment> {
         return getListFromResultSet(result);
     }
 
+    @Override
+    protected PreparedStatement getCreateStatement(Treatment treatment) throws SQLException {
+        final String SQL = """
+                    INSERT INTO treatment
+                    (patientId, nurseId, date, begin, end, description, remark, isLocked)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                """;
+        PreparedStatement statement = this.connection.prepareStatement(SQL);
+        statement.setInt(1, treatment.getPatient().getId());
+        statement.setInt(2, treatment.getNurse().getId());
+        statement.setString(3, treatment.getDate());
+        statement.setString(4, treatment.getBegin());
+        statement.setString(5, treatment.getEnd());
+        statement.setString(6, treatment.getDescription());
+        statement.setString(7, treatment.getRemarks());
+        statement.setBoolean(8, treatment.isLocked());
+        return statement;
+    }
+
+    @Override
+    protected PreparedStatement getReadByIDStatement(int id) throws SQLException {
+        final String SQL = "SELECT * FROM treatment WHERE id = ?";
+        PreparedStatement statement = this.connection.prepareStatement(SQL);
+        statement.setInt(1, id);
+        return statement;
+    }
+
+    @Override
+    protected Treatment getInstanceFromResultSet(ResultSet result) throws SQLException {
+        return new Treatment(
+                result.getInt(1),
+                DaoFactory.getInstance().createPatientDAO().read(result.getInt(2)),
+                DaoFactory.getInstance().createNurseDAO().read(result.getInt(3)),
+                DateConverter.convertStringToLocalDate(result.getString(4)),
+                DateConverter.convertStringToLocalTime(result.getString(5)),
+                DateConverter.convertStringToLocalTime(result.getString(6)),
+                result.getString(7),
+                result.getString(8),
+                result.getBoolean(9)
+        );
+    }
+
+    @Override
+    protected PreparedStatement getReadAllStatement() throws SQLException {
+        final String SQL = "SELECT * FROM treatment";
+        return this.connection.prepareStatement(SQL);
+    }
+
+    @Override
+    protected List<Treatment> getListFromResultSet(ResultSet result) throws SQLException {
+        ArrayList<Treatment> list = new ArrayList<>();
+        while (result.next()) {
+            list.add(getInstanceFromResultSet(result));
+        }
+        return list;
+    }
+
     @Override
     protected PreparedStatement getUpdateStatement(Treatment treatment) throws SQLException {
         final String SQL = """
@@ -120,7 +142,8 @@ public class TreatmentDao extends DaoImp<Treatment> {
                    begin = ?,
                    end = ?,
                    description = ?,
-                   remark = ?
+                   remark = ?,
+                   isLocked = ?
                    WHERE id = ?
                 """;
         PreparedStatement statement = this.connection.prepareStatement(SQL);
@@ -129,7 +152,8 @@ public class TreatmentDao extends DaoImp<Treatment> {
         statement.setString(3, treatment.getEnd());
         statement.setString(4, treatment.getDescription());
         statement.setString(5, treatment.getRemarks());
-        statement.setInt(6, treatment.getId());
+        statement.setBoolean(6, treatment.isLocked());
+        statement.setInt(7, treatment.getId());
         return statement;
     }
 
@@ -141,4 +165,5 @@ public class TreatmentDao extends DaoImp<Treatment> {
         statement.setInt(1, id);
         return statement;
     }
+
 }

src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml

@@ -13,7 +13,14 @@
         <AnchorPane fx:id="patientPage"/>
     </Tab>
     <Tab fx:id="treatmentTab"  text="Behandlungen">
-        <AnchorPane fx:id="treatmentPage"/>
+        <TabPane fx:id="treatmentTabPane" tabClosingPolicy="UNAVAILABLE">
+            <Tab fx:id="activeTreatmentTab" text="Behandlungen">
+                <AnchorPane fx:id="activeTreatmentPage"/>
+            </Tab>
+            <Tab fx:id="lockedTreatmentTab" text="Gesperrte Behandlungen">
+                <AnchorPane fx:id="lockedTreatmentPage" />
+            </Tab>
+        </TabPane>
     </Tab>
     <Tab fx:id="nurseTab" text="Pfleger">
         <TabPane fx:id="nurseTabPane" tabClosingPolicy="UNAVAILABLE">

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

@@ -22,16 +22,19 @@
                 <TableColumn
                         fx:id="columnSurName"
                         minWidth="140.0"
+                        onEditCommit="#handleOnEditSurname"
                         text="Nachname"
                 />
                 <TableColumn
                         fx:id="columnFirstName"
                         minWidth="140.0"
+                        onEditCommit="#handleOnEditFirstname"
                         text="Vorname"
                 />
                 <TableColumn
                         fx:id="columnPhoneNumber"
                         minWidth="140.0"
+                        onEditCommit="#handleOnEditPhoneNumber"
                         text="Telefonnummer"
                 />
             </columns>

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

@@ -12,7 +12,11 @@
         <Insets top="8" left="8" right="8" bottom="8"/>
     </padding>
     <center>
-        <TableView fx:id="tableView" layoutX="31.0" layoutY="40" onMouseClicked="#handleMouseClick" >
+        <TableView
+                fx:id="tableView"
+                layoutX="31.0"
+                layoutY="40"
+                onMouseClicked="#handleMouseClick" >
             <columns>
                 <TableColumn
                         fx:id="columnId"

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

@@ -88,11 +88,11 @@
             </center>
             <right>
                 <Button
-                        fx:id="buttonDelete"
+                        fx:id="buttonLock"
                         mnemonicParsing="false"
-                        onAction="#handleDelete"
+                        onAction="#handleLock"
                         prefWidth="200.0"
-                        text="Löschen"
+                        text="Sperren"
                         GridPane.columnIndex="2"
                 />
             </right>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<BorderPane prefHeight="400.0"
+            prefWidth="600.0"
+            xmlns="http://javafx.com/javafx/17.0.2-ea"
+            xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="de.hitec.nhplus.treatment.LockedTreatmentController">
+    <padding>
+        <Insets bottom="8" left="8" right="8" top="8" />
+    </padding>
+    <center>
+        <TableView
+                fx:id="tableView"
+                layoutX="31.0"
+                layoutY="40">
+            <columns>
+                <TableColumn
+                        fx:id="columnId"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="ID"
+                />
+                <TableColumn
+                        fx:id="columnPatient"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Patient"
+                />
+                <TableColumn
+                        fx:id="columnNurse"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Pflegekraft"
+                />
+                <TableColumn
+                        fx:id="columnDeleteDate"
+                        minWidth="40.0"
+                        prefWidth="102.0"
+                        text="Löschung am"
+                />
+            </columns>
+            <columnResizePolicy>
+                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+            </columnResizePolicy>
+        </TableView>
+    </center>
+    <bottom>
+        <BorderPane>
+            <BorderPane.margin>
+                <Insets top="8.0"/>
+            </BorderPane.margin>
+            <center>
+                <HBox spacing="8.0">
+                    <padding>
+                        <Insets right="8.0"/>
+                    </padding>
+                </HBox>
+            </center>
+            <right>
+                <HBox>
+                    <spacing>8.0</spacing>
+                    <Button
+                            fx:id="buttonUnlock"
+                            mnemonicParsing="false"
+                            onAction="#unlockTreatment"
+                            prefWidth="90.0"
+                            text="Entsperren"
+                    />
+                </HBox>
+            </right>
+        </BorderPane>
+    </bottom>
+</BorderPane>

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

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