Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -326,4 +368,8 @@ private void setTextColor(final Node object, final Color color) {
object.setStyle(style);
}

public BooleanProperty validProperty() {
return this.isValidProperty;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/layouts/manage-work.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down