Merge pull request #549 from williamrosswhite/williamrosswhite/EMBCDF…

…A-1229--past-applications-show-closed-applications-immediately-not-after-61-days EMBCDFA-1229 - Portal: Past Applications Displaying Closed Applications Immediately, Not After 61 Days
bcgov · Sep 3, 2024 · 9846c38 · 9846c38
2 parents 1cbf28a + 24bb335
commit 9846c38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/dfa/src/UI/embc-dfa/src/app/feature-components/dashboard/dashboard.component.ts b/dfa/src/UI/embc-dfa/src/app/feature-components/dashboard/dashboard.component.ts
@@ -125,18 +125,23 @@ export class DashboardComponent implements OnInit {
   }
 
   countAppData(lstApp: Object): void {
-    var res = JSON.parse(JSON.stringify(lstApp));
-    let lstApplications = res;
-    this.currentApplicationsCount = 0; this.pastApplicationsCount = 0;
+
+    let lstApplications = JSON.parse(JSON.stringify(lstApp)); 
+
+    this.currentApplicationsCount = 0;
+    this.pastApplicationsCount = 0;
+
     lstApplications.forEach(x => {
       if (
         (x.status.toLowerCase() === "dfa decision made"
         || x.status.toLowerCase() === "closed: inactive" || x.status.toLowerCase() === "closed: withdrawn")
         &&
-        (x.dateFileClosed && (this.sixtyOneDaysAgo <= new Date(x.dateFileClosed).getTime()))) {
+        (x.dateFileClosed && (new Date(x.dateFileClosed).getTime() <= this.sixtyOneDaysAgo))) {
           this.pastApplicationsCount++;
-      } else this.currentApplicationsCount++;
-    })
+      } else {
+        this.currentApplicationsCount++;
+      }
+    });
   }
 
   navigateToDFAPrescreening(): void {

diff --git a/...a/src/app/sharedModules/dashboard-components/dfa-application/dfa-application.component.ts b/...a/src/app/sharedModules/dashboard-components/dfa-application/dfa-application.component.ts
@@ -106,14 +106,15 @@ export class DfaApplicationComponent implements OnInit {
   }
 
   mapData(lstApp: Object): void {
-    var res = JSON.parse(JSON.stringify(lstApp));
-    this.lstApplications = res;
+
+    this.lstApplications = JSON.parse(JSON.stringify(lstApp));
+
     this.lstApplications.forEach(x => {
       if (
         (x.status.toLowerCase() === "dfa decision made"
           || x.status.toLowerCase() === "closed: inactive" || x.status.toLowerCase() === "closed: withdrawn")
         &&
-        (x.dateFileClosed && (this.sixtyOneDaysAgo <= new Date(x.dateFileClosed).getTime()))) {
+        (x.dateFileClosed && (new Date(x.dateFileClosed).getTime() <= this.sixtyOneDaysAgo))) {        
           x.currentApplication = false;
       } else x.currentApplication = true;
     })