fixed report day availability and color. verifiyng repo call in change project. improved logging

Author: Death111

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

@@ -1,6 +1,7 @@
 package de.doubleslash.keeptime.controller;
 
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +46,7 @@ public void changeProject(final Project newProject, final long minusSeconds) {
 
       final Work currentWork = model.activeWorkItem.get();
 
+      final LocalDate dateNow = dateProvider.dateNow();
       final LocalDateTime now = dateProvider.dateTimeNow().minusSeconds(minusSeconds);
       if (currentWork != null) {
          currentWork.setEndTime(now);
@@ -63,11 +65,13 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       }
 
       // Start new work
-      final Work work = new Work(dateProvider.dateNow(), now, now.plusSeconds(minusSeconds), newProject, "");
+      final Work work = new Work(dateNow, now, now.plusSeconds(minusSeconds), newProject, "");
       model.pastWorkItems.add(work);
-      if (currentWork != null && !currentWork.getCreationDate().isEqual(work.getCreationDate())) {
-         Log.info("Removing projects from the other daya then today from list.");
-         model.pastWorkItems.removeIf(w -> !w.getCreationDate().isEqual(work.getCreationDate()));
+      if (currentWork != null && !dateNow.isEqual(currentWork.getCreationDate())) {
+         Log.info("Removing projects with other creation date than today '{}' from list.", dateNow);
+         final int sizeBefore = model.pastWorkItems.size();
+         model.pastWorkItems.removeIf(w -> !dateNow.isEqual(w.getCreationDate()));
+         Log.debug("Removed '{}' work items from past work items.", sizeBefore - model.pastWorkItems.size());
       }
       model.activeWorkItem.set(work);
    }

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

@@ -31,7 +31,7 @@
 
 public class ReportController {
 
-   private static final String FX_BACKGROUND_COLOR_NOT_WORKED = "-fx-background-color: #ffc0cb;";
+   private static final String FX_BACKGROUND_COLOR_NOT_WORKED = "-fx-background-color: #BBBBBB;";
 
    @FXML
    private BorderPane topBorderPane;
@@ -64,15 +64,6 @@ private void initialize() {
          LOG.info("Datepicker selected value changed to {}", newvalue);
          updateReport(newvalue);
       });
-
-      // HACK to show calendar from datepicker
-      // https://stackoverflow.com/questions/34681975/javafx-extract-calendar-popup-from-datepicker-only-show-popup
-      final DatePickerSkin datePickerSkin = new DatePickerSkin(datePicker);
-      final Node popupContent = datePickerSkin.getPopupContent();
-
-      // root.setCenter(popupContent);
-      // topBorderPane.getChildren().add(popupContent);
-      topBorderPane.setRight(popupContent);
    }
 
    private void updateReport(final LocalDate newvalue) {
@@ -145,6 +136,9 @@ public void setModelAndController(final Model model, final Controller controller
       this.model = model;
       this.controller = controller;
 
+      // HACK to show calendar from datepicker
+      // https://stackoverflow.com/questions/34681975/javafx-extract-calendar-popup-from-datepicker-only-show-popup
+      final DatePickerSkin datePickerSkin = new DatePickerSkin(datePicker);
       final Callback<DatePicker, DateCell> dayCellFactory = new Callback<DatePicker, DateCell>() {
          @Override
          public DateCell call(final DatePicker datePicker) {
@@ -161,6 +155,8 @@ public void updateItem(final LocalDate item, final boolean empty) {
          }
       };
       datePicker.setDayCellFactory(dayCellFactory);
+      final Node popupContent = datePickerSkin.getPopupContent();
+      topBorderPane.setRight(popupContent);
    }
 
    public void update() {

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -186,6 +186,18 @@ public void changeProjectSameDayTest() {
       Mockito.when(mockedDateProvider.dateNow()).thenReturn(secondProjectDate);
       testee.changeProject(secondProject);
 
+      Mockito.verify(model.workRepository, Mockito.times(1)).save(Mockito.argThat((final Work savedWork) -> {
+         if (savedWork.getProject() != firstProject) {
+            return false;
+         }
+         if (!savedWork.getStartTime().equals(firstProjectDateTime)) {
+            return false;
+         }
+         if (!savedWork.getEndTime().equals(secondProjectDateTime)) {
+            return false;
+         }
+         return true;
+      }));
       assertThat("Two project should be in the past work items", model.pastWorkItems.size(), is(2));
       assertThat("The first project should be the past work project", model.pastWorkItems.get(0).getProject(),
             is(firstProject));
@@ -209,7 +221,18 @@ public void changeProjectOtherDayTest() {
       Mockito.when(mockedDateProvider.dateNow()).thenReturn(secondProjectDate);
       testee.changeProject(secondProject);
 
-      Mockito.verify(model.workRepository, Mockito.times(1)).save(Mockito.any(Work.class));
+      Mockito.verify(model.workRepository, Mockito.times(1)).save(Mockito.argThat((final Work savedWork) -> {
+         if (savedWork.getProject() != firstProject) {
+            return false;
+         }
+         if (!savedWork.getStartTime().equals(firstProjectDateTime)) {
+            return false;
+         }
+         if (!savedWork.getEndTime().equals(secondProjectDateTime)) {
+            return false;
+         }
+         return true;
+      }));
       assertThat("One projects should be in the past work items", model.pastWorkItems.size(), is(1));
       assertThat("The project should be the second work project", model.pastWorkItems.get(0).getProject(),
             is(secondProject));