From ec39997a70ed906f8f2c0eb8faef5cf447235f20 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Thu, 8 May 2025 12:23:45 +0200
Subject: [PATCH] feat(dueDate): make todayStr dynamic in task component

---
 .../features/tasks/task/task.component.html   |  2 +-
 src/app/features/tasks/task/task.component.ts | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/features/tasks/task/task.component.html b/src/app/features/tasks/task/task.component.html
index 58483a9881..065852102a 100644
--- a/src/app/features/tasks/task/task.component.html
+++ b/src/app/features/tasks/task/task.component.html
@@ -237,7 +237,7 @@
               [innerHTML]="t.dueWithTime | shortPlannedAt"
             ></div>
           </button>
-        } @else if (t.dueDay && isShowDueToday()) {
+        } @else if (isShowDueDayBtn()) {
           <button
             (click)="scheduleTask()"
             [title]="T.F.TASK.CMP.EDIT_SCHEDULED | translate"
diff --git a/src/app/features/tasks/task/task.component.ts b/src/app/features/tasks/task/task.component.ts
index 4b69b60ce2..4d8df0ab9b 100644
--- a/src/app/features/tasks/task/task.component.ts
+++ b/src/app/features/tasks/task/task.component.ts
@@ -82,10 +82,10 @@ import { TagToggleMenuListComponent } from '../../tag/tag-toggle-menu-list/tag-t
 import { Store } from '@ngrx/store';
 import { selectTodayTagTaskIds } from '../../tag/store/tag.reducer';
 import { planTasksForToday } from '../../tag/store/tag.actions';
-import { getWorklogStr } from '../../../util/get-work-log-str';
 import { unScheduleTask } from '../store/task.actions';
 import { environment } from '../../../../environments/environment';
 import { TODAY_TAG } from '../../tag/tag.const';
+import { GlobalTrackingIntervalService } from '../../../core/global-tracking-interval/global-tracking-interval.service';
 
 @Component({
   selector: 'task',
@@ -137,6 +137,7 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
   private readonly _renderer = inject(Renderer2);
   private readonly _store = inject(Store);
   private readonly _projectService = inject(ProjectService);
+  private readonly _globalTrackingIntervalService = inject(GlobalTrackingIntervalService);
   readonly workContextService = inject(WorkContextService);
 
   task = input.required<TaskWithSubTasks>();
@@ -148,6 +149,7 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
   isCurrent = computed(() => this.currentId() === this.task().id);
   selectedId = toSignal(this._taskService.selectedTaskId$);
   isSelected = computed(() => this.selectedId() === this.task().id);
+  todayStr = toSignal(this._globalTrackingIntervalService.todayDateStr$);
 
   todayList = toSignal(this._store.select(selectTodayTagTaskIds), { initialValue: [] });
   isTaskOnTodayList = computed(() => this.todayList().includes(this.task().id));
@@ -168,12 +170,18 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
     const t = this.task();
     return (
       (t.dueWithTime && isToday(t.dueWithTime)) ||
-      (t.dueDay && t.dueDay === getWorklogStr())
+      (t.dueDay && t.dueDay === this.todayStr())
     );
   });
 
-  isShowDueToday = computed(() => {
-    return !this.isTodayListActive() || this.isOverdue() || !environment.production;
+  isShowDueDayBtn = computed(() => {
+    return (
+      this.task().dueDay &&
+      (!this.isTodayListActive() ||
+        this.isOverdue() ||
+        this.task().dueDay !== this.todayStr() ||
+        !environment.production)
+    );
   });
 
   progress = computed<number>(() => {
@@ -185,7 +193,7 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
     return (
       !this.isTodayListActive() &&
       !this.task().isDone &&
-      this.task().dueDay === getWorklogStr()
+      this.task().dueDay === this.todayStr()
     );
   });
 
@@ -193,9 +201,9 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
     const task = this.task();
     return this.isTodayListActive()
       ? (task.dueWithTime && !isToday(task.dueWithTime)) ||
-          (task.dueDay && task.dueDay !== getWorklogStr())
+          (task.dueDay && task.dueDay !== this.todayStr())
       : !this.isShowRemoveFromToday() &&
-          task.dueDay !== getWorklogStr() &&
+          task.dueDay !== this.todayStr() &&
           (!task.dueWithTime || !isToday(task.dueWithTime));
   });