Merge pull request #42 from doubleSlashde/feature/#28_edit_work_times

Feature/#28 edit work times

Author: Death111

src/main/java/de/doubleslash/keeptime/Main.java

@@ -137,7 +137,8 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       FontProvider.loadFonts();
       readSettings();
 
-      final List<Work> todaysWorkItems = model.getWorkRepository().findByCreationDate(LocalDate.now());
+      final List<Work> todaysWorkItems = model.getWorkRepository()
+            .findByCreationDateOrderByStartTimeAsc(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 

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

@@ -39,11 +39,13 @@ public enum RESOURCE {
       FXML_REPORT("/layouts/report.fxml"),
       FXML_ABOUT("/layouts/about.fxml"),
       FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
+      FXML_MANAGE_WORK("/layouts/manage-work.fxml"),
 
       // icon
       ICON_MAIN("/icons/icon.png"),
 
       ;
+
       String resourceLocation;
 
       private RESOURCE(final String resourceLocation) {

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

@@ -184,17 +184,38 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
       model.getProjectRepository().saveAll(changedProjects);
    }
 
+   public void editWork(final Work workToBeEdited, final Work newValuedWork) {
+      LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
+
+      workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
+      workToBeEdited.setStartTime(newValuedWork.getStartTime());
+      workToBeEdited.setEndTime(newValuedWork.getEndTime());
+      workToBeEdited.setNotes(newValuedWork.getNotes());
+      workToBeEdited.setProject(newValuedWork.getProject());
+
+      final Work editedWork = model.getWorkRepository().save(workToBeEdited);
+
+      // remove old
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
+      // add if started today
+      final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
+      if (dateNow.equals(editedWork.getCreationDate())) {
+         model.getPastWorkItems().add(editedWork);
+      }
+
+   }
+
    /**
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                          list of all projects to adapt the indexes for
     * @param changedProject
-    *           the project which has changed which already has the new index
+    *                          the project which has changed which already has the new index
     * @param oldIndex
-    *           the old index of the changed project
+    *                          the old index of the changed project
     * @param newIndex
-    *           the new index of the changed project (which the projects also already has)
+    *                          the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -231,9 +252,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                        list of all projects to adapt the indexes for
     * @param removedIndex
-    *           the index which has been removed
+    *                        the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {
@@ -298,4 +319,5 @@ public long calcSeconds(final List<Work> workItems) {
 
       return seconds;
    }
+
 }

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

@@ -19,6 +19,7 @@
 import java.util.Comparator;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
@@ -63,6 +64,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    private ObservableList<Project> allProjects = FXCollections.observableArrayList();
 
    protected final ObservableList<Work> pastWorkItems = FXCollections.observableArrayList();
+   private final SortedList<Work> sortedPastWorkItems = new SortedList<>(pastWorkItems,
+         Comparator.comparing(Work::getStartTime));
    public final ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
 
    public final ObjectProperty<Color> taskBarColor = new SimpleObjectProperty<>(ORIGINAL_TASK_BAR_FONT_COLOR);
@@ -76,6 +79,9 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public final ObjectProperty<Boolean> useHotkey = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
+   public final ObjectProperty<Boolean> emptyNoteReminder = new SimpleObjectProperty<>(false);
+
+   private ConfigurableApplicationContext springContext;
 
    public void setWorkRepository(final WorkRepository workRepository) {
       this.workRepository = workRepository;
@@ -128,4 +134,16 @@ public ObservableList<Project> getAvailableProjects() {
    public ObservableList<Project> getAllProjects() {
       return allProjects;
    }
+
+   public void setSpringContext(final ConfigurableApplicationContext springContext) {
+      this.springContext = springContext;
+   }
+
+   public ConfigurableApplicationContext getSpringContext() {
+      return this.springContext;
+   }
+
+   public SortedList<Work> getSortedPastWorkItems() {
+      return sortedPastWorkItems;
+   }
 }

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

@@ -36,6 +36,7 @@ public class Work {
    @Column(name = "id", updatable = false, nullable = false)
    private long id;
 
+   // TODO revise CreationDate Logic to use Date of StartTime
    private LocalDate creationDate;
    private LocalDateTime startTime;
    private LocalDateTime endTime;
@@ -45,7 +46,8 @@ public class Work {
    @Lob
    private String notes;
 
-   public Work() {}
+   public Work() {
+   }
 
    public Work(final LocalDate creationDate, final LocalDateTime startTime, final LocalDateTime endTime,
          final Project project, final String notes) {
@@ -89,6 +91,10 @@ public Project getProject() {
       return project;
    }
 
+   public void setProject(final Project project) {
+      this.project = project;
+   }
+
    public String getNotes() {
       return notes;
    }
@@ -97,4 +103,10 @@ public void setNotes(final String notes) {
       this.notes = notes;
    }
 
+   @Override
+   public String toString() {
+      return "Work [id=" + id + ", creationDate=" + creationDate + ", startTime=" + startTime + ", endTime=" + endTime
+            + ", projectName=" + project.getName() + ", notes=" + notes + "]";
+   }
+
 }

src/main/java/de/doubleslash/keeptime/model/repos/WorkRepository.java

@@ -27,5 +27,5 @@
 @Repository
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
-   List<Work> findByCreationDate(LocalDate creationDate);
+   List<Work> findByCreationDateOrderByStartTimeAsc(LocalDate creationDate);
 }