Merge branch 'develop' into feature/rework_work_items_in_report_ui

# Conflicts:
#	src/main/java/de/doubleslash/keeptime/view/ReportController.java

Author: Death111

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

@@ -186,32 +186,23 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
 
    public void editWork(final Work workToBeEdited, final Work newValuedWork) {
       LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
-      int index = model.getPastWorkItems().size() - 1;
-      for (int i = 0; i < model.getPastWorkItems().size(); i++) {
-         final Work work = model.getPastWorkItems().get(i);
-         if (work.getId() == workToBeEdited.getId()) {
-            model.getPastWorkItems().remove(work);
-            continue;
-         }
-         if (work.getStartTime().isAfter(newValuedWork.getStartTime())) {
-            index = i;
-            break;
-         }
-      }
 
       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(workToBeEdited.getCreationDate())) {
-         model.getPastWorkItems().add(index, workToBeEdited);
+      if (dateNow.equals(editedWork.getCreationDate())) {
+         model.getPastWorkItems().add(editedWork);
       }
 
-      model.getWorkRepository().save(workToBeEdited);
-
    }
 
    /**

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/repos/WorkRepository.java

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