Merge pull request #39 from doubleSlashde/feature/PRIVAT-1556_searchableProjectDescription

Added searchable project description.

Author: Death111

.gitignore

@@ -29,4 +29,4 @@ logs/
 *.jar
 
 config.xml
-db/
+/db/

src/main/java/de/doubleslash/keeptime/common/ConfigParser.java

@@ -38,6 +38,7 @@ public enum RESOURCE {
       FXML_VIEW_POPUP_LAYOUT("/layouts/ViewLayoutPopup.fxml"),
       FXML_REPORT("/layouts/report.fxml"),
       FXML_ABOUT("/layouts/about.fxml"),
+      FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
 
       // icon
       ICON_MAIN("/icons/icon.png"),

src/main/java/de/doubleslash/keeptime/common/Resources.java

@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.common;
 
 public class StyleUtils {

src/main/java/de/doubleslash/keeptime/common/StyleUtils.java

@@ -91,14 +91,13 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       model.activeWorkItem.set(work);
    }
 
-   public void addNewProject(final String projectName, final boolean isWork, final Color projectColor,
-         final int index) {
-      final Project project = new Project(projectName, projectColor, isWork, index, false);
+   public void addNewProject(final Project project) {
+      LOG.info("Creating new project '{}'.", project);
       model.getAllProjects().add(project);
       model.getAvailableProjects().add(project);
 
       final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), project,
-            model.getAvailableProjects().size(), index);
+            model.getAvailableProjects().size(), project.getIndex());
       changedProjects.add(project);
       model.getProjectRepository().saveAll(changedProjects);
    }
@@ -167,18 +166,19 @@ private boolean isProjectActive(final Project p) {
       return p == model.activeWorkItem.get().getProject();
    }
 
-   public void editProject(final Project p, final String newName, final Color newColor, final boolean isWork,
-         final int newIndex) {
-      LOG.info("Changing project '{}' to '{}' '{}' '{}'", p, newName, newColor, isWork);
+   public void editProject(final Project projectToBeUpdated, final Project newValuedProject) {
+      LOG.info("Changing project '{}' to '{}'.", projectToBeUpdated, newValuedProject);
 
-      p.setName(newName);
-      p.setColor(newColor);
-      p.setWork(isWork);
-      final int oldIndex = p.getIndex();
-      p.setIndex(newIndex);
+      projectToBeUpdated.setName(newValuedProject.getName());
+      projectToBeUpdated.setDescription(newValuedProject.getDescription());
+      projectToBeUpdated.setColor(newValuedProject.getColor());
+      projectToBeUpdated.setWork(newValuedProject.isWork());
+      final int oldIndex = projectToBeUpdated.getIndex();
+      projectToBeUpdated.setIndex(newValuedProject.getIndex());
 
-      final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), p, oldIndex, newIndex);
-      changedProjects.add(p);
+      final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), projectToBeUpdated,
+            oldIndex, newValuedProject.getIndex());
+      changedProjects.add(projectToBeUpdated);
 
       // save all projects which changed index
       model.getProjectRepository().saveAll(changedProjects);

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -54,7 +54,7 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
 
    public static final Color ORIGINAL_TASK_BAR_FONT_COLOR = Color.BLACK;
 
-   public static final Project DEFAULT_PROJECT = new Project("Idle", Color.ORANGE, false, 0, true);
+   public static final Project DEFAULT_PROJECT = new Project("Idle", "", Color.ORANGE, false, 0, true);
    private Project idleProject = DEFAULT_PROJECT;
 
    private final ObservableList<Project> availableProjects = FXCollections.observableArrayList();

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -22,6 +22,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
@@ -38,6 +39,9 @@ public class Project {
 
    private String name;
 
+   @Lob
+   private String description;
+
    @Convert(converter = ColorConverter.class, disableConversion = false)
    private Color color;
 
@@ -53,19 +57,21 @@ public Project() {
       // Needed for jpa
    }
 
-   public Project(final String name, final Color color, final boolean isWork, final int index,
+   public Project(final String name, final String description, final Color color, final boolean isWork, final int index,
          final boolean isDefault) {
       super();
       this.name = name;
+      this.description = description;
       this.color = color;
       this.isWork = isWork;
       this.isDefault = isDefault;
       this.isEnabled = true;
       this.index = index;
    }
 
-   public Project(final String name, final Color color, final boolean isWork, final int index) {
-      this(name, color, isWork, index, false);
+   public Project(final String name, final String description, final Color color, final boolean isWork,
+         final int index) {
+      this(name, description, color, isWork, index, false);
    }
 
    public String getName() {
@@ -120,10 +126,18 @@ public void setIndex(final int index) {
       this.index = index;
    }
 
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(final String description) {
+      this.description = description;
+   }
+
    @Override
    public String toString() {
-      return "Project [id=" + id + ", name=" + name + ", color=" + color + ", isWork=" + isWork + ", isDefault="
-            + isDefault + ", isEnabled=" + isEnabled + "]";
+      return "Project [id=" + id + ", name=" + name + ", description=" + description + ", color=" + color + ", isWork="
+            + isWork + ", isDefault=" + isDefault + ", isEnabled=" + isEnabled + ", index=" + index + "]";
    }
 
 }

src/main/java/de/doubleslash/keeptime/model/Project.java

@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.view;
 
 import java.util.Optional;

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

@@ -0,0 +1,84 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package de.doubleslash.keeptime.view;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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;
+
+public class ManageProjectController {
+
+   private static final Logger LOG = LoggerFactory.getLogger(ManageProjectController.class);
+
+   private Model model;
+
+   @FXML
+   private GridPane grid;
+
+   @FXML
+   private TextField nameTextField;
+
+   @FXML
+   private TextArea descriptionTextArea;
+
+   @FXML
+   private ColorPicker textFillColorPicker;
+
+   @FXML
+   private CheckBox isWorkCheckBox;
+
+   @FXML
+   private Spinner<Integer> sortIndexSpinner;
+
+   public void setModel(final Model model) {
+      this.model = model;
+   }
+
+   public void secondInitialize() {
+      if (model != null) {
+         final int availableProjectAmount = model.getAllProjects().size();
+         sortIndexSpinner
+               .setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
+         sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
+      }
+   }
+
+   public void initializeWith(final Project project) {
+      LOG.info("Setting values.");
+      nameTextField.setText(project.getName());
+      descriptionTextArea.setText(project.getDescription());
+      textFillColorPicker.setValue(project.getColor());
+      isWorkCheckBox.setSelected(project.isWork());
+      sortIndexSpinner.getValueFactory().setValue(project.getIndex());
+   }
+
+   public Project getProjectFromUserInput() {
+      return new Project(nameTextField.getText(), descriptionTextArea.getText(), textFillColorPicker.getValue(),
+            isWorkCheckBox.isSelected(), sortIndexSpinner.getValue());
+   }
+
+}