refactored Controller and ColorTimeLine

Author: Martin Plieske

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

@@ -5,7 +5,6 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import javax.annotation.PreDestroy;
 
@@ -237,29 +236,35 @@ public void setComment(final String notes) {
     * Calculate todays seconds counted as work
     */
    public long calcTodaysWorkSeconds() {
+      final List<Work> workItems = new ArrayList<>();
 
-      return model.getPastWorkItems().stream().filter(work -> {
-         final Project project = work.getProject();
-         // find up to date reference to project
-         final Optional<Project> optionalProject = model.getAllProjects().stream()
-               .filter(p -> p.getId() == project.getId()).findAny();
-         if (optionalProject.isPresent()) {
-            return optionalProject.get().isWork();
+      for (final Work w : model.getPastWorkItems()) {
+         if (w.getProject().isWork()) {
+            workItems.add(w);
          }
-         // TODO should not happen
-         return false;
-      }).mapToLong(work -> Duration.between(work.getStartTime(), work.getEndTime()).getSeconds()).sum();
+      }
+
+      return calcSeconds(workItems);
    }
 
    /**
     * Calculate todays present seconds (work+nonWork)
     */
    public long calcTodaysSeconds() {
-      return model.getPastWorkItems().stream()
-            .mapToLong(work -> Duration.between(work.getStartTime(), work.getEndTime()).getSeconds()).sum();
+      return calcSeconds(model.getPastWorkItems());
    }
 
    public ObservableList<Project> getAvailableProjects() {
       return model.getAvailableProjects();
    }
+
+   public long calcSeconds(final List<Work> workItems) {
+      long seconds = 0;
+
+      for (final Work w : workItems) {
+         seconds += Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
+      }
+
+      return seconds;
+   }
 }

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

@@ -1,11 +1,12 @@
 package de.doubleslash.keeptime.view;
 
+import java.time.Duration;
 import java.util.List;
 
+import de.doubleslash.keeptime.model.Work;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
 
 public class ColorTimeLine {
 
@@ -15,16 +16,22 @@ public ColorTimeLine(final Canvas canvas) {
       this.canvas = canvas;
    }
 
-   public void update(final List<Rectangle> rects) {
+   public void update(final List<Work> workItems, final long seconds) {
       final GraphicsContext gc = canvas.getGraphicsContext2D();
 
       gc.setFill(new Color(.3, .3, .3, .3));
       gc.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
       gc.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
+      double currentX = 0;
+      for (final Work w : workItems) {
+         final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
+         final double width = (double) workedSeconds / seconds * canvas.getWidth();
+         final Color fill = w.getProject().getColor();
 
-      for (final Rectangle rect : rects) {
-         gc.setFill(rect.getFill());
-         gc.fillRect(rect.getX(), 0, rect.getWidth(), canvas.getHeight());
+         gc.setFill(fill);
+         gc.fillRect(currentX, 0, width, canvas.getHeight());
+
+         currentX += width;
       }
 
    }

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

@@ -1,8 +1,6 @@
 package de.doubleslash.keeptime.view;
 
-import java.time.Duration;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.SortedSet;
@@ -34,8 +32,6 @@
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
 import javafx.util.Callback;
@@ -95,27 +91,7 @@ private void updateReport(final LocalDate newvalue) {
       this.currentDayLabel.setText(DateFormatter.toDayDateString(newvalue));
       final List<Work> currentWorkItems = model.getWorkRepository().findByCreationDate(newvalue);
 
-      final List<Rectangle> rects = new ArrayList<>();
-      long maxSeconds = 0;
-      for (final Work w : currentWorkItems) {
-         maxSeconds += Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
-      }
-      double currentX = 0;
-
-      for (final Work w : currentWorkItems) {
-         final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
-         final double width = (double) workedSeconds / maxSeconds * canvas.getWidth();
-         final Color fill = w.getProject().getColor();
-
-         final Rectangle rect = new Rectangle(currentX, 0, width, 0);
-         rect.setFill(fill);
-
-         rects.add(rect);
-
-         currentX += width;
-      }
-
-      colorTimeLine.update(rects);
+      colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
       final SortedSet<Project> workedProjectsSet = currentWorkItems.stream().map(Work::getProject)
             .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Project::getName))));

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

@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -24,7 +23,6 @@
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
-import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.view.time.Interval;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -76,7 +74,6 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
-import javafx.scene.shape.Rectangle;
 import javafx.scene.text.TextAlignment;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -320,23 +317,7 @@ private void initialize() {
             label.setText(DateFormatter.secondsToHHMMSS(seconds));
          }
 
-         final long maxSeconds = controller.calcTodaysSeconds();
-         double currentX = 0;
-         final List<Rectangle> rects = new ArrayList<>();
-         for (final Work w : model.getPastWorkItems()) {
-            final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
-            final double width = (double) workedSeconds / maxSeconds * canvas.getWidth();
-            final Color fill = w.getProject().getColor();
-
-            final Rectangle rect = new Rectangle(currentX, 0, width, 0);
-            rect.setFill(fill);
-
-            rects.add(rect);
-
-            currentX += width;
-         }
-
-         mainColorTimeLine.update(rects);
+         mainColorTimeLine.update(model.getPastWorkItems(), controller.calcTodaysSeconds());
          updateTaskbarIcon(currentWorkSeconds);
       });