Merge pull request #223 from severinbeauvais/master

PRC-644: display user-friendly app status on search page + moved appStatus out of features code
bcgov · Sep 12, 2018 · d51e0e2 · d51e0e2
2 parents 3306018 + 406f755
commit d51e0e2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 42 deletions.
diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html
@@ -50,7 +50,7 @@ <h2 *ngIf="ranSearch && !searching && count > 0">
             {{item.properties.TENURE_PURPOSE | titlecase}} / {{item.properties.TENURE_SUBPURPOSE | titlecase}}
           </td>
           <td>
-            {{item.properties.TENURE_STATUS | titlecase}}
+            {{item.app?.appStatus || (item.properties.TENURE_STATUS | titlecase) || 'Unknown'}}
           </td>
           <td class="actions">
             <button class="btn btn-sm btn-primary" type="button" 

diff --git a/src/app/services/application.service.ts b/src/app/services/application.service.ts
@@ -101,61 +101,53 @@ export class ApplicationService {
 
         const now = new Date();
         const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+        const promises: Array<Promise<any>> = [];
 
-        // replace \\n (JSON format) with newlines in each application
-        applications.forEach((application, i) => {
-          if (applications[i].description) {
-            applications[i].description = applications[i].description.replace(/\\n/g, '\n');
+        applications.forEach((application) => {
+          // replace \\n (JSON format) with newlines in each application
+          if (application.description) {
+            application.description = application.description.replace(/\\n/g, '\n');
           }
-          if (applications[i].legalDescription) {
-            applications[i].legalDescription = applications[i].legalDescription.replace(/\\n/g, '\n');
+          if (application.legalDescription) {
+            application.legalDescription = application.legalDescription.replace(/\\n/g, '\n');
           }
-        });
 
-        const promises: Array<Promise<any>> = [];
+          // user-friendly application status
+          application['appStatus'] = this.getStatusString(this.getStatusCode(application.status));
 
-        // FUTURE: get the organization here
+          // FUTURE: now get the organization
 
-        // now get the current comment period for each application
-        applications.forEach((application, i) => {
-          promises.push(this.commentPeriodService.getAllByApplicationId(applications[i]._id)
+          // NB: we don't get documents here
+
+          // now get the current comment period for each application
+          promises.push(this.commentPeriodService.getAllByApplicationId(application._id)
             .toPromise()
             .then(periods => {
               const cp = this.commentPeriodService.getCurrent(periods);
-              applications[i].currentPeriod = cp;
-              // derive comment period status for display
-              applications[i]['cpStatus'] = this.commentPeriodService.getStatus(cp);
+              application.currentPeriod = cp;
+              // user-friendly comment period status
+              application['cpStatus'] = this.commentPeriodService.getStatus(cp);
               // derive days remaining for display
               // use moment to handle Daylight Saving Time changes
               if (cp && this.commentPeriodService.isOpen(cp)) {
-                applications[i].currentPeriod['daysRemaining'] = moment(cp.endDate).diff(moment(today), 'days') + 1; // including today
+                application.currentPeriod['daysRemaining'] = moment(cp.endDate).diff(moment(today), 'days') + 1; // including today
               }
             })
           );
-        });
 
-        // now get the number of pending comments for each application
-        applications.forEach((application, i) => {
-          promises.push(this.commentService.getAllByApplicationId(applications[i]._id)
+          // now get the number of pending comments for each application
+          promises.push(this.commentService.getAllByApplicationId(application._id)
             .toPromise()
             .then(comments => {
               const pending = comments.filter(comment => this.commentService.isPending(comment));
-              applications[i]['numComments'] = pending.length.toString();
+              application['numComments'] = pending.length.toString();
             })
           );
-        });
 
-        // NOT NEEDED AT THIS TIME
-        // // now get the decision for each application
-        // applications.forEach((application, i) => {
-        //   promises.push(this.decisionService.getByApplicationId(applications[i]._id)
-        //     .toPromise()
-        //     .then(decision => applications[i].decision = decision)
-        //   );
-        // });
+          // NB: we don't get the decision here
 
-        // now get the referenced data (features) for each application
-        applications.forEach((application, i) => {
+          // TODO: we don't need to get the shapes (features) here... remove this code
+          // now get the referenced data (features) for each application
           promises.push(this.featureService.getByApplicationId(application._id)
             .toPromise()
             .then(features => {
@@ -168,9 +160,6 @@ export class ApplicationService {
                   application.areaHectares += f['properties'].TENURE_AREA_IN_HECTARES;
                 }
               });
-
-              // derive application status for display
-              application['appStatus'] = this.getStatusString(application.status);
             })
           );
         });
@@ -238,6 +227,7 @@ export class ApplicationService {
 
     const now = new Date();
     const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const promises: Array<Promise<any>> = [];
 
     // replace \\n (JSON format) with newlines
     if (application.description) {
@@ -247,9 +237,10 @@ export class ApplicationService {
       application.legalDescription = application.legalDescription.replace(/\\n/g, '\n');
     }
 
-    const promises: Array<Promise<any>> = [];
+    // user-friendly application status
+    application['appStatus'] = this.getStatusString(this.getStatusCode(application.status));
 
-    // FUTURE: get the organization here
+    // FUTURE: now get the organization
 
     // get the documents
     promises.push(this.documentService.getAllByApplicationId(application._id)
@@ -263,7 +254,7 @@ export class ApplicationService {
       .then(periods => {
         const cp = this.commentPeriodService.getCurrent(periods);
         application.currentPeriod = cp;
-        // derive comment period status for display
+        // user-friendly comment period status
         application['cpStatus'] = this.commentPeriodService.getStatus(cp);
         // derive days remaining for display
         // use moment to handle Daylight Saving Time changes
@@ -300,9 +291,6 @@ export class ApplicationService {
             application.areaHectares += f['properties'].TENURE_AREA_IN_HECTARES;
           }
         });
-
-        // derive application status for display
-        application['appStatus'] = this.getStatusString(application.status);
       })
     );