Added logic to workitem edit dialog to prevent modification of end

before start.

It will display an error message and prevent the dialog from closing.
Updates on change of time information.

Author: Jan Schraff

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

@@ -40,6 +40,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.Spinner;
@@ -80,8 +81,12 @@ public class ManageWorkController {
    @FXML
    private ComboBox<Project> projectComboBox;
 
+   @FXML
+   private Label errorLabel;
+
    private boolean comboChange;
    private Project selectedProject;
+   private boolean valid;
 
    private FilteredList<Project> filteredList;
 
@@ -98,11 +103,42 @@ private void initialize() {
 
       setUpTimeSpinner(endTimeSpinner);
 
+      setUpTimeRestriction();
+
       setProjectUpComboBox();
 
       Platform.runLater(() -> projectComboBox.requestFocus());
    }
 
+   private void setUpTimeRestriction() {
+      final ChangeListener<Object> timeListener = (final ObservableValue<? extends Object> observable,
+            final Object oldValue, final Object newValue) -> {
+         if (startTimeSpinner.getValue() == null || endTimeSpinner.getValue() == null
+               || startDatePicker.getValue() == null || endDatePicker.getValue() == null) {
+            return;
+         }
+         if (startDatePicker.getValue().isAfter(endDatePicker.getValue())
+               || (startDatePicker.getValue().isEqual(endDatePicker.getValue())
+                     && startTimeSpinner.getValue().isAfter(endTimeSpinner.getValue()))) {
+            errorLabel.setText("startDate has to be before endDate");
+            valid = false;
+         } else {
+            errorLabel.setText("");
+            valid = true;
+         }
+
+      };
+      startTimeSpinner.valueProperty().addListener(timeListener);
+      endTimeSpinner.valueProperty().addListener(timeListener);
+      endDatePicker.valueProperty().addListener(timeListener);
+      startDatePicker.valueProperty().addListener(timeListener);
+
+   }
+
+   public boolean isValid() {
+      return valid;
+   }
+
    private void setUpTimeSpinner(final Spinner<LocalTime> spinner) {
       spinner.focusedProperty().addListener((e) -> {
          final LocalTimeStringConverter stringConverter = new LocalTimeStringConverter(FormatStyle.MEDIUM);
@@ -281,6 +317,9 @@ public void initializeWith(final Work work) {
 
       startTimeSpinner.getValueFactory().setValue(work.getStartTime().toLocalTime());
       endTimeSpinner.getValueFactory().setValue(work.getEndTime().toLocalTime());
+      valid = !startDatePicker.getValue().isAfter(endDatePicker.getValue())
+            || (startDatePicker.getValue().isEqual(endDatePicker.getValue())
+                  && startTimeSpinner.getValue().isAfter(endTimeSpinner.getValue()));
 
       noteTextArea.setText(work.getNotes());
 
@@ -290,6 +329,7 @@ public void initializeWith(final Work work) {
       setColor(projectComboBox.getEditor(), model.hoverBackgroundColor.get());
 
       setTextColor(projectComboBox.getEditor(), model.hoverFontColor.get());
+
    }
 
    private void enableStrgA_combo() {

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -344,7 +344,11 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
       final ManageWorkController manageWorkController = loader.getController();
       manageWorkController.setModel(model);
       manageWorkController.initializeWith(work);
-
+      dialog.getDialogPane().lookupButton(ButtonType.OK).addEventFilter(ActionEvent.ACTION, event -> {
+         if (!manageWorkController.isValid()) {
+            event.consume();
+         }
+      });
       dialog.setResultConverter(dialogButton -> {
          if (dialogButton == ButtonType.OK) {
             return manageWorkController.getWorkFromUserInput();

src/main/resources/layouts/manage-work.fxml

@@ -59,6 +59,11 @@
         <Insets bottom="5.0" />
       </GridPane.margin>
     </Label>
+      <Label fx:id="errorLabel" textFill="RED" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="5">
+         <font>
+            <Font name="Open Sans Regular" size="12.0" />
+         </font>
+      </Label>
   </children>
   <padding>
     <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />