renamed some variables. added missing license. added underline if project is work in report

Author: Death111

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

@@ -1,3 +1,19 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.view;
 
 import java.time.Duration;

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

@@ -29,7 +29,6 @@
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
 import de.doubleslash.keeptime.common.DateFormatter;
-import de.doubleslash.keeptime.common.DateProvider;
 import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
@@ -79,16 +78,14 @@ public class ReportController {
    private ScrollPane scrollPane;
 
    @FXML
-   private Canvas canvas;
+   private Canvas colorTimeLineCanvas;
 
    private static final Logger LOG = LoggerFactory.getLogger(ReportController.class);
 
    private DatePicker datePicker; // for calendar element
 
    private Model model;
 
-   private DateProvider dateProvider;
-
    private Controller controller;
 
    private ColorTimeLine colorTimeLine;
@@ -103,7 +100,7 @@ private void initialize() {
          updateReport(newvalue);
       });
 
-      colorTimeLine = new ColorTimeLine(canvas);
+      colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
    }
 
    private void updateReport(final LocalDate newvalue) {
@@ -126,23 +123,23 @@ private void updateReport(final LocalDate newvalue) {
       for (final Project project : workedProjectsSet) {
          final Label projectName = new Label(project.getName());
          projectName.setFont(FontProvider.getBoldFont());
+         projectName.setUnderline(project.isWork());
          final Circle circle = new Circle(5, project.getColor());
 
-         final HBox nameHBox = new HBox();
-         nameHBox.setAlignment(Pos.CENTER_LEFT);
-         nameHBox.setPadding(new Insets(0, 0, 0, 5));
-         nameHBox.setSpacing(5);
+         final HBox projectNameHBox = new HBox();
+         projectNameHBox.setAlignment(Pos.CENTER_LEFT);
+         projectNameHBox.setPadding(new Insets(0, 0, 0, 5));
+         projectNameHBox.setSpacing(5);
 
-         nameHBox.getChildren().add(circle);
-         nameHBox.getChildren().add(projectName);
+         projectNameHBox.getChildren().add(circle);
+         projectNameHBox.getChildren().add(projectName);
 
-         this.gridPane.add(nameHBox, 0, rowIndex);
+         this.gridPane.add(projectNameHBox, 0, rowIndex);
 
          final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
                .collect(Collectors.toList());
 
-         final long todaysWorkSeconds = onlyCurrentProjectWork.stream()
-               .mapToLong(work -> DateFormatter.getSecondsBewtween(work.getStartTime(), work.getEndTime())).sum();
+         final long todaysWorkSeconds = controller.calcSeconds(onlyCurrentProjectWork);
 
          currentSeconds += todaysWorkSeconds;
          if (project.isWork()) {

src/main/resources/layouts/report.fxml

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