Merge pull request #692 from Ckoelewyn/EPICSYSTEM-117

EPICSYSTEM-117: Fixed logic for PCP badge when no PCP exists
bcgov · Jul 30, 2024 · e34dedc · e34dedc
2 parents ea8f721 + ed9a356
commit e34dedc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/app/models/commentperiod.ts b/src/app/models/commentperiod.ts
@@ -120,16 +120,19 @@ export class CommentPeriod {
       const dateStarted = moment(obj.dateStarted);
       const dateCompleted = moment(obj.dateCompleted);
 
-      if (moment(now).isBetween(dateStarted, dateCompleted)) {
+      if (moment(now).isBefore(dateStarted)) {
+        this.commentPeriodStatus = 'Pending';
+        this.daysRemaining = 'Pending';
+      } else if (moment(now).isBetween(dateStarted, dateCompleted)) {
         this.commentPeriodStatus = 'Open';
         this.daysRemainingCount = dateCompleted.diff(moment(now), 'days');
         this.daysRemaining = this.daysRemainingCount === 0 ? 'Final Day' : this.daysRemainingCount + (this.daysRemainingCount === 1 ? ' Day ' : ' Days ') + 'Remaining';
       } else if (moment(now).isAfter(dateCompleted)) {
         this.commentPeriodStatus = 'Closed';
         this.daysRemaining = 'Completed';
       } else {
-        this.commentPeriodStatus = 'Pending';
-        this.daysRemaining = 'Pending';
+        this.commentPeriodStatus = 'None';
+        this.daysRemaining = 'None';
       }
     }
 

diff --git a/...ation-documents-table-details/project-notification-documents-table-details.component.html b/...ation-documents-table-details/project-notification-documents-table-details.component.html
@@ -70,9 +70,8 @@ <h4>{{(rowData.name.toUpperCase() || '-')}}</h4>
                 View Pending Comment Period
             </a>
             <a *ngIf="
-                (rowData.commentPeriod?.commentPeriodStatus === 'Pending' &&
-                !rowData.commentPeriod?.isMet) ||
-                !rowData.commentPeriod?.commentPeriodStatus"
+                rowData.commentPeriod?.commentPeriodStatus === 'Pending' &&
+                !rowData.commentPeriod?.isMet"
                 class="btn btn-primary view-pcp-btn"
                 title="View this Public Comment Period"
             >

diff --git a/src/app/shared/utils/constants.ts b/src/app/shared/utils/constants.ts
@@ -42,6 +42,7 @@ export class Constants {
   };
 
   public static readonly PCP_COLLECTION: object[] = [
+    { code: 'none', name: 'None'},
     { code: 'pending', name: 'Pending' },
     { code: 'open', name: 'Open' },
     { code: 'closed', name: 'Closed' }