changed settingsame; changed dialog to give ability to directly add notes

Author: JSchraff

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

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

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

@@ -118,7 +118,7 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       settings.setUseHotkey(useHotkey);
       settings.setDisplayProjectsRight(displayProjectsRight);
       settings.setHideProjectsOnMouseExit(hideProjectsOnMouseExit);
-      settings.setEmptyNoteReminder(emptyNoteReminder);
+      settings.setRemindIfNotesAreEmpty(emptyNoteReminder);
 
       model.getSettingsRepository().save(settings);
 
@@ -130,7 +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.emptyNoteReminder.set(settings.isEmptyNoteReminder());
+      model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
    }
 
    @PreDestroy

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

@@ -77,7 +77,7 @@ 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,7 +59,7 @@ public class Settings {
 
    private boolean hideProjectsOnMouseExit;
 
-   private boolean emptyNoteReminder;
+   private boolean remindIfNotesAreEmpty;
 
    public long getId() {
       return id;
@@ -129,12 +129,12 @@ public void setHideProjectsOnMouseExit(final boolean hideProjectsOnMouseExit) {
       this.hideProjectsOnMouseExit = hideProjectsOnMouseExit;
    }
 
-   public boolean isEmptyNoteReminder() {
-      return emptyNoteReminder;
+   public boolean isRemindIfNotesAreEmpty() {
+      return remindIfNotesAreEmpty;
    }
 
-   public void setEmptyNoteReminder(final boolean emptyNoteReminder) {
-      this.emptyNoteReminder = emptyNoteReminder;
+   public void setRemindIfNotesAreEmpty(final boolean emptyNoteReminder) {
+      this.remindIfNotesAreEmpty = emptyNoteReminder;
    }
 
 }

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

@@ -50,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;
@@ -166,19 +167,23 @@ private void changeProject(final Project newProject, final long minusSeconds) {
       if (hideable) {
          mainStage.hide();
       }
-      if (model.emptyNoteReminder.get()) {
+      if (model.remindIfNotesAreEmpty.get()) {
          final Work currentWork = model.activeWorkItem.get();
          if (currentWork != null && currentWork.getNotes().isEmpty()) {
-            final Alert alert = new Alert(AlertType.CONFIRMATION);
-            alert.setTitle("Empty Notes");
-            alert.setHeaderText(
+            final TextInputDialog noteDialog = new TextInputDialog();
+            noteDialog.setTitle("Empty Notes");
+            noteDialog.setHeaderText(
                   "You are About to switch Projects but your current work has no Notes associated with it.");
-            alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-            alert.setContentText("Do you want to switch nevertheless?");
-            alert.initOwner(mainStage);
+            noteDialog.setContentText("You can add Notes now:");
+            noteDialog.initOwner(mainStage);
 
-            final Optional<ButtonType> result = alert.showAndWait();
-            if (result.get() == ButtonType.NO) {
+            final Optional<String> result = noteDialog.showAndWait();
+            if (result.isPresent()) {
+               if (!result.get().equals("")) {
+                  currentWork.setNotes(result.get());
+               }
+
+            } else {
                return;
             }
          }

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

@@ -218,7 +218,7 @@ void update() {
       useHotkeyCheckBox.setSelected(model.useHotkey.get());
       displayProjectsRightCheckBox.setSelected(model.displayProjectsRight.get());
       hideProjectsOnMouseExitCheckBox.setSelected(model.hideProjectsOnMouseExit.get());
-      emptyNoteReminderCheeckBox.setSelected(model.emptyNoteReminder.get());
+      emptyNoteReminderCheeckBox.setSelected(model.remindIfNotesAreEmpty.get());
    }
 
    public void setStage(final Stage thisStage) {

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