add colorized TimeLine to report window

Author: Martin Plieske

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

@@ -12,14 +12,18 @@
 
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
+import de.doubleslash.keeptime.common.ColorTimeLine;
 import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.common.DateProvider;
+import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
+import javafx.scene.canvas.Canvas;
 import javafx.scene.control.Button;
 import javafx.scene.control.DateCell;
 import javafx.scene.control.DatePicker;
@@ -56,12 +60,21 @@ public class ReportController {
    @FXML
    private ScrollPane scrollPane;
 
+   @FXML
+   private Canvas reportColorTimeLine;
+
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
    private DatePicker datePicker; // for calender element
 
    private Model model;
 
+   private DateProvider dateProvider;
+
+   private Controller controller;
+
+   private ColorTimeLine colorTimeLine;
+
    @FXML
    private void initialize() {
       LOG.info("Init reportController");
@@ -151,6 +164,10 @@ private void updateReport(final LocalDate newvalue) {
 
       this.currentDayTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentSeconds));
       this.currentDayWorkTimeLabel.setText(DateFormatter.secondsToHHMMSS(currentWorkSeconds));
+
+      controller = new Controller(model, dateProvider);
+      colorTimeLine = new ColorTimeLine(reportColorTimeLine, model, controller);
+      colorTimeLine.update();
    }
 
    private Button createProjectReport() {

src/main/resources/report.fxml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.canvas.Canvas?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -12,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefWidth="500.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
+<AnchorPane prefWidth="500.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.ReportController">
    <children>
       <VBox>
          <children>
@@ -70,6 +71,11 @@
                   <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">
+               <VBox.margin>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </VBox.margin>
+            </Canvas>
             <Label text="Notes:">
                <font>
                   <Font size="16.0" />