Merge pull request #82 from doubleSlashde/bugfix/#79_preventNegativeWorkTimes

Bugfix/#79 prevent negative work times

Author: Death111

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

@@ -32,6 +32,10 @@
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -40,6 +44,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 +85,12 @@ public class ManageWorkController {
    @FXML
    private ComboBox<Project> projectComboBox;
 
+   @FXML
+   private Label errorLabel;
+
    private boolean comboChange;
    private Project selectedProject;
+   private BooleanProperty isValidProperty = new SimpleBooleanProperty();
 
    private FilteredList<Project> filteredList;
 
@@ -98,11 +107,44 @@ private void initialize() {
 
       setUpTimeSpinner(endTimeSpinner);
 
+      setUpTimeRestriction();
+
       setProjectUpComboBox();
 
       Platform.runLater(() -> projectComboBox.requestFocus());
    }
 
+   private void setUpTimeRestriction() {
+
+      BooleanBinding isValidBinding = Bindings.createBooleanBinding(() -> {
+         if (startTimeSpinner.getValue() == null || endTimeSpinner.getValue() == null
+               || startDatePicker.getValue() == null || endDatePicker.getValue() == null) {
+            return false;
+         }
+
+         LocalDateTime start = LocalDateTime.of(startDatePicker.getValue(), startTimeSpinner.getValue());
+         LocalDateTime end = LocalDateTime.of(endDatePicker.getValue(), endTimeSpinner.getValue());
+
+         if (start.isAfter(end)) {
+            return false;
+         } else {
+            return true;
+         }
+      }, startTimeSpinner.valueProperty(), endTimeSpinner.valueProperty(), endDatePicker.valueProperty(),
+            startDatePicker.valueProperty());
+
+      this.isValidProperty.bind(isValidBinding);
+
+      errorLabel.textProperty().bind(Bindings.createStringBinding(() -> {
+         if (Boolean.TRUE.equals(isValidProperty.get())) {
+            return "";
+         } else {
+            return "startDate has to be before endDate";
+         }
+
+      }, isValidProperty));
+   }
+
    private void setUpTimeSpinner(final Spinner<LocalTime> spinner) {
       spinner.focusedProperty().addListener((e) -> {
          final LocalTimeStringConverter stringConverter = new LocalTimeStringConverter(FormatStyle.MEDIUM);
@@ -326,4 +368,8 @@ private void setTextColor(final Node object, final Color color) {
       object.setStyle(style);
    }
 
+   public BooleanProperty validProperty() {
+      return this.isValidProperty;
+   }
+
 }

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

@@ -345,6 +345,11 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
       manageWorkController.setModel(model);
       manageWorkController.initializeWith(work);
 
+      dialog.getDialogPane()
+            .lookupButton(ButtonType.OK)
+            .disableProperty()
+            .bind(manageWorkController.validProperty().not());
+
       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" />