From 7cb38b04b4283754fc199a213d9fa5fe681cc360 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Sun, 16 May 2021 12:32:57 +0200
Subject: [PATCH] feat(reminder): properly reset plannedAt whenever it makes
 sense

---
 .../dialog-view-task-reminders.component.html | 12 ++++----
 .../dialog-view-task-reminders.component.ts   | 22 ++++++++------
 .../tasks/store/task-related-model.effects.ts |  1 +
 .../tasks/store/task-reminder.effects.ts      |  2 +-
 src/app/t.const.ts                            | 30 +++++++++----------
 src/assets/i18n/ar.json                       |  2 +-
 src/assets/i18n/de.json                       |  2 +-
 src/assets/i18n/en.json                       |  2 +-
 src/assets/i18n/es.json                       |  2 +-
 src/assets/i18n/fa.json                       |  2 +-
 src/assets/i18n/fr.json                       |  2 +-
 src/assets/i18n/it.json                       |  2 +-
 src/assets/i18n/ja.json                       |  2 +-
 src/assets/i18n/ko.json                       |  2 +-
 src/assets/i18n/nb.json                       |  2 +-
 src/assets/i18n/nl.json                       |  2 +-
 src/assets/i18n/pt.json                       |  2 +-
 src/assets/i18n/ru.json                       |  2 +-
 src/assets/i18n/tr.json                       |  2 +-
 src/assets/i18n/zh.json                       |  2 +-
 src/assets/i18n/zh_tw.json                    |  2 +-
 21 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
index c1290665c8..c116ecb564 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
@@ -65,12 +65,12 @@
               {{T.G.MINUTES|translate:{m: 60} }}
             </button>
             <button
-              (click)="snoozeUntilTomorrow(task)"
+              (click)="rescheduleUntilTomorrow(task)"
               [disabled]="isDisableControls"
               mat-menu-item
             >
-              <mat-icon>snooze</mat-icon>
-              {{T.F.TASK.D_REMINDER_VIEW.SNOOZE_UNTIL_TOMORROW|translate}}
+              <mat-icon>schedule</mat-icon>
+              {{T.F.TASK.D_REMINDER_VIEW.RESCHEDULE_UNTIL_TOMORROW|translate}}
             </button>
             <button (click)="dismiss(task)" mat-menu-item>
               <mat-icon>alarm_off</mat-icon>
@@ -142,12 +142,12 @@
       {{T.G.MINUTES|translate:{m: 60} }}
     </button>
     <button
-      (click)="snoozeAllUntilTomorrow()"
+      (click)="rescheduleAllUntilTomorrow()"
       [disabled]="isDisableControls"
       mat-menu-item
     >
-      <mat-icon>snooze</mat-icon>
-      {{T.F.TASK.D_REMINDER_VIEW.SNOOZE_UNTIL_TOMORROW|translate}}
+      <mat-icon>schedule</mat-icon>
+      {{T.F.TASK.D_REMINDER_VIEW.RESCHEDULE_UNTIL_TOMORROW|translate}}
     </button>
     <button (click)="editReminder(tasks[0], true)" *ngIf="!isMultiple" mat-menu-item>
       <mat-icon>edit</mat-icon>
diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
index 6fe5220a6a..ef83c43e8d 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
@@ -106,6 +106,7 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
   dismiss(task: TaskWithReminderData) {
     this._taskService.update(task.id, {
       reminderId: null,
+      plannedAt: null,
     });
     this._reminderService.removeReminder(task.reminderData.id);
     this._removeFromList(task.reminderId as string);
@@ -119,10 +120,14 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
     this._removeFromList(task.reminderId as string);
   }
 
-  snoozeUntilTomorrow(task: TaskWithReminderData) {
+  rescheduleUntilTomorrow(task: TaskWithReminderData) {
+    const remindTime = getTomorrow().getTime();
     this._reminderService.updateReminder(task.reminderData.id, {
       remindAt: getTomorrow().getTime(),
     });
+    this._taskService.update(task.id, {
+      plannedAt: remindTime,
+    });
     this._removeFromList(task.reminderId as string);
   }
 
@@ -160,15 +165,14 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
     this._close();
   }
 
-  snoozeAllUntilTomorrow() {
+  rescheduleAllUntilTomorrow() {
     this.isDisableControls = true;
-    const tomorrow = getTomorrow().getTime();
-    this.reminders$.getValue().forEach((reminder) => {
-      this._reminderService.updateReminder(reminder.id, {
-        remindAt: tomorrow,
-      });
-    });
-    this._close();
+    this._subs.add(
+      this.tasks$.subscribe((tasks) => {
+        tasks.forEach((t) => this.rescheduleUntilTomorrow(t));
+        this._close();
+      }),
+    );
   }
 
   async addAllToToday() {
diff --git a/src/app/features/tasks/store/task-related-model.effects.ts b/src/app/features/tasks/store/task-related-model.effects.ts
index e0eb855dd2..8677905731 100644
--- a/src/app/features/tasks/store/task-related-model.effects.ts
+++ b/src/app/features/tasks/store/task-related-model.effects.ts
@@ -299,6 +299,7 @@ export class TaskRelatedModelEffects {
         ...task,
         reminderId: null,
         isDone: true,
+        plannedAt: null,
       })),
       currentArchive,
     );
diff --git a/src/app/features/tasks/store/task-reminder.effects.ts b/src/app/features/tasks/store/task-reminder.effects.ts
index 90a68ee4ef..5721b38395 100644
--- a/src/app/features/tasks/store/task-reminder.effects.ts
+++ b/src/app/features/tasks/store/task-reminder.effects.ts
@@ -115,7 +115,7 @@ export class TaskReminderEffects {
       return new UpdateTask({
         task: {
           id,
-          changes: { reminderId: null },
+          changes: { reminderId: null, plannedAt: null },
         },
       });
     }),
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index c532d50240..a976bf8d22 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -705,14 +705,14 @@ const T = {
         DATETIME_FOR: 'F.TASK.D_REMINDER_ADD.DATETIME_FOR',
         EDIT: 'F.TASK.D_REMINDER_ADD.EDIT',
         MOVE_TO_BACKLOG: 'F.TASK.D_REMINDER_ADD.MOVE_TO_BACKLOG',
-        SCHEDULE: 'F.TASK.D_REMINDER_ADD.SCHEDULE',
-        UNSCHEDULE: 'F.TASK.D_REMINDER_ADD.UNSCHEDULE',
-        RO_START: 'F.TASK.D_REMINDER_ADD.RO_START',
-        RO_5M: 'F.TASK.D_REMINDER_ADD.RO_5M',
         RO_10M: 'F.TASK.D_REMINDER_ADD.RO_10M',
         RO_15M: 'F.TASK.D_REMINDER_ADD.RO_15M',
-        RO_30M: 'F.TASK.D_REMINDER_ADD.RO_30M',
         RO_1H: 'F.TASK.D_REMINDER_ADD.RO_1H',
+        RO_30M: 'F.TASK.D_REMINDER_ADD.RO_30M',
+        RO_5M: 'F.TASK.D_REMINDER_ADD.RO_5M',
+        RO_START: 'F.TASK.D_REMINDER_ADD.RO_START',
+        SCHEDULE: 'F.TASK.D_REMINDER_ADD.SCHEDULE',
+        UNSCHEDULE: 'F.TASK.D_REMINDER_ADD.UNSCHEDULE',
       },
       D_REMINDER_VIEW: {
         ADD_ALL_TO_TODAY: 'F.TASK.D_REMINDER_VIEW.ADD_ALL_TO_TODAY',
@@ -727,7 +727,7 @@ const T = {
         FROM_TAG: 'F.TASK.D_REMINDER_VIEW.FROM_TAG',
         SNOOZE: 'F.TASK.D_REMINDER_VIEW.SNOOZE',
         SNOOZE_ALL: 'F.TASK.D_REMINDER_VIEW.SNOOZE_ALL',
-        SNOOZE_UNTIL_TOMORROW: 'F.TASK.D_REMINDER_VIEW.SNOOZE_UNTIL_TOMORROW',
+        RESCHEDULE_UNTIL_TOMORROW: 'F.TASK.D_REMINDER_VIEW.RESCHEDULE_UNTIL_TOMORROW',
         START: 'F.TASK.D_REMINDER_VIEW.START',
         SWITCH_CONTEXT_START: 'F.TASK.D_REMINDER_VIEW.SWITCH_CONTEXT_START',
       },
@@ -797,16 +797,16 @@ const T = {
       },
     },
     TIMELINE: {
-      MENU_TITLE: 'F.TIMELINE.MENU_TITLE',
-      NO_TASKS: 'F.TIMELINE.NO_TASKS',
-      NOW: 'F.TIMELINE.NOW',
-      D_INITIAL: {
-        TITLE: 'F.TIMELINE.D_INITIAL.TITLE',
-        TEXT: 'F.TIMELINE.D_INITIAL.TEXT',
-      },
-      START: 'F.TIMELINE.START',
       CONTINUED: 'F.TIMELINE.CONTINUED',
+      D_INITIAL: {
+        TEXT: 'F.TIMELINE.D_INITIAL.TEXT',
+        TITLE: 'F.TIMELINE.D_INITIAL.TITLE',
+      },
       END: 'F.TIMELINE.END',
+      MENU_TITLE: 'F.TIMELINE.MENU_TITLE',
+      NOW: 'F.TIMELINE.NOW',
+      NO_TASKS: 'F.TIMELINE.NO_TASKS',
+      START: 'F.TIMELINE.START',
     },
     TIME_TRACKING: {
       B: {
@@ -973,6 +973,7 @@ const T = {
       SYSTEM_SHORTCUTS: 'GCF.KEYBOARD.SYSTEM_SHORTCUTS',
       TASK_ADD_SUB_TASK: 'GCF.KEYBOARD.TASK_ADD_SUB_TASK',
       TASK_DELETE: 'GCF.KEYBOARD.TASK_DELETE',
+      TASK_EDIT_TAGS: 'GCF.KEYBOARD.TASK_EDIT_TAGS',
       TASK_EDIT_TITLE: 'GCF.KEYBOARD.TASK_EDIT_TITLE',
       TASK_MOVE_TO_PROJECT: 'GCF.KEYBOARD.TASK_MOVE_TO_PROJECT',
       TASK_OPEN_CONTEXT_MENU: 'GCF.KEYBOARD.TASK_OPEN_CONTEXT_MENU',
@@ -986,7 +987,6 @@ const T = {
       TOGGLE_BACKLOG: 'GCF.KEYBOARD.TOGGLE_BACKLOG',
       TOGGLE_BOOKMARKS: 'GCF.KEYBOARD.TOGGLE_BOOKMARKS',
       TOGGLE_PLAY: 'GCF.KEYBOARD.TOGGLE_PLAY',
-      TASK_EDIT_TAGS: 'GCF.KEYBOARD.TASK_EDIT_TAGS',
       TOGGLE_SIDE_NAV: 'GCF.KEYBOARD.TOGGLE_SIDE_NAV',
       ZOOM_DEFAULT: 'GCF.KEYBOARD.ZOOM_DEFAULT',
       ZOOM_IN: 'GCF.KEYBOARD.ZOOM_IN',
diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
index 36496ad245..5b6cb214f5 100644
--- a/src/assets/i18n/ar.json
+++ b/src/assets/i18n/ar.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "من العلامة: \"{{title}}\"",
         "SNOOZE": "قيلولة بعد الظهر",
         "SNOOZE_ALL": "تأجيل الكل",
-        "SNOOZE_UNTIL_TOMORROW": "حتى الغد",
+        "RESCHEDULE_UNTIL_TOMORROW": "حتى الغد",
         "START": "بدء المهمة",
         "SWITCH_CONTEXT_START": "تبديل السياق والبدء"
       },
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index f08da88317..116b504d43 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Vom Tag: \"{{title}}\"",
         "SNOOZE": "Snooze",
         "SNOOZE_ALL": "Schlummer alle",
-        "SNOOZE_UNTIL_TOMORROW": "Bis morgen",
+        "RESCHEDULE_UNTIL_TOMORROW": "Bis morgen",
         "START": "Task starten",
         "SWITCH_CONTEXT_START": "Kontext wechseln & starten"
       },
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 335b1d0a4b..9ca9e7d729 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "From Tag: \"{{title}}\"",
         "SNOOZE": "Snooze",
         "SNOOZE_ALL": "Snooze all",
-        "SNOOZE_UNTIL_TOMORROW": "Until tomorrow",
+        "RESCHEDULE_UNTIL_TOMORROW": "Re-schedule for tomorrow",
         "START": "Start",
         "SWITCH_CONTEXT_START": "Switch Context & Start"
       },
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index 2762ddeed2..ec1b21ef26 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "De la etiqueta: \"{{title}}\"",
         "SNOOZE": "Posponer",
         "SNOOZE_ALL": "Posponer todo",
-        "SNOOZE_UNTIL_TOMORROW": "Hasta mañana",
+        "RESCHEDULE_UNTIL_TOMORROW": "Hasta mañana",
         "START": "Iniciar tarea",
         "SWITCH_CONTEXT_START": "Cambiar contexto e inicio"
       },
diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
index b51f6c7ea6..fa00f8af84 100644
--- a/src/assets/i18n/fa.json
+++ b/src/assets/i18n/fa.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "از برچسب: \"{{title}}\"",
         "SNOOZE": "Snooze",
         "SNOOZE_ALL": "تعویق همه",
-        "SNOOZE_UNTIL_TOMORROW": "تا فردا",
+        "RESCHEDULE_UNTIL_TOMORROW": "تا فردا",
         "START": "Start Task",
         "SWITCH_CONTEXT_START": "تغییر متن و شروع"
       },
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index 0b4f65cd72..815772b6b0 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "De la balise: \"{{title}}\"",
         "SNOOZE": "Snooze",
         "SNOOZE_ALL": "Répéter tout",
-        "SNOOZE_UNTIL_TOMORROW": "Jusqu'à demain",
+        "RESCHEDULE_UNTIL_TOMORROW": "Jusqu'à demain",
         "START": "Démarrer la tâche",
         "SWITCH_CONTEXT_START": "Changer de contexte et démarrer"
       },
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index ff3b6c8a8b..7634a90684 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Da etichetta: \"{{title}}\"",
         "SNOOZE": "Silenzia",
         "SNOOZE_ALL": "Posticipa tutto",
-        "SNOOZE_UNTIL_TOMORROW": "Fino a domani",
+        "RESCHEDULE_UNTIL_TOMORROW": "Fino a domani",
         "START": "Inizia task",
         "SWITCH_CONTEXT_START": "Cambia progetto & inizia task"
       },
diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json
index ea6ae0c7fb..32730b1779 100644
--- a/src/assets/i18n/ja.json
+++ b/src/assets/i18n/ja.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "タグから：「{{title}}」",
         "SNOOZE": "スヌーズ",
         "SNOOZE_ALL": "すべてスヌーズ",
-        "SNOOZE_UNTIL_TOMORROW": "明日まで",
+        "RESCHEDULE_UNTIL_TOMORROW": "明日まで",
         "START": "開始タスク",
         "SWITCH_CONTEXT_START": "コンテキストの切り替えと開始"
       },
diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json
index 8d4fc5a9c4..8d3f5feffd 100644
--- a/src/assets/i18n/ko.json
+++ b/src/assets/i18n/ko.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "태그에서 : \"{{title}}\"",
         "SNOOZE": "다시 알림",
         "SNOOZE_ALL": "모두 다시 알림",
-        "SNOOZE_UNTIL_TOMORROW": "내일까지",
+        "RESCHEDULE_UNTIL_TOMORROW": "내일까지",
         "START": "작업 시작",
         "SWITCH_CONTEXT_START": "상황 전환 및 시작"
       },
diff --git a/src/assets/i18n/nb.json b/src/assets/i18n/nb.json
index 65f99c3a5e..0ffb9f1e6b 100644
--- a/src/assets/i18n/nb.json
+++ b/src/assets/i18n/nb.json
@@ -681,7 +681,7 @@
         "FROM_TAG": "Fra tag: \"{{title}}\"",
         "SNOOZE": "Slumre",
         "SNOOZE_ALL": "Utsett alle",
-        "SNOOZE_UNTIL_TOMORROW": "Til i morgen",
+        "RESCHEDULE_UNTIL_TOMORROW": "Til i morgen",
         "START": "Start",
         "SWITCH_CONTEXT_START": "Bytt kontekst og start"
       },
diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json
index 7cb4406ff7..5ef3cee745 100644
--- a/src/assets/i18n/nl.json
+++ b/src/assets/i18n/nl.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Van tag: \"{{title}}\"",
         "SNOOZE": "Snooze",
         "SNOOZE_ALL": "Snooze All",
-        "SNOOZE_UNTIL_TOMORROW": "Tot morgen",
+        "RESCHEDULE_UNTIL_TOMORROW": "Tot morgen",
         "START": "Begin",
         "SWITCH_CONTEXT_START": "Wissel van context en start"
       },
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index 37253d67ed..f40e210739 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Da tag: \"{{title}}\"",
         "SNOOZE": "Soneca",
         "SNOOZE_ALL": "Suspender tudo",
-        "SNOOZE_UNTIL_TOMORROW": "Até amanhã",
+        "RESCHEDULE_UNTIL_TOMORROW": "Até amanhã",
         "START": "Iniciar tarefa",
         "SWITCH_CONTEXT_START": "Alternar contexto e iniciar"
       },
diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
index 8522b64565..1bf6a0901b 100644
--- a/src/assets/i18n/ru.json
+++ b/src/assets/i18n/ru.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Из тега: \"{{title}}\"",
         "SNOOZE": "Отложить",
         "SNOOZE_ALL": "Отложить все",
-        "SNOOZE_UNTIL_TOMORROW": "До завтра",
+        "RESCHEDULE_UNTIL_TOMORROW": "До завтра",
         "START": "Начать задание",
         "SWITCH_CONTEXT_START": "Переключить контекст и начать"
       },
diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json
index 485b23a1c4..0a7c31179d 100644
--- a/src/assets/i18n/tr.json
+++ b/src/assets/i18n/tr.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "Etiketten: \"{{title}}\"",
         "SNOOZE": "Erteleme",
         "SNOOZE_ALL": "Tümünü ertele",
-        "SNOOZE_UNTIL_TOMORROW": "Yarına kadar",
+        "RESCHEDULE_UNTIL_TOMORROW": "Yarına kadar",
         "START": "Görevi Başlat",
         "SWITCH_CONTEXT_START": "Bağlam Değiştir ve Başlat"
       },
diff --git a/src/assets/i18n/zh.json b/src/assets/i18n/zh.json
index 1f3bc0e1ff..0a6d4d16f6 100644
--- a/src/assets/i18n/zh.json
+++ b/src/assets/i18n/zh.json
@@ -723,7 +723,7 @@
         "FROM_TAG": "来自标签：“{{title}}”",
         "SNOOZE": "暂停",
         "SNOOZE_ALL": "全部暂停",
-        "SNOOZE_UNTIL_TOMORROW": "明天重新开始",
+        "RESCHEDULE_UNTIL_TOMORROW": "明天重新开始",
         "START": "开始任务",
         "SWITCH_CONTEXT_START": "切换内容上下文并开始"
       },
diff --git a/src/assets/i18n/zh_tw.json b/src/assets/i18n/zh_tw.json
index 59bfb55724..75d06d036c 100644
--- a/src/assets/i18n/zh_tw.json
+++ b/src/assets/i18n/zh_tw.json
@@ -667,7 +667,7 @@
         "FROM_TAG": "來自標籤：\"{{title}}\"",
         "SNOOZE": "暫停",
         "SNOOZE_ALL": "全部暫停",
-        "SNOOZE_UNTIL_TOMORROW": "明天重新開始",
+        "RESCHEDULE_UNTIL_TOMORROW": "明天重新開始",
         "START": "開始任務",
         "SWITCH_CONTEXT_START": "切換內容上下文並開始"
       },