make "show notes" from #92 configurable

ddamke · ddamke · commit 0bc14f707bf4 · 2022-10-12T16:40:06.000+02:00
diff --git a/src/main/java/de/doubleslash/keeptime/Main.java b/src/main/java/de/doubleslash/keeptime/Main.java
@@ -209,6 +209,7 @@ private void readSettings() {
       model.screenSettings.screenHash.set(settings.getScreenHash());
       model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
+      model.remindIfNotesAreEmptyIsWork.set(settings.isEmptyNoteReminderIsWork());
 
    }
 
diff --git a/src/main/java/de/doubleslash/keeptime/controller/Controller.java b/src/main/java/de/doubleslash/keeptime/controller/Controller.java
@@ -131,6 +131,8 @@ public void updateSettings(final Settings newValuedSettings) {
       settings.setWindowYProportion(newValuedSettings.getWindowYProportion());
       settings.setScreenHash(newValuedSettings.getScreenHash());
       settings.setRemindIfNotesAreEmpty(newValuedSettings.isRemindIfNotesAreEmpty());
+      settings.setEmptyNoteReminderIsWork(newValuedSettings.isEmptyNoteReminderIsWork());
+
 
       settings = model.getSettingsRepository().save(settings);
 
@@ -147,6 +149,8 @@ public void updateSettings(final Settings newValuedSettings) {
       model.screenSettings.proportionalY.set(settings.getWindowYProportion());
       model.screenSettings.screenHash.set(settings.getScreenHash());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
+      model.remindIfNotesAreEmptyIsWork.set(settings.isEmptyNoteReminderIsWork());
+
    }
 
    @PreDestroy
@@ -162,7 +166,7 @@ public void shutdown() {
             model.useHotkey.get(), model.displayProjectsRight.get(), model.hideProjectsOnMouseExit.get(),
             model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get(),
             model.screenSettings.screenHash.get(), model.screenSettings.saveWindowPosition.get(),
-            model.remindIfNotesAreEmpty.get());
+            model.remindIfNotesAreEmpty.get(),model.remindIfNotesAreEmptyIsWork.get());
       updateSettings(newSettings);
    }
 
diff --git a/src/main/java/de/doubleslash/keeptime/model/Model.java b/src/main/java/de/doubleslash/keeptime/model/Model.java
@@ -82,6 +82,10 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
 
    public final ObjectProperty<Boolean> remindIfNotesAreEmpty = new SimpleObjectProperty<>(false);
 
+   public final ObjectProperty<Boolean> remindIfNotesAreEmptyIsWork = new SimpleObjectProperty<>(false);
+
+
+
    public final ScreenSettings screenSettings = new ScreenSettings();
 
    private ConfigurableApplicationContext springContext;
diff --git a/src/main/java/de/doubleslash/keeptime/model/Settings.java b/src/main/java/de/doubleslash/keeptime/model/Settings.java
@@ -69,14 +69,18 @@ public class Settings {
 
    private boolean remindIfNotesAreEmpty;
 
+   private boolean emptyNoteReminderIsWork;
+
+
+
    public Settings() {
    }
 
    public Settings(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 double windowPositionX,
          final double windowPositionY, final int screenHash, final boolean saveWindowPosition,
-         final boolean remindIfNotesAreEmpty) {
+         final boolean remindIfNotesAreEmpty, final boolean emptyNoteReminderIsWork) {
       this.hoverBackgroundColor = hoverBackgroundColor;
       this.hoverFontColor = hoverFontColor;
       this.defaultBackgroundColor = defaultBackgroundColor;
@@ -90,7 +94,16 @@ public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, fi
       this.windowScreenhash = screenHash;
       this.saveWindowPosition = saveWindowPosition;
       this.remindIfNotesAreEmpty = remindIfNotesAreEmpty;
+      this.emptyNoteReminderIsWork = emptyNoteReminderIsWork;
+
+   }
+
+   public boolean isEmptyNoteReminderIsWork() {
+      return emptyNoteReminderIsWork;
+   }
 
+   public void setEmptyNoteReminderIsWork(boolean emptyNoteReminderCheckBoxIsWork) {
+      this.emptyNoteReminderIsWork = emptyNoteReminderCheckBoxIsWork;
    }
 
    public long getId() {
diff --git a/src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java b/src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java
@@ -168,28 +168,39 @@ private void changeProject(final Project newProject, final long minusSeconds) {
          mainStage.hide();
       }
       if (model.remindIfNotesAreEmpty.get()) {
+         final Work currentWork = model.activeWorkItem.get();
+         if (currentWork != null && currentWork.getNotes().isEmpty() ) {
+            if (showNoNoteSelectet(currentWork)) return;
+         }
+      }
+      if (model.remindIfNotesAreEmptyIsWork.get()) {
          final Work currentWork = model.activeWorkItem.get();
          if (currentWork != null && currentWork.getNotes().isEmpty() &&currentWork.getProject().isWork()) {
-            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;
-            }
+            if (showNoNoteSelectet(currentWork)) return;
          }
       }
       controller.changeProject(newProject, minusSeconds);
 
    }
 
+   private boolean showNoNoteSelectet(Work currentWork) {
+      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 true;
+      }
+      return false;
+   }
+
    private void addProjectToProjectSelectionNodeMap(final Project project) {
       final Node projectElement = createListEntryForProject(project);
       projectSelectionNodeMap.put(project, projectElement);
diff --git a/src/main/java/de/doubleslash/keeptime/view/SettingsController.java b/src/main/java/de/doubleslash/keeptime/view/SettingsController.java
@@ -92,6 +92,9 @@ public class SettingsController {
    @FXML
    private CheckBox emptyNoteReminderCheckBox;
 
+   @FXML
+   private CheckBox emptyNoteReminderCheckBoxIsWork;
+
    @FXML
    private Button saveButton;
 
@@ -204,7 +207,7 @@ private void initialize() {
                useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected(),
                hideProjectsOnMouseExitCheckBox.isSelected(), model.screenSettings.proportionalX.get(),
                model.screenSettings.proportionalY.get(), model.screenSettings.screenHash.get(),
-               saveWindowPositionCheckBox.isSelected(), emptyNoteReminderCheckBox.isSelected()));
+               saveWindowPositionCheckBox.isSelected(), emptyNoteReminderCheckBox.isSelected(), emptyNoteReminderCheckBoxIsWork.isSelected()));
          thisStage.close();
 
       });
@@ -295,6 +298,7 @@ void update() {
       hideProjectsOnMouseExitCheckBox.setSelected(model.hideProjectsOnMouseExit.get());
       saveWindowPositionCheckBox.setSelected(model.screenSettings.saveWindowPosition.get());
       emptyNoteReminderCheckBox.setSelected(model.remindIfNotesAreEmpty.get());
+      emptyNoteReminderCheckBoxIsWork.setSelected(model.remindIfNotesAreEmptyIsWork.get());
    }
 
    public void setStage(final Stage thisStage) {
diff --git a/src/main/resources/db/migration/V1_1_5__added_note_reminder_setting_only_work.sql b/src/main/resources/db/migration/V1_1_5__added_note_reminder_setting_only_work.sql
@@ -0,0 +1,2 @@
+ ALTER TABLE settings
+  ADD COLUMN empty_note_reminder_only_work BOOLEAN NOT NULL DEFAULT(false)
diff --git a/src/main/resources/db/migration/V1_1_6__renamed_note_reminder_setting_only_work.sql b/src/main/resources/db/migration/V1_1_6__renamed_note_reminder_setting_only_work.sql
@@ -0,0 +1,2 @@
+ ALTER TABLE settings
+  RENAME COLUMN empty_note_reminder_only_work TO empty_note_reminder_is_work
diff --git a/src/main/resources/layouts/settings.fxml b/src/main/resources/layouts/settings.fxml
@@ -283,6 +283,35 @@
                      </children>
                   </Group>
                </children>
+            </VBox>   <VBox styleClass="menuBorder">
+               <children>
+                  <Group>
+                     <children>
+                        <VBox>
+                           <children>
+                              <HBox spacing="10.0">
+                                 <children>
+                                    <Label text="Note Reminder">
+                                       <font>
+                                          <Font name="Open Sans Bold" size="12.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </HBox>
+                              <HBox spacing="10.0">
+                                 <children>
+                                    <CheckBox fx:id="emptyNoteReminderCheckBoxIsWork" mnemonicParsing="false" text="Ask for notes when switching from project marked as work (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>

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ private void readSettings() {`
`209`	`209`	`model.screenSettings.screenHash.set(settings.getScreenHash());`
`210`	`210`	`model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());`
`211`	`211`	`model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());`
	`212`	`+ model.remindIfNotesAreEmptyIsWork.set(settings.isEmptyNoteReminderIsWork());`
`212`	`213`
`213`	`214`	`}`
`214`	`215`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ ALTER TABLE settings`
	`2`	`+ ADD COLUMN empty_note_reminder_only_work BOOLEAN NOT NULL DEFAULT(false)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ ALTER TABLE settings`
	`2`	`+ RENAME COLUMN empty_note_reminder_only_work TO empty_note_reminder_is_work`