fix(checklist): fixed biweekly reset

Supamiu · Sep 20, 2023 · 8a7d4e7 · 8a7d4e7
1 parent 9c6c03e
commit 8a7d4e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/apps/client/src/app/core/is-task-done.ts b/apps/client/src/app/core/is-task-done.ts
@@ -6,7 +6,7 @@ import { getCompletionEntry } from "./get-completion-entry-key";
 import { TaskFrequency } from "../model/task-frequency";
 import { TaskScope } from "../model/task-scope";
 
-export function isTaskDone(task: LostarkTask, character: Character, completion: Completion, dailyReset: number, weeklyReset: number, lazyTracking: Record<string, boolean>): number {
+export function isTaskDone(task: LostarkTask, character: Character, completion: Completion, dailyReset: number, weeklyReset: number, biWeeklyReset: number, lazyTracking: Record<string, boolean>): number {
   if (character.lazy && task.scope !== TaskScope.ROSTER) {
     const lazyTrackingFlag = lazyTracking && lazyTracking[`${character.name}:${task.$key}`];
     if (lazyTrackingFlag === undefined || lazyTrackingFlag) {
@@ -15,7 +15,11 @@ export function isTaskDone(task: LostarkTask, character: Character, completion:
   }
 
   const completionFlag = getCompletionEntry(completion.data, character, task);
-  const reset = task.frequency === TaskFrequency.DAILY ? dailyReset : weeklyReset;
+  const reset = {
+    [TaskFrequency.DAILY]: dailyReset,
+    [TaskFrequency.WEEKLY]: weeklyReset,
+    [TaskFrequency.BIWEEKLY]: biWeeklyReset
+  }[task.frequency];
 
   if (!completionFlag) {
     return 0;

diff --git a/apps/client/src/app/pages/checklist/checklist/checklist.component.ts b/apps/client/src/app/pages/checklist/checklist/checklist.component.ts
@@ -133,6 +133,7 @@ export class ChecklistComponent {
                 completion,
                 dailyReset,
                 weeklyReset,
+                biWeeklyReset,
                 lazyTracking
               ), task.amount),
               tracked: getCompletionEntry(roster.trackedTasks, character, task, true) !== false,

diff --git a/apps/client/src/app/pages/party-planner/party-planner/party-planner.component.ts b/apps/client/src/app/pages/party-planner/party-planner/party-planner.component.ts
@@ -76,9 +76,10 @@ export class PartyPlannerComponent {
     this.completionService.completion$,
     this.timeService.lastDailyReset$,
     this.timeService.lastWeeklyReset$,
+    this.timeService.lastBiWeeklyReset$,
     this.settings.settings$.pipe(pluck("lazytracking"))
   ]).pipe(
-    switchMap(([tasks, roster, completion, dailyReset, weeklyReset, lazyTracking]) => {
+    switchMap(([tasks, roster, completion, dailyReset, weeklyReset, biWeeklyReset, lazyTracking]) => {
       return this.friendIdsToConsider$.pipe(
         switchMap(friendIds => {
           if (friendIds.length === 0) {
@@ -145,7 +146,7 @@ export class PartyPlannerComponent {
                 task,
                 data: roster.characters
                   .map(character => {
-                    const done = isTaskDone(task, character, completion, dailyReset, weeklyReset, lazyTracking);
+                    const done = isTaskDone(task, character, completion, dailyReset, weeklyReset, biWeeklyReset, lazyTracking);
                     const canDo = character.ilvl >= (task.minIlvl || 0) && character.ilvl < (task.maxIlvl || Infinity);
                     if (done === -1 || done >= task.amount || !canDo) {
                       return {
@@ -170,7 +171,7 @@ export class PartyPlannerComponent {
                               characters: (friendRoster.characters || [])
                                 .filter(c => !c.isPrivate)
                                 .filter(fChar => {
-                                  const fDone = isTaskDone(friendTask, fChar, friendCompletion, dailyReset, weeklyReset, {});
+                                  const fDone = isTaskDone(friendTask, fChar, friendCompletion, dailyReset, weeklyReset, biWeeklyReset, {});
                                   return fDone >= 0
                                     && fDone < task.amount
                                     && fChar.ilvl >= (task.minIlvl || 0)
@@ -179,7 +180,7 @@ export class PartyPlannerComponent {
                                 .map(c => {
                                   return {
                                     doable: Math.min(
-                                      task.amount - isTaskDone(friendTask, c, friendCompletion, dailyReset, weeklyReset, {}),
+                                      task.amount - isTaskDone(friendTask, c, friendCompletion, dailyReset, weeklyReset, biWeeklyReset, {}),
                                       task.amount - done
                                     ),
                                     c