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

@@ -2,9 +2,8 @@ package de.hitec.nhplus.controller;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
 import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -14,58 +13,82 @@ import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.cell.TextFieldTableCell;
+import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.SQLException;
 import java.time.LocalDate;
 
-import static de.hitec.nhplus.utils.Validator.*;
 
-public class AllPatientController
+/**
-{
+ * The <code>AllPatientController</code> contains the entire logic of the patient view. It determines which data is displayed and how to react to events.
+ */
+public class AllPatientController {
 
     @FXML
     private TableView<Patient> tableView;
+
     @FXML
     private TableColumn<Patient, Integer> columnId;
+
     @FXML
     private TableColumn<Patient, String> columnFirstName;
+
     @FXML
     private TableColumn<Patient, String> columnSurname;
+
     @FXML
     private TableColumn<Patient, String> columnDateOfBirth;
+
     @FXML
     private TableColumn<Patient, String> columnCareLevel;
+
     @FXML
     private TableColumn<Patient, String> columnRoomNumber;
+
     @FXML
     private TableColumn<Patient, String> columnAssets;
+
     @FXML
     private Button buttonDelete;
+
     @FXML
     private Button buttonAdd;
+
     @FXML
     private TextField textFieldSurname;
+
     @FXML
     private TextField textFieldFirstName;
+
     @FXML
     private TextField textFieldDateOfBirth;
+
     @FXML
     private TextField textFieldCareLevel;
+
     @FXML
     private TextField textFieldRoomNumber;
+
     @FXML
     private TextField textFieldAssets;
 
     private final ObservableList<Patient> patients = FXCollections.observableArrayList();
     private PatientDao dao;
 
-    public void initialize()
+    /**
-    {
+     * When <code>initialize()</code> gets called, all fields are already initialized. For example from the FXMLLoader
+     * after loading an FXML-File. At this point of the lifecycle of the Controller, the fields can be accessed and
+     * configured.
+     */
+    public void initialize() {
         this.readAllAndShowInTableView();
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("pid"));
 
+        // CellValueFactory to show property values in TableView
         this.columnFirstName.setCellValueFactory(new PropertyValueFactory<>("firstName"));
+        // CellFactory to write property values from with in the TableView
         this.columnFirstName.setCellFactory(TextFieldTableCell.forTableColumn());
 
         this.columnSurname.setCellValueFactory(new PropertyValueFactory<>("surname"));
@@ -83,166 +106,146 @@ public class AllPatientController
         this.columnAssets.setCellValueFactory(new PropertyValueFactory<>("assets"));
         this.columnAssets.setCellFactory(TextFieldTableCell.forTableColumn());
 
+        //Anzeigen der Daten
         this.tableView.setItems(this.patients);
 
         this.buttonDelete.setDisable(true);
-        this.tableView
+        this.tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Patient>() {
-            .getSelectionModel()
+            @Override
-            .selectedItemProperty()
+            public void changed(ObservableValue<? extends Patient> observableValue, Patient oldPatient, Patient newPatient) {;
-            .addListener((observableValue, oldPatient, newPatient) ->
+                AllPatientController.this.buttonDelete.setDisable(newPatient == null);
-                {
+            }
-                    AllPatientController.this.buttonDelete.setDisable(newPatient == null);
+        });
-                }
-            );
 
         this.buttonAdd.setDisable(true);
-        ChangeListener<String> inputNewPatientValidationListener = (observableValue, oldText, newText) ->
+        ChangeListener<String> inputNewPatientListener = (observableValue, oldText, newText) ->
-        {
+                AllPatientController.this.buttonAdd.setDisable(!AllPatientController.this.areInputDataValid());
-            boolean isValid = isValidDate(this.textFieldDateOfBirth.getText())
+        this.textFieldSurname.textProperty().addListener(inputNewPatientListener);
-                && isValidFirstName(this.textFieldFirstName.getText())
+        this.textFieldFirstName.textProperty().addListener(inputNewPatientListener);
-                && isValidSurName(this.textFieldSurname.getText())
+        this.textFieldDateOfBirth.textProperty().addListener(inputNewPatientListener);
-                && isValidDate(this.textFieldDateOfBirth.getText())
+        this.textFieldCareLevel.textProperty().addListener(inputNewPatientListener);
-                && isValidCareLevel(this.textFieldCareLevel.getText())
+        this.textFieldRoomNumber.textProperty().addListener(inputNewPatientListener);
-                && isValidRoomNumber(textFieldRoomNumber.getText())
+        this.textFieldAssets.textProperty().addListener(inputNewPatientListener);
-                && !this.textFieldAssets.getText().isBlank();
-
-            AllPatientController.this.buttonAdd.setDisable(!isValid);
-        };
-
-        this.textFieldSurname.textProperty().addListener(inputNewPatientValidationListener);
-        this.textFieldFirstName.textProperty().addListener(inputNewPatientValidationListener);
-        this.textFieldDateOfBirth.textProperty().addListener(inputNewPatientValidationListener);
-        this.textFieldCareLevel.textProperty().addListener(inputNewPatientValidationListener);
-        this.textFieldRoomNumber.textProperty().addListener(inputNewPatientValidationListener);
-        this.textFieldAssets.textProperty().addListener(inputNewPatientValidationListener);
     }
 
+    /**
+     * When a cell of the column with first names was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditFirstname(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditFirstname(TableColumn.CellEditEvent<Patient, String> event) {
-    {
+        event.getRowValue().setFirstName(event.getNewValue());
-        String newFirstName = event.getNewValue();
-        if (!isValidFirstName(newFirstName))
-        {
-            showValidationError("First Name");
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setFirstName(newFirstName);
         this.doUpdate(event);
     }
 
+    /**
+     * When a cell of the column with surnames was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditSurname(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditSurname(TableColumn.CellEditEvent<Patient, String> event) {
-    {
+        event.getRowValue().setSurname(event.getNewValue());
-        String newSurName = event.getNewValue();
-        if (!isValidSurName(newSurName))
-        {
-            showValidationError("Sur Name");
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setSurname(newSurName);
         this.doUpdate(event);
     }
 
+    /**
+     * When a cell of the column with dates of birth was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditDateOfBirth(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditDateOfBirth(TableColumn.CellEditEvent<Patient, String> event) {
-    {
+        event.getRowValue().setDateOfBirth(event.getNewValue());
-        String newDateString = event.getNewValue();
-        if (!isValidDate(newDateString))
-        {
-            showValidationError("Date");
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setDateOfBirth(newDateString);
         this.doUpdate(event);
     }
 
+    /**
+     * When a cell of the column with care levels was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditCareLevel(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditCareLevel(TableColumn.CellEditEvent<Patient, String> event) {
-    {
+        event.getRowValue().setCareLevel(event.getNewValue());
-        String newCareLevel = event.getNewValue();
-        if (!isValidCareLevel(newCareLevel))
-        {
-            showValidationError("Care Level");
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setCareLevel(newCareLevel);
         this.doUpdate(event);
     }
 
+    /**
+     * When a cell of the column with room numbers was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditRoomNumber(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditRoomNumber(TableColumn.CellEditEvent<Patient, String> event){
-    {
+        event.getRowValue().setRoomNumber(event.getNewValue());
-        String newRoomNumber = event.getNewValue();
-        if (!isValidRoomNumber(newRoomNumber))
-        {
-            showValidationError("Room Number");
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setRoomNumber(newRoomNumber);
         this.doUpdate(event);
     }
 
+    /**
+     * When a cell of the column with assets was changed, this method will be called, to persist the change.
+     *
+     * @param event Event including the changed object and the change.
+     */
     @FXML
-    public void handleOnEditAssets(TableColumn.CellEditEvent<Patient, String> event)
+    public void handleOnEditAssets(TableColumn.CellEditEvent<Patient, String> event){
-    {
+        event.getRowValue().setAssets(event.getNewValue());
-        String newAssets = event.getNewValue();
-        if(newAssets.isBlank()){
-            event.getTableView().refresh();
-            return;
-        }
-        event.getRowValue().setAssets(newAssets);
         this.doUpdate(event);
     }
 
-    private void doUpdate(TableColumn.CellEditEvent<Patient, String> event)
+    /**
-    {
+     * Updates a patient by calling the method <code>update()</code> of {@link PatientDao}.
-        try
+     *
-        {
+     * @param event Event including the changed object and the change.
+     */
+    private void doUpdate(TableColumn.CellEditEvent<Patient, String> event) {
+        try {
             this.dao.update(event.getRowValue());
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
-    private void readAllAndShowInTableView()
+    /**
-    {
+     * Reloads all patients to the table by clearing the list of all patients and filling it again by all persisted
+     * patients, delivered by {@link PatientDao}.
+     */
+    private void readAllAndShowInTableView() {
         this.patients.clear();
         this.dao = DaoFactory.getDaoFactory().createPatientDAO();
-        try
+        try {
-        {
             this.patients.addAll(this.dao.readAll());
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
+    /**
+     * This method handles events fired by the button to delete patients. It calls {@link PatientDao} to delete the
+     * patient from the database and removes the object from the list, which is the data source of the
+     * <code>TableView</code>.
+     */
     @FXML
-    public void handleDelete()
+    public void handleDelete() {
-    {
         Patient selectedItem = this.tableView.getSelectionModel().getSelectedItem();
-        if (selectedItem != null)
+        if (selectedItem != null) {
-        {
+            try {
-            try
-            {
                 DaoFactory.getDaoFactory().createPatientDAO().deleteById(selectedItem.getPid());
                 this.tableView.getItems().remove(selectedItem);
-            } catch (SQLException exception)
+            } catch (SQLException exception) {
-            {
                 exception.printStackTrace();
             }
         }
     }
 
+    /**
+     * This method handles the events fired by the button to add a patient. It collects the data from the
+     * <code>TextField</code>s, creates an object of class <code>Patient</code> of it and passes the object to
+     * {@link PatientDao} to persist the data.
+     */
     @FXML
-    public void handleAdd()
+    public void handleAdd() {
-    {
         String surname = this.textFieldSurname.getText();
         String firstName = this.textFieldFirstName.getText();
         String birthday = this.textFieldDateOfBirth.getText();
@@ -250,19 +253,19 @@ public class AllPatientController
         String careLevel = this.textFieldCareLevel.getText();
         String roomNumber = this.textFieldRoomNumber.getText();
         String assets = this.textFieldAssets.getText();
-        try
+        try {
-        {
             this.dao.create(new Patient(firstName, surname, date, careLevel, roomNumber, assets));
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
         readAllAndShowInTableView();
         clearTextfields();
     }
 
-    private void clearTextfields()
+    /**
-    {
+     * Clears all contents from all <code>TextField</code>s.
+     */
+    private void clearTextfields() {
         this.textFieldFirstName.clear();
         this.textFieldSurname.clear();
         this.textFieldDateOfBirth.clear();
@@ -270,4 +273,18 @@ public class AllPatientController
         this.textFieldRoomNumber.clear();
         this.textFieldAssets.clear();
     }
+
+    private boolean areInputDataValid() {
+        if (!this.textFieldDateOfBirth.getText().isBlank()) {
+            try {
+                DateConverter.convertStringToLocalDate(this.textFieldDateOfBirth.getText());
+            } catch (Exception exception) {
+                return false;
+            }
+        }
+
+        return !this.textFieldFirstName.getText().isBlank() && !this.textFieldSurname.getText().isBlank() &&
+                !this.textFieldDateOfBirth.getText().isBlank() && !this.textFieldCareLevel.getText().isBlank() &&
+                !this.textFieldRoomNumber.getText().isBlank() && !this.textFieldAssets.getText().isBlank();
+    }
 }

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

@@ -4,8 +4,6 @@ import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
 import de.hitec.nhplus.datastorage.PatientDao;
 import de.hitec.nhplus.datastorage.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -15,13 +13,14 @@ import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
+import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.model.Treatment;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-public class AllTreatmentController
+public class AllTreatmentController {
-{
 
     @FXML
     private TableView<Treatment> tableView;
@@ -55,8 +54,7 @@ public class AllTreatmentController
     private final ObservableList<String> patientSelection = FXCollections.observableArrayList();
     private ArrayList<Patient> patientList;
 
-    public void initialize()
+    public void initialize() {
-    {
         readAllAndShowInTableView();
         comboBoxPatientSelection.setItems(patientSelection);
         comboBoxPatientSelection.getSelectionModel().select(0);
@@ -69,88 +67,67 @@ public class AllTreatmentController
         this.columnDescription.setCellValueFactory(new PropertyValueFactory<>("description"));
         this.tableView.setItems(this.treatments);
 
+        // Disabling the button to delete treatments as long, as no treatment was selected.
         this.buttonDelete.setDisable(true);
-        this.tableView
+        this.tableView.getSelectionModel().selectedItemProperty().addListener(
-            .getSelectionModel()
+                (observableValue, oldTreatment, newTreatment) ->
-            .selectedItemProperty()
+                        AllTreatmentController.this.buttonDelete.setDisable(newTreatment == null));
-            .addListener((observableValue, oldTreatment, newTreatment) ->
-                {
-                    AllTreatmentController.this.buttonDelete.setDisable(newTreatment == null);
-                }
-            );
 
         this.createComboBoxData();
     }
 
-    public void readAllAndShowInTableView()
+    public void readAllAndShowInTableView() {
-    {
         this.treatments.clear();
         comboBoxPatientSelection.getSelectionModel().select(0);
         this.dao = DaoFactory.getDaoFactory().createTreatmentDao();
-        try
+        try {
-        {
             this.treatments.addAll(dao.readAll());
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
-    private void createComboBoxData()
+    private void createComboBoxData() {
-    {
         PatientDao dao = DaoFactory.getDaoFactory().createPatientDAO();
-        try
+        try {
-        {
             patientList = (ArrayList<Patient>) dao.readAll();
             this.patientSelection.add("alle");
-            for (Patient patient : patientList)
+            for (Patient patient: patientList) {
-            {
                 this.patientSelection.add(patient.getSurname());
             }
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
 
     @FXML
-    public void handleComboBox()
+    public void handleComboBox() {
-    {
         String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
         this.treatments.clear();
         this.dao = DaoFactory.getDaoFactory().createTreatmentDao();
 
-        if (selectedPatient.equals("alle"))
+        if (selectedPatient.equals("alle")) {
-        {
+            try {
-            try
-            {
                 this.treatments.addAll(this.dao.readAll());
-            } catch (SQLException exception)
+            } catch (SQLException exception) {
-            {
                 exception.printStackTrace();
             }
         }
 
         Patient patient = searchInList(selectedPatient);
-        if (patient != null)
+        if (patient !=null) {
-        {
+            try {
-            try
-            {
                 this.treatments.addAll(this.dao.readTreatmentsByPid(patient.getPid()));
-            } catch (SQLException exception)
+            } catch (SQLException exception) {
-            {
                 exception.printStackTrace();
             }
         }
     }
 
-    private Patient searchInList(String surname)
+    private Patient searchInList(String surname) {
-    {
+        for (Patient patient : this.patientList) {
-        for (Patient patient : this.patientList)
+            if (patient.getSurname().equals(surname)) {
-        {
-            if (patient.getSurname().equals(surname))
-            {
                 return patient;
             }
         }
@@ -158,30 +135,24 @@ public class AllTreatmentController
     }
 
     @FXML
-    public void handleDelete()
+    public void handleDelete() {
-    {
         int index = this.tableView.getSelectionModel().getSelectedIndex();
         Treatment t = this.treatments.remove(index);
         TreatmentDao dao = DaoFactory.getDaoFactory().createTreatmentDao();
-        try
+        try {
-        {
             dao.deleteById(t.getTid());
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
     @FXML
-    public void handleNewTreatment()
+    public void handleNewTreatment() {
-    {
+        try{
-        try
-        {
             String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
             Patient patient = searchInList(selectedPatient);
             newTreatmentWindow(patient);
-        } catch (NullPointerException exception)
+        } catch (NullPointerException exception){
-        {
             Alert alert = new Alert(Alert.AlertType.INFORMATION);
             alert.setTitle("Information");
             alert.setHeaderText("Patient für die Behandlung fehlt!");
@@ -191,12 +162,9 @@ public class AllTreatmentController
     }
 
     @FXML
-    public void handleMouseClick()
+    public void handleMouseClick() {
-    {
+        tableView.setOnMouseClicked(event -> {
-        tableView.setOnMouseClicked(event ->
+            if (event.getClickCount() == 2 && (tableView.getSelectionModel().getSelectedItem() != null)) {
-        {
-            if (event.getClickCount() == 2 && (tableView.getSelectionModel().getSelectedItem() != null))
-            {
                 int index = this.tableView.getSelectionModel().getSelectedIndex();
                 Treatment treatment = this.treatments.get(index);
                 treatmentWindow(treatment);
@@ -204,10 +172,8 @@ public class AllTreatmentController
         });
     }
 
-    public void newTreatmentWindow(Patient patient)
+    public void newTreatmentWindow(Patient patient) {
-    {
+        try {
-        try
-        {
             FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/NewTreatmentView.fxml"));
             AnchorPane pane = loader.load();
             Scene scene = new Scene(pane);
@@ -221,16 +187,13 @@ public class AllTreatmentController
             stage.setScene(scene);
             stage.setResizable(false);
             stage.showAndWait();
-        } catch (IOException exception)
+        } catch (IOException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
-    public void treatmentWindow(Treatment treatment)
+    public void treatmentWindow(Treatment treatment){
-    {
+        try {
-        try
-        {
             FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/TreatmentView.fxml"));
             AnchorPane pane = loader.load();
             Scene scene = new Scene(pane);
@@ -243,8 +206,7 @@ public class AllTreatmentController
             stage.setScene(scene);
             stage.setResizable(false);
             stage.showAndWait();
-        } catch (IOException exception)
+        } catch (IOException exception) {
-        {
             exception.printStackTrace();
         }
     }

src/main/java/de/hitec/nhplus/controller/NewTreatmentController.java

@@ -2,23 +2,20 @@ package de.hitec.nhplus.controller;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
 import de.hitec.nhplus.datastorage.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
-import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.stage.Stage;
+import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.utils.DateConverter;
 import javafx.util.StringConverter;
 
 import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-import static de.hitec.nhplus.utils.Validator.*;
+public class NewTreatmentController {
-
-public class NewTreatmentController
-{
 
     @FXML
     private Label labelFirstName;
@@ -48,66 +45,40 @@ public class NewTreatmentController
     private Patient patient;
     private Stage stage;
 
-    public void initialize(AllTreatmentController controller, Stage stage, Patient patient)
+    public void initialize(AllTreatmentController controller, Stage stage, Patient patient) {
-    {
+        this.controller= controller;
-        this.controller = controller;
         this.patient = patient;
         this.stage = stage;
 
         this.buttonAdd.setDisable(true);
-        ChangeListener<String> inputNewTreatmentTextValidationListener = (observableValue, oldText, newText) ->
+        ChangeListener<String> inputNewPatientListener = (observableValue, oldText, newText) ->
-        {
+                NewTreatmentController.this.buttonAdd.setDisable(NewTreatmentController.this.areInputDataInvalid());
-            boolean isValid = isValidDate(this.datePicker.getValue())
+        this.textFieldBegin.textProperty().addListener(inputNewPatientListener);
-                && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
+        this.textFieldEnd.textProperty().addListener(inputNewPatientListener);
-                && isValidDescription(this.textFieldDescription.getText());
+        this.textFieldDescription.textProperty().addListener(inputNewPatientListener);
-
+        this.textAreaRemarks.textProperty().addListener(inputNewPatientListener);
-            NewTreatmentController.this.buttonAdd.setDisable(!isValid);
+        this.datePicker.valueProperty().addListener((observableValue, localDate, t1) -> NewTreatmentController.this.buttonAdd.setDisable(NewTreatmentController.this.areInputDataInvalid()));
-        };
+        this.datePicker.setConverter(new StringConverter<>() {
-        ChangeListener<LocalDate> inputNewTreatmentDateValidationListener = (observableValue, localDate, t1) ->
-        {
-            boolean isValid = isValidDate(this.datePicker.getValue())
-                && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
-                && isValidDescription(this.textFieldDescription.getText());
-
-            NewTreatmentController.this.buttonAdd.setDisable(!isValid);
-        };
-
-        this.textFieldBegin.textProperty().addListener(inputNewTreatmentTextValidationListener);
-        this.textFieldEnd.textProperty().addListener(inputNewTreatmentTextValidationListener);
-        this.textFieldDescription.textProperty().addListener(inputNewTreatmentTextValidationListener);
-        this.textAreaRemarks.textProperty().addListener(inputNewTreatmentTextValidationListener);
-        this.datePicker.valueProperty().addListener(inputNewTreatmentDateValidationListener);
-
-        this.datePicker.setConverter(new StringConverter<>()
-        {
             @Override
-            public String toString(LocalDate localDate)
+            public String toString(LocalDate localDate) {
-            {
                 return (localDate == null) ? "" : DateConverter.convertLocalDateToString(localDate);
             }
 
             @Override
-            public LocalDate fromString(String localDate)
+            public LocalDate fromString(String localDate) {
-            {
-                if (!isValidDate(localDate))
-                {
-                    return null;
-                }
                 return DateConverter.convertStringToLocalDate(localDate);
             }
         });
         this.showPatientData();
     }
 
-    private void showPatientData()
+    private void showPatientData(){
-    {
         this.labelFirstName.setText(patient.getFirstName());
         this.labelSurname.setText(patient.getSurname());
     }
 
     @FXML
-    public void handleAdd()
+    public void handleAdd(){
-    {
         LocalDate date = this.datePicker.getValue();
         LocalTime begin = DateConverter.convertStringToLocalTime(textFieldBegin.getText());
         LocalTime end = DateConverter.convertStringToLocalTime(textFieldEnd.getText());
@@ -119,22 +90,33 @@ public class NewTreatmentController
         stage.close();
     }
 
-    private void createTreatment(Treatment treatment)
+    private void createTreatment(Treatment treatment) {
-    {
         TreatmentDao dao = DaoFactory.getDaoFactory().createTreatmentDao();
-        try
+        try {
-        {
             dao.create(treatment);
-        } catch (SQLException exception)
+        } catch (SQLException exception) {
-        {
             exception.printStackTrace();
         }
     }
 
     @FXML
-    public void handleCancel()
+    public void handleCancel(){
-    {
         stage.close();
     }
 
+    private boolean areInputDataInvalid() {
+        if (this.textFieldBegin.getText() == null || this.textFieldEnd.getText() == null) {
+            return true;
+        }
+        try {
+            LocalTime begin = DateConverter.convertStringToLocalTime(this.textFieldBegin.getText());
+            LocalTime end = DateConverter.convertStringToLocalTime(this.textFieldEnd.getText());
+            if (!end.isAfter(begin)) {
+                return true;
+            }
+        } catch (Exception exception) {
+            return true;
+        }
+        return this.textFieldDescription.getText().isBlank() || this.datePicker.getValue() == null;
+    }
 }

src/main/java/de/hitec/nhplus/controller/TreatmentController.java

@@ -13,8 +13,6 @@ import de.hitec.nhplus.utils.DateConverter;
 import java.sql.SQLException;
 import java.time.LocalDate;
 
-import static de.hitec.nhplus.utils.Validator.*;
-
 public class TreatmentController {
 
     @FXML
@@ -46,7 +44,6 @@ public class TreatmentController {
     public void initializeController(AllTreatmentController controller, Stage stage, Treatment treatment) {
         this.stage = stage;
         this.controller= controller;
-
         PatientDao pDao = DaoFactory.getDaoFactory().createPatientDAO();
         try {
             this.patient = pDao.read((int) treatment.getPid());
@@ -70,37 +67,11 @@ public class TreatmentController {
 
     @FXML
     public void handleChange(){
-        LocalDate newDate = this.datePicker.getValue();
+        this.treatment.setDate(this.datePicker.getValue().toString());
-        if(!isValidDate(newDate)){
+        this.treatment.setBegin(textFieldBegin.getText());
-            showValidationError("Date");
+        this.treatment.setEnd(textFieldEnd.getText());
-            return;
+        this.treatment.setDescription(textFieldDescription.getText());
-        }
+        this.treatment.setRemarks(textAreaRemarks.getText());
-
-        String newDescription = textFieldDescription.getText();
-        if(!isValidDescription(newDescription)){
-            showValidationError("Description");
-            return;
-        }
-
-        String newBegin = textFieldBegin.getText();
-        String newEnd = textFieldEnd.getText();
-        if(!isValidTimeRange(newBegin, newEnd)){
-            showValidationError("Time Range");
-            return;
-        }
-
-        String newRemarks = textAreaRemarks.getText();
-        if(!isValidDescription(newRemarks)){
-            showValidationError("Remarks");
-            return;
-        }
-
-        this.treatment.setDate(newDate.toString());
-        this.treatment.setDescription(newDescription);
-        this.treatment.setBegin(newBegin);
-        this.treatment.setEnd(newEnd);
-        this.treatment.setRemarks(newRemarks);
-
         doUpdate();
         controller.readAllAndShowInTableView();
         stage.close();

src/main/java/de/hitec/nhplus/utils/Validator.java

@@ -1,79 +0,0 @@
-package de.hitec.nhplus.utils;
-
-import javafx.scene.control.Alert;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-
-public class Validator
-{
-    public static void showValidationError(String type){
-        Alert alert = new Alert(Alert.AlertType.ERROR);
-        alert.setTitle("Error");
-        alert.setHeaderText(null);
-        alert.setContentText("Invalid " + type + " !");
-        alert.showAndWait();
-    }
-    public static boolean isValidDate(String text) {
-        if(text.isBlank()){
-            return false;
-        }
-        try {
-            DateConverter.convertStringToLocalDate(text);
-        } catch (Exception exception) {
-            return false;
-        }
-        return true;
-    }
-    public static boolean isValidDate(LocalDate date) {
-        if(date == null){
-            return false;
-        }
-        try {
-            DateConverter.convertStringToLocalDate(date.toString());
-        } catch (Exception exception) {
-            return false;
-        }
-        return true;
-    }
-    public static boolean isValidTime(String text){
-        if(text.isBlank()){
-            return false;
-        }
-        try {
-            DateConverter.convertStringToLocalTime(text);
-        }catch (Exception exception){
-            return false;
-        }
-        return true;
-    }
-    public static boolean isValidTimeRange(String start, String end){
-        if(
-            !isValidTime(start) || !isValidTime(end)
-        ){
-            return false;
-        }
-        LocalTime startTime = DateConverter.convertStringToLocalTime(start);
-        LocalTime endTime = DateConverter.convertStringToLocalTime(end);
-        return startTime.isBefore(endTime);
-
-    }
-
-    public static  boolean isValidDescription(String text) {
-        return !text.isBlank();
-    }
-    public static boolean isValidFirstName(String text){
-        return !text.isBlank();
-    }
-    public static boolean isValidSurName(String text){
-        return !text.isBlank();
-    }
-    public static boolean isValidCareLevel(String text){
-        return !text.isBlank();
-    }
-    public static boolean isValidRoomNumber(String text){
-        return !text.isBlank();
-    }
-
-}
-

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

@@ -3,85 +3,77 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
+
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.NewTreatmentController">
+<AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.NewTreatmentController">
-    <children>
+   <children>
-        <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="5.0"
+      <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
-              AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
+         <children>
-            <children>
+            <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Neue Behandlung" textAlignment="CENTER">
-                <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Neue Behandlung"
+               <font>
-                       textAlignment="CENTER">
+                  <Font size="36.0" />
-                    <font>
+               </font>
-                        <Font size="36.0"/>
+            </Label>
-                    </font>
+         </children>
-                </Label>
+      </HBox>
-            </children>
+      <GridPane hgap="10.0" layoutX="14.0" layoutY="14.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="100.0">
-        </HBox>
+        <columnConstraints>
-        <GridPane hgap="10.0" layoutX="14.0" layoutY="14.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0"
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                  AnchorPane.topAnchor="100.0">
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-            <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+        </columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+        <rowConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            </columnConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        </rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+         <children>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+            <Label text="Vorname:">
-            </rowConstraints>
+               <font>
-            <children>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Vorname:">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <Label text="Nachname:" GridPane.columnIndex="2">
-                    </font>
+               <font>
-                </Label>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Nachname:" GridPane.columnIndex="2">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <Label text="Datum:" GridPane.rowIndex="3">
-                    </font>
+               <font>
-                </Label>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Datum:" GridPane.rowIndex="3">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <Label text="Beginn:" GridPane.columnIndex="2" GridPane.rowIndex="3">
-                    </font>
+               <font>
-                </Label>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Beschreibung:" GridPane.columnIndex="2" GridPane.rowIndex="3">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <Label text="Ende" GridPane.rowIndex="4">
-                    </font>
+               <font>
-                </Label>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Beginn:" GridPane.rowIndex="4">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <Label text="Beschreibung:" GridPane.columnIndex="2" GridPane.rowIndex="4">
-                    </font>
+               <font>
-                </Label>
+                  <Font name="System Bold" size="13.0" />
-                <Label text="Ende" GridPane.columnIndex="2" GridPane.rowIndex="4">
+               </font>
-                    <font>
+            </Label>
-                        <Font name="System Bold" size="13.0"/>
+            <TextField fx:id="textFieldBegin" promptText="hh:mm" GridPane.columnIndex="3" GridPane.rowIndex="3" />
-                    </font>
+            <TextField fx:id="textFieldEnd" maxWidth="192.0" prefWidth="150.0" promptText="hh:mm" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                </Label>
+            <TextField fx:id="textFieldDescription" GridPane.columnIndex="3" GridPane.rowIndex="4" />
-                <TextField fx:id="textFieldDescription" GridPane.columnIndex="3" GridPane.rowIndex="3"/>
+            <DatePicker fx:id="datePicker" prefWidth="192.0" promptText="yyyy-mm-dd" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                <TextField fx:id="textFieldBegin" promptText="hh:mm" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+            <Label fx:id="labelFirstName" text="Vorname" GridPane.columnIndex="1" />
-                <TextField fx:id="textFieldEnd" maxWidth="192.0" prefWidth="150.0" promptText="hh:mm"
+            <Label fx:id="labelSurname" text="Nachname" GridPane.columnIndex="3" />
-                           GridPane.columnIndex="3" GridPane.rowIndex="4"/>
+         </children>
-                <DatePicker fx:id="datePicker" prefWidth="192.0" promptText="yyyy-mm-dd" GridPane.columnIndex="1"
+      </GridPane>
-                            GridPane.rowIndex="3"/>
+      <HBox layoutX="298.0" layoutY="237.0" spacing="20.0" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="50.0">
-                <Label fx:id="labelFirstName" text="Vorname" GridPane.columnIndex="1"/>
+         <children>
-                <Label fx:id="labelSurname" text="Nachname" GridPane.columnIndex="3"/>
+            <Button fx:id="buttonAdd" mnemonicParsing="false" onAction="#handleAdd" text="Anlegen" />
-            </children>
+            <Button fx:id="buttonCancel" layoutX="298.0" layoutY="237.0" mnemonicParsing="false" onAction="#handleCancel" text="Abbruch" />
-        </GridPane>
+         </children>
-        <HBox layoutX="298.0" layoutY="237.0" spacing="20.0" AnchorPane.bottomAnchor="20.0"
+      </HBox>
-              AnchorPane.rightAnchor="50.0">
+      <TextArea fx:id="textAreaRemarks" layoutX="50.0" layoutY="252.0" prefHeight="134.0" prefWidth="700.0" AnchorPane.topAnchor="265.0" />
-            <children>
+   </children>
-                <Button fx:id="buttonAdd" mnemonicParsing="false" onAction="#handleAdd" text="Anlegen"/>
-                <Button fx:id="buttonCancel" layoutX="298.0" layoutY="237.0" mnemonicParsing="false"
-                        onAction="#handleCancel" text="Abbruch"/>
-            </children>
-        </HBox>
-        <TextArea fx:id="textAreaRemarks" layoutX="50.0" layoutY="252.0" prefHeight="134.0" prefWidth="700.0"
-                  AnchorPane.topAnchor="265.0"/>
-    </children>
 </AnchorPane>

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

@@ -1,88 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.text.*?>
+<?import javafx.scene.control.Label?>
-<AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1"
+<?import javafx.scene.control.TextArea?>
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.TreatmentController">
+<?import javafx.scene.control.TextField?>
-    <children>
+<?import javafx.scene.layout.AnchorPane?>
-        <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="15.0"
+<?import javafx.scene.layout.ColumnConstraints?>
-              AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">
+<?import javafx.scene.layout.GridPane?>
-            <children>
+<?import javafx.scene.layout.HBox?>
-                <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Behandlung"
+<?import javafx.scene.layout.RowConstraints?>
-                       textAlignment="CENTER">
+<?import javafx.scene.text.Font?>
-                    <font>
-                        <Font size="36.0"/>
-                    </font>
-                </Label>
-            </children>
-        </HBox>
-        <GridPane hgap="10.0" layoutX="14.0" layoutY="14.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0"
-                  AnchorPane.topAnchor="100.0">
-            <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-            </columnConstraints>
-            <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-            </rowConstraints>
-            <children>
-                <Label text="Patient:">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
-                <Label text="Pflegestufe:" GridPane.columnIndex="2">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
-                <Label text="Datum:" GridPane.rowIndex="3">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
-                <Label text="Beschreibung:" GridPane.columnIndex="2" GridPane.rowIndex="3">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
-                <Label text="Beginn:" GridPane.rowIndex="4">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
-                <Label text="Ende" GridPane.columnIndex="2" GridPane.rowIndex="4">
-                    <font>
-                        <Font name="System Bold" size="13.0"/>
-                    </font>
-                </Label>
 
-                <TextField fx:id="textFieldDescription" GridPane.columnIndex="3" GridPane.rowIndex="3"/>
+<AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.TreatmentController">
-                <TextField fx:id="textFieldBegin" promptText="hh:mm" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+   <children>
-                <TextField fx:id="textFieldEnd" promptText="hh:mm" maxWidth="192.0" prefWidth="150.0"
+      <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">
-                           GridPane.columnIndex="3"
+         <children>
-                           GridPane.rowIndex="4"/>
+            <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Behandlung" textAlignment="CENTER">
-                <DatePicker fx:id="datePicker" prefWidth="192.0" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+               <font>
-                <Label fx:id="labelPatientName" text="Name" GridPane.columnIndex="1"/>
+                  <Font size="36.0" />
-                <Label fx:id="labelCareLevel" text="Pflegestufe" GridPane.columnIndex="3"/>
+               </font>
-            </children>
+            </Label>
-        </GridPane>
+         </children>
-        <HBox layoutX="298.0" layoutY="237.0" spacing="20.0" AnchorPane.bottomAnchor="20.0"
+      </HBox>
-              AnchorPane.rightAnchor="50.0">
+      <GridPane hgap="10.0" layoutX="14.0" layoutY="14.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="100.0">
-            <children>
+        <columnConstraints>
-                <Button fx:id="btnChange" mnemonicParsing="false" onAction="#handleChange" text="Ändern"/>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                <Button fx:id="btnCancel" layoutX="298.0" layoutY="237.0" mnemonicParsing="false"
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-                        onAction="#handleCancel" text="Abbruch"/>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-            </children>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
-        </HBox>
+        </columnConstraints>
-        <TextArea fx:id="textAreaRemarks" layoutX="50.0" layoutY="252.0" prefHeight="134.0" prefWidth="700.0"
+        <rowConstraints>
-                  AnchorPane.topAnchor="265.0"/>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    </children>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label text="Patient:">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <Label text="Pflegestufe:" GridPane.columnIndex="2">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <Label text="Datum:" GridPane.rowIndex="3">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <Label text="Beginn:" GridPane.columnIndex="2" GridPane.rowIndex="3">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <Label text="Ende" GridPane.rowIndex="4">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <Label text="Beschreibung:" GridPane.columnIndex="2" GridPane.rowIndex="4">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Label>
+            <TextField fx:id="textFieldBegin" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+            <TextField fx:id="textFieldEnd" maxWidth="192.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+            <TextField fx:id="textFieldDescription" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+            <DatePicker fx:id="datePicker" prefWidth="192.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label fx:id="labelPatientName" text="Name" GridPane.columnIndex="1" />
+            <Label fx:id="labelCareLevel" text="Pflegestufe" GridPane.columnIndex="3" />
+         </children>
+      </GridPane>
+      <HBox layoutX="298.0" layoutY="237.0" spacing="20.0" AnchorPane.bottomAnchor="20.0" AnchorPane.rightAnchor="50.0">
+         <children>
+            <Button fx:id="btnChange" mnemonicParsing="false" onAction="#handleChange" text="Ändern" />
+            <Button fx:id="btnCancel" layoutX="298.0" layoutY="237.0" mnemonicParsing="false" onAction="#handleCancel" text="Abbruch" />
+         </children>
+      </HBox>
+      <TextArea fx:id="textAreaRemarks" layoutX="50.0" layoutY="252.0" prefHeight="134.0" prefWidth="700.0" AnchorPane.topAnchor="265.0" />
+   </children>
 </AnchorPane>