functioning timeline in report and main view

Author: Martin Plieske

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

@@ -1,42 +1,32 @@
 package de.doubleslash.keeptime.view;
 
-import java.time.Duration;
+import java.util.List;
 
-import de.doubleslash.keeptime.controller.Controller;
-import de.doubleslash.keeptime.model.Model;
-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 {
 
    private final Canvas canvas;
-   private final Model model;
-   private final Controller controller;
 
-   public ColorTimeLine(final Canvas canvas, final Model model, final Controller controller) {
+   public ColorTimeLine(final Canvas canvas) {
       this.canvas = canvas;
-      this.model = model;
-      this.controller = controller;
    }
 
-   public void update() {
+   public void update(final List<Rectangle> rects) {
       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;
-      final long maxSeconds = controller.calcTodaysSeconds();
-      for (final Work w : model.getPastWorkItems()) {
-         final long workedSeconds = Duration.between(w.getStartTime(), w.getEndTime()).getSeconds();
-         final double fillX = (float) workedSeconds / maxSeconds * canvas.getWidth();
-         gc.setFill(w.getProject().getColor());
-         gc.fillRect(currentX, 0, fillX, canvas.getHeight());
-         currentX += fillX;
+      for (final Rectangle rect : rects) {
+         gc.setFill(rect.getFill());
+         gc.fillRect(rect.getX(), 0, rect.getWidth(), canvas.getHeight());
       }
+
    }
 
 }

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

@@ -1,6 +1,8 @@
 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;
@@ -32,6 +34,8 @@
 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;
@@ -60,7 +64,7 @@ public class ReportController {
    private ScrollPane scrollPane;
 
    @FXML
-   private Canvas reportColorTimeLine;
+   private Canvas canvas;
 
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
@@ -83,12 +87,36 @@ private void initialize() {
          LOG.info("Datepicker selected value changed to {}", newvalue);
          updateReport(newvalue);
       });
+
+      colorTimeLine = new ColorTimeLine(canvas);
    }
 
    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);
+
       final SortedSet<Project> workedProjectsSet = currentWorkItems.stream().map(Work::getProject)
             .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Project::getName))));
 
@@ -160,8 +188,6 @@ private void updateReport(final LocalDate newvalue) {
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
 
-      colorTimeLine = new ColorTimeLine(reportColorTimeLine, model, controller);
-      colorTimeLine.update();
    }
 
    private Button createProjectReport() {

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

@@ -4,6 +4,7 @@
 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;
@@ -23,6 +24,7 @@
 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;
@@ -74,6 +76,7 @@
 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;
@@ -317,11 +320,27 @@ private void initialize() {
             label.setText(DateFormatter.secondsToHHMMSS(seconds));
          }
 
-         mainColorTimeLine.update();
+         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);
          updateTaskbarIcon(currentWorkSeconds);
       });
 
-      mainColorTimeLine = new ColorTimeLine(canvas, model, controller);
+      mainColorTimeLine = new ColorTimeLine(canvas);
    }
 
    private Dialog<Project> dialogResultConverter(final Dialog<Project> dialog, final GridPane grid) {

src/main/resources/report.fxml

@@ -71,7 +71,7 @@
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </VBox.margin>
             </BorderPane>
-            <Canvas fx:id="reportColorTimeLine" height="3.0" width="480.0">
+            <Canvas fx:id="canvas" height="3.0" width="480.0">
                <VBox.margin>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </VBox.margin>