Adds option to reset daily progress when updating a goal

lynchjames · Sep 2, 2023 · f91459c · f91459c
1 parent 7d81790
commit f91459c
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 12 deletions.
diff --git a/src/goal-history/history.ts b/src/goal-history/history.ts
@@ -41,7 +41,7 @@ export class GoalHistoryHelper {
             return undefined;
         }
         const goalHistory = await this.loadHistory();
-        const item = this.goalItemForDate(goalHistory, path, this.today());
+        const item = await this.goalItemForDate(goalHistory, path, this.today());
         return item;
     }
 
@@ -71,8 +71,16 @@ export class GoalHistoryHelper {
         let historyForPath = goalHistory[path] ?? [];
         historyForPath = historyForPath.filter(ghi => ghi.date != item.date);
         historyForPath.push(item);
+        console.log(item);
         goalHistory[path] = historyForPath;
-        this.goalFile.saveJson(GOAL_HISTORY_PATH, goalHistory);
+        await this.goalFile.saveJson(GOAL_HISTORY_PATH, goalHistory);
+    }
+
+    async resetDailyProgress(path: string) {
+        const item = await this.todaysGoalItem(path);
+        item.startCount = item.endCount;
+        console.log(item);
+        await this.saveGoal(path, item);
     }
 
     goalItemForDate(goalHistory:GoalHistory, path: string, date: string): GoalHistoryItem {

diff --git a/src/modals/goal-modal.ts b/src/modals/goal-modal.ts
@@ -1,4 +1,4 @@
-import { App, Modal, Setting, TAbstractFile, TFile, TFolder } from "obsidian";
+import { App, Modal, Setting, TAbstractFile, TFile, TFolder, TextComponent } from "obsidian";
 import  { NoteGoalHelper } from "../note-goal";
 import type WritingGoals from "../main";
 import { SettingsHelper } from "../settings/settings-helper";
@@ -30,7 +30,7 @@ export default class GoalModal extends Modal {
         this.target = target;
     }
 
-    onOpen() {
+    async onOpen() {
         const { contentEl } = this;
 
         contentEl.createEl("h2", { text: "Set your writing goal" });
@@ -64,15 +64,51 @@ export default class GoalModal extends Modal {
               this.userSubmittedDailyGoalCount = value;
             })
             .setValue(dailyGoalCount.toString()));
+
+        if(dailyGoalCount > 0){
+          const dailyGoalProgress = new Setting(contentEl)
+              .setName(await this.dailyGoalProgressText());    
 
-        const button = new Setting(contentEl)
-          .addButton((btn) =>
-            btn.setButtonText("Save goal")
-              .setCta()
-              .onClick(() => {
-                this.close();
-                this.onSubmit();
-              }));
+          const buttons = new Setting(contentEl)
+            .addButton((btn) =>
+                btn.setButtonText("Reset Daily Progress")
+                  .setClass("mod-warning")
+                  .onClick(async () => {
+                    await this.onResetDailyProgress(dailyGoalProgress);
+                    this.plugin.loadNoteGoalData();
+                  }))
+              .addButton((btn) =>
+                btn.setButtonText("Save goal")
+                  .setCta()
+                  .onClick(() => {
+                    this.close();
+                    this.onSubmit();
+                  }));
+          } else {
+            const saveButton = new Setting(contentEl)
+              .addButton((btn) =>
+                btn.setButtonText("Save goal")
+                  .setCta()
+                  .onClick(() => {
+                    this.close();
+                    this.onSubmit();
+                  }));
+          }
+      }
+
+      async dailyGoalProgressText() {
+        return `Current daily goal progress: ${(await this.calcProgress()).toLocaleString()} words`;
+      }
+
+      async calcProgress() {
+        const todaysDailyGoalProgress = await this.goalHistoryHelper.todaysGoalItem(this.target.path);
+        return todaysDailyGoalProgress.endCount - todaysDailyGoalProgress.startCount;
+      }
+
+      async onResetDailyProgress(dailyGoalProgress: Setting) {
+        await this.goalHistoryHelper.resetDailyProgress(this.target.path);
+        dailyGoalProgress.setName(await this.dailyGoalProgressText());
+        await this.plugin.loadNoteGoalData(true);
       }
 
       async onSubmit() {