Feature/project has to have valid name (#132)

* disable ok button if no name entered
* delete comment
* Edit project button disabled if projectname empty

Co-authored-by: ddamke <[email protected]>

Author: DavidDamke

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

@@ -16,6 +16,10 @@
 
 package de.doubleslash.keeptime.view;
 
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,12 +28,7 @@
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ColorPicker;
-import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory.IntegerSpinnerValueFactory;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
 import javafx.scene.layout.GridPane;
 
 @Component
@@ -57,17 +56,23 @@ public class ManageProjectController {
    @FXML
    private Spinner<Integer> sortIndexSpinner;
 
+   @FXML
+   private Label validateTextAlert;
+
+   private BooleanProperty formValidProperty = new SimpleBooleanProperty(false);
+
    @Autowired
    public ManageProjectController(final Model model) {
       this.model = model;
    }
-
    @FXML
    private void initialize() {
       final int availableProjectAmount = model.getAllProjects().size();
       sortIndexSpinner
-            .setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
+              .setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
       sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
+      formValidProperty.bind(Bindings.createBooleanBinding(() -> !nameTextField.getText().isBlank(),nameTextField.textProperty()));
+      validateTextAlert.visibleProperty().bind(formValidProperty.not());
    }
 
    public void initializeWith(final Project project) {
@@ -84,4 +89,8 @@ public Project getProjectFromUserInput() {
             isWorkCheckBox.isSelected(), sortIndexSpinner.getValue());
    }
 
+   public BooleanProperty formValidProperty() {
+      return formValidProperty;
+   }
+
 }

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

@@ -365,7 +365,7 @@ private GridPane setUpEditProjectGridPane(final Project p, final Dialog<Project>
       }
       final ManageProjectController manageProjectController = loader.getController();
       manageProjectController.initializeWith(p);
-
+      dialog.getDialogPane().lookupButton(ButtonType.OK).disableProperty().bind(manageProjectController.formValidProperty().not());
       dialog.setResultConverter(dialogButton -> {
          if (dialogButton == ButtonType.OK) {
             return manageProjectController.getProjectFromUserInput();

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

@@ -487,7 +487,6 @@ private Dialog<Project> setUpDialogProject(final String title, final String head
       dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
       setUpAddNewProjectGridPane(dialog);
 
-      // TODO disable OK button if no name is set
       return dialog;
    }
 
@@ -505,6 +504,8 @@ private GridPane setUpAddNewProjectGridPane(final Dialog<Project> dialog) {
 
       final ManageProjectController manageProjectController = loader.getController();
 
+      dialog.getDialogPane().lookupButton(ButtonType.OK).disableProperty().bind(manageProjectController.formValidProperty().not());
+
       dialogResultConverter(dialog, manageProjectController);
 
       return grid;

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

@@ -25,23 +25,25 @@
       <RowConstraints vgrow="SOMETIMES" />
       <RowConstraints vgrow="SOMETIMES" />
       <RowConstraints vgrow="SOMETIMES" />
+      <RowConstraints vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
       <Label text="Name:" />
-      <Label text="Color:" GridPane.rowIndex="3" />
-      <Label text="IsWork:" GridPane.rowIndex="4" />
-      <Label text="SortIndex:" GridPane.rowIndex="5" />
+      <Label text="Color:" GridPane.rowIndex="4" />
+      <Label text="IsWork:" GridPane.rowIndex="5" />
+      <Label text="SortIndex:" GridPane.rowIndex="6" />
       <TextField fx:id="nameTextField" GridPane.columnIndex="1" />
-      <ColorPicker fx:id="textFillColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <CheckBox fx:id="isWorkCheckBox" mnemonicParsing="false" selected="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Spinner fx:id="sortIndexSpinner" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <TextArea fx:id="descriptionTextArea" prefHeight="120.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-      <VBox alignment="CENTER_LEFT" GridPane.rowIndex="1">
+      <ColorPicker fx:id="textFillColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+      <CheckBox fx:id="isWorkCheckBox" mnemonicParsing="false" selected="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+      <Spinner fx:id="sortIndexSpinner" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+      <TextArea fx:id="descriptionTextArea" prefHeight="120.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+      <VBox alignment="CENTER_LEFT" GridPane.rowIndex="2">
          <children>
             <Label text="Description:" />
             <Label disable="true" prefWidth="100.0" text="(will be matched at search)" wrapText="true" />
          </children>
       </VBox>
+      <Label fx:id="validateTextAlert" prefHeight="17.0" prefWidth="201.0" text="Please enter a project name" GridPane.columnIndex="1" GridPane.rowIndex="1" />
    </children>
    <padding>
       <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />