track word count after meeting goal (#234)

* Added issue #222 Word count continues to count up after reaching goal. Also added setting to optionally disable behaviour. * removed extra space in formatting * more concise description of setting * actually saves setting * setting removed * format --------- Co-authored-by: MadCatMagic <[email protected]>
kevboh · Jan 22, 2024 · 17ed844 · 17ed844
1 parent 19b38c1
commit 17ed844
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/view/explorer/ProjectDetails.svelte b/src/view/explorer/ProjectDetails.svelte
@@ -143,10 +143,10 @@
   let goalPercentage: number;
   let goalDescription: string;
   $: {
-    goalPercentage = Math.ceil($goalProgress * 100);
-    goalDescription = `${$goalProgress * $pluginSettings.sessionGoal}/${
-      $pluginSettings.sessionGoal
-    }`;
+    goalPercentage = Math.ceil(Math.min($goalProgress, 1) * 100);
+    goalDescription = `${Math.round(
+      $goalProgress * $pluginSettings.sessionGoal
+    )}/${$pluginSettings.sessionGoal}`;
   }
 
   function pluralize(

diff --git a/src/view/stores.ts b/src/view/stores.ts
@@ -63,11 +63,11 @@ export const goalProgress = derived(
     const goal = $pluginSettings.sessionGoal;
 
     if ($pluginSettings.applyGoalTo === "all") {
-      return Math.min(latestSession.total / goal, 1);
+      return latestSession.total / goal;
     } else if ($pluginSettings.applyGoalTo === "project") {
       const draftTotal = latestSession.drafts[$selectedDraft.vaultPath];
       if (draftTotal) {
-        return Math.min(draftTotal.total / goal, 1);
+        return draftTotal.total / goal;
       } else {
         return 0;
       }
@@ -88,7 +88,7 @@ export const goalProgress = derived(
         return draftTotals.total;
       } else {
         const sceneTotal = draftTotals.scenes[name] ?? 0;
-        return Math.min(sceneTotal / goal, 1);
+        return sceneTotal / goal;
       }
     }
   }