Merge pull request #718 from bcgov/feature/ALCS-915

Noi Tracking Fixes
bcgov · Jun 22, 2023 · 1291ddd · 1291ddd
2 parents f60143c + 73b8502
commit 1291ddd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.html b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.html
@@ -23,7 +23,7 @@
     <mat-icon class="icon">pause</mat-icon>
     {{ pausedDays }}
   </div>
-  <div *ngIf="dueDate && !paused">
+  <div *ngIf="dueDate && activeDays !== null">
     <span *ngIf="!isOverdue">Due: {{ dueDate | momentFormat }}</span>
     <span class="red-text" *ngIf="isOverdue">Overdue</span>
   </div>

diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts
@@ -36,7 +36,10 @@ export class TimeTrackerComponent implements OnChanges {
     }
 
     if (this.maxActiveDays) {
-      this.dueDate = moment().subtract(this.activeDays, 'days').add(this.maxActiveDays, 'days').toDate();
+      this.dueDate = moment()
+        .subtract(this.activeDays, 'days')
+        .add(this.maxActiveDays - 1, 'days')
+        .toDate();
 
       if (this.dueDate && this.dueDate.getTime() < Date.now()) {
         this.isOverdue = true;