Merge pull request #45 from doubleSlashde/feature/optional_note_reminder

Feature/optional note reminder

Author: Death111

src/main/java/de/doubleslash/keeptime/Main.java

@@ -199,6 +199,7 @@ private void readSettings() {
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
       model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
+      model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
    }
 
    private void initialisePopupUI(final Stage primaryStage) throws IOException {

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

@@ -104,7 +104,8 @@ public void addNewProject(final Project project) {
 
    public void updateSettings(final Color hoverBackgroundColor, final Color hoverFontColor,
          final Color defaultBackgroundColor, final Color defaultFontColor, final Color taskBarColor,
-         final boolean useHotkey, final boolean displayProjectsRight, final boolean hideProjectsOnMouseExit) {
+         final boolean useHotkey, final boolean displayProjectsRight, final boolean hideProjectsOnMouseExit,
+         final boolean emptyNoteReminder) {
       // TODO create holder for all the properties (or reuse Settings.class?)
       final Settings settings = model.getSettingsRepository().findAll().get(0);
       settings.setTaskBarColor(taskBarColor);
@@ -117,6 +118,7 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       settings.setUseHotkey(useHotkey);
       settings.setDisplayProjectsRight(displayProjectsRight);
       settings.setHideProjectsOnMouseExit(hideProjectsOnMouseExit);
+      settings.setRemindIfNotesAreEmpty(emptyNoteReminder);
 
       model.getSettingsRepository().save(settings);
 
@@ -128,6 +130,7 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
       model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
+      model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
    }
 
    @PreDestroy

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -79,7 +79,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public final ObjectProperty<Boolean> useHotkey = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
-   public final ObjectProperty<Boolean> emptyNoteReminder = new SimpleObjectProperty<>(false);
+
+   public final ObjectProperty<Boolean> remindIfNotesAreEmpty = new SimpleObjectProperty<>(false);
 
    private ConfigurableApplicationContext springContext;
 

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -59,6 +59,8 @@ public class Settings {
 
    private boolean hideProjectsOnMouseExit;
 
+   private boolean remindIfNotesAreEmpty;
+
    public long getId() {
       return id;
    }
@@ -127,4 +129,12 @@ public void setHideProjectsOnMouseExit(final boolean hideProjectsOnMouseExit) {
       this.hideProjectsOnMouseExit = hideProjectsOnMouseExit;
    }
 
+   public boolean isRemindIfNotesAreEmpty() {
+      return remindIfNotesAreEmpty;
+   }
+
+   public void setRemindIfNotesAreEmpty(final boolean emptyNoteReminder) {
+      this.remindIfNotesAreEmpty = emptyNoteReminder;
+   }
+
 }

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

@@ -34,6 +34,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 javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
@@ -49,6 +50,7 @@
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TextField;
+import javafx.scene.control.TextInputDialog;
 import javafx.scene.control.Tooltip;
 import javafx.scene.effect.Bloom;
 import javafx.scene.input.MouseButton;
@@ -165,7 +167,27 @@ private void changeProject(final Project newProject, final long minusSeconds) {
       if (hideable) {
          mainStage.hide();
       }
+      if (model.remindIfNotesAreEmpty.get()) {
+         final Work currentWork = model.activeWorkItem.get();
+         if (currentWork != null && currentWork.getNotes().isEmpty()) {
+            final TextInputDialog noteDialog = new TextInputDialog();
+            noteDialog.setTitle("Empty Notes");
+            noteDialog.setHeaderText("Switch projects without notes?");
+            noteDialog.setContentText(
+                  "What did you do for project '" + model.activeWorkItem.get().getProject().getName() + "' ?");
+            noteDialog.initOwner(mainStage);
+
+            final Optional<String> result = noteDialog.showAndWait();
+            if (result.isPresent()) {
+               currentWork.setNotes(result.get());
+            } else {
+               // cancel pressed
+               return;
+            }
+         }
+      }
       controller.changeProject(newProject, minusSeconds);
+
    }
 
    private void addProjectToProjectSelectionNodeMap(final Project project) {

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

@@ -124,11 +124,10 @@ public ReportController(final Model model, final Controller controller) {
    private void initialize() {
       LOG.info("Init reportController");
       currentReportDate = LocalDate.now();
-      colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
 
+      colorTimeLine = new ColorTimeLine(colorTimeLineCanvas);
       loadCalenderWidget();
       initTableView();
-
    }
 
    private void initTableView() {

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

@@ -79,6 +79,9 @@ public class SettingsController {
    @FXML
    private CheckBox hideProjectsOnMouseExitCheckBox;
 
+   @FXML
+   private CheckBox emptyNoteReminderCheeckBox;
+
    @FXML
    private Button saveButton;
 
@@ -173,7 +176,7 @@ private void initialize() {
          controller.updateSettings(hoverBackgroundColor.getValue(), hoverFontColor.getValue(),
                defaultBackgroundColor.getValue(), defaultFontColor.getValue(), taskBarColor.getValue(),
                useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected(),
-               hideProjectsOnMouseExitCheckBox.isSelected());
+               hideProjectsOnMouseExitCheckBox.isSelected(), emptyNoteReminderCheeckBox.isSelected());
          thisStage.close();
 
       });
@@ -193,7 +196,7 @@ private void initialize() {
       resetDefaultFontButton.setOnAction(ae -> defaultFontColor.setValue(Model.ORIGINAL_DEFAULT_FONT_COLOR));
       resetTaskBarFontButton.setOnAction(ae -> taskBarColor.setValue(Model.ORIGINAL_TASK_BAR_FONT_COLOR));
 
-      LOG.debug("reportBugButton.setOnAction");
+      LOG.debug("aboutButton.setOnAction");
       aboutButton.setOnAction(ae -> {
          LOG.info("About clicked");
          aboutStage.show();
@@ -215,6 +218,7 @@ void update() {
       useHotkeyCheckBox.setSelected(model.useHotkey.get());
       displayProjectsRightCheckBox.setSelected(model.displayProjectsRight.get());
       hideProjectsOnMouseExitCheckBox.setSelected(model.hideProjectsOnMouseExit.get());
+      emptyNoteReminderCheeckBox.setSelected(model.remindIfNotesAreEmpty.get());
    }
 
    public void setStage(final Stage thisStage) {

src/main/resources/db/migration/V1_1_1__added_note_reminder_setting.sql

@@ -0,0 +1,2 @@
+ ALTER TABLE settings
+  ADD COLUMN empty_note_reminder BOOLEAN NOT NULL DEFAULT(false)

src/main/resources/db/migration/V1_1_2__renamed_note_reminder_column.sql

@@ -0,0 +1,2 @@
+ ALTER TABLE settings
+  RENAME COLUMN empty_note_reminder TO remind_if_notes_are_empty

src/main/resources/layouts/settings.fxml

@@ -28,7 +28,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="settingsRoot" focusTraversable="true" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.SettingsController">
+<AnchorPane fx:id="settingsRoot" focusTraversable="true" xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.view.SettingsController">
    <children>
       <VBox spacing="10.0" stylesheets="@../css/menu.css">
          <children>
@@ -202,7 +202,7 @@
                                           <Font name="Open Sans Bold" size="12.0" />
                                        </font>
                                     </Label>
-                                    <Label fx:id="globalKeyloggerLabel" alignment="TOP_LEFT" contentDisplay="TOP" disable="true" prefHeight="17.0" prefWidth="106.0" text="(global keylogger!)">
+                                    <Label fx:id="globalKeyloggerLabel" alignment="TOP_LEFT" contentDisplay="TOP" disable="true" prefHeight="17.0" prefWidth="120.0" text="(global keylistener!)">
                                        <font>
                                           <Font name="Open Sans Regular" size="12.0" />
                                        </font>
@@ -224,6 +224,36 @@
                   </Group>
                </children>
             </VBox>
+            <VBox styleClass="menuBorder">
+               <children>
+                  <Group>
+                     <children>
+                        <VBox>
+                           <children>
+                              <HBox spacing="10.0">
+                                 <children>
+                                    <Label fx:id="hotkeyLabel1" text="Note Reminder">
+                                       <font>
+                                          <Font name="Open Sans Bold" size="12.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </HBox>
+                              <HBox spacing="10.0">
+                                 <children>
+                                    <CheckBox fx:id="emptyNoteReminderCheeckBox" mnemonicParsing="false" text="Ask for notes when switching project (if empty)" wrapText="true" HBox.hgrow="NEVER">
+                                       <font>
+                                          <Font name="Open Sans Regular" size="12.0" />
+                                       </font>
+                                    </CheckBox>
+                                 </children>
+                              </HBox>
+                           </children>
+                        </VBox>
+                     </children>
+                  </Group>
+               </children>
+            </VBox>
             <HBox spacing="10.0">
                <children>
                   <Button fx:id="saveButton" mnemonicParsing="false" text="Save">