fixed timelines after editing considering start date

Author: JSchraff

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/controller/Controller.java

@@ -186,21 +186,17 @@ 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);
-      Work toRemove = null;
-      for (final Work w : model.getPastWorkItems()) {
-         if (w.getId() == workToBeEdited.getId()) {
-            toRemove = w;
-            LOG.debug("changing past Work");
+      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;
          }
-      }
-
-      int index;
-      if (toRemove != null) {
-         index = model.getPastWorkItems().indexOf(toRemove);
-         model.getPastWorkItems().remove(index);
-      } else {
-         // TODO sort in right Place
-         index = model.getPastWorkItems().size() - 1;
       }
 
       workToBeEdited.setCreationDate(newValuedWork.getCreationDate());

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

@@ -28,4 +28,6 @@
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
    List<Work> findByCreationDate(LocalDate creationDate);
+
+   List<Work> findByCreationDateOrderByStartTimeAsc(LocalDate creationDate);
 }

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

@@ -124,7 +124,8 @@ private void updateReport(final LocalDate dateToShow) {
       reportRoot.requestFocus();
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(dateToShow));
-      final List<Work> currentWorkItems = model.getWorkRepository().findByCreationDate(dateToShow);
+      final List<Work> currentWorkItems = model.getWorkRepository().findByCreationDateOrderByStartTimeAsc(dateToShow);
+      ;
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));