feat: add active task end time in status bar

Resolves #413
ivan-lednev · Sep 28, 2024 · 4af69c5 · 4af69c5
1 parent f5964ab
commit 4af69c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ui/components/status-bar-widget.svelte b/src/ui/components/status-bar-widget.svelte
@@ -11,7 +11,7 @@
 
   const statusBarProps = useStatusBarWidget({ tasksForToday });
 
-  $: ({ showNow, showNext, progressIndicator } = $settings);
+  $: ({ showNow, showNext, progressIndicator, timestampFormat } = $settings);
   $: ({ current, next } = $statusBarProps);
 </script>
 
@@ -24,7 +24,9 @@
   {:else}
     {#if showNow && current}
       <span class="status-bar-item-segment"
-        >Now: {current.text} (-{current.timeLeft})</span
+        >Now: {current.text} (-{current.timeLeft}, till {current.endTime.format(
+          timestampFormat,
+        )})</span
       >
       {#if progressIndicator === "pie"}
         <div

diff --git a/src/ui/hooks/use-status-bar-widget.ts b/src/ui/hooks/use-status-bar-widget.ts
@@ -1,4 +1,5 @@
 import { sortBy } from "lodash/fp";
+import type { Moment } from "moment";
 import { derived, type Readable } from "svelte/store";
 
 import { statusBarTextLimit } from "../../constants";
@@ -17,6 +18,7 @@ interface Widget {
     text: string;
     timeLeft: string;
     percentageComplete: string;
+    endTime: Moment;
   };
   next?: {
     text: string;
@@ -68,6 +70,7 @@ export function useStatusBarWidget({ tasksForToday }: UseStatusBarWidgetProps) {
           percentageComplete: percentageComplete.toFixed(0),
           timeLeft,
           text,
+          endTime: getEndTime(currentItem),
         };
       }