fix:#427 Days Remaining adjustment. (#432)

Adjust daysRemaining.
bcgov · Jul 23, 2023 · f7b743e · f7b743e
1 parent 7b9003d
commit f7b743e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/admin/src/app/foms/fom-detail/fom-detail.component.ts b/admin/src/app/foms/fom-detail/fom-detail.component.ts
@@ -257,8 +257,10 @@ export class FomDetailComponent implements OnInit, OnDestroy {
   }
 
   public canChangeEndDate(): boolean {
-    return this.user.isMinistry && (this.project.workflowState.code == WorkflowStateEnum.Initial
-            || this.project.workflowState.code == WorkflowStateEnum.CommentOpen);
+    return this.user.isMinistry && 
+        (this.project.workflowState.code == WorkflowStateEnum.Initial
+            || this.project.workflowState.code == WorkflowStateEnum.CommentOpen
+        ) && !!this.project.commentingOpenDate;
   }
 
   public canEditFOM(): boolean {
@@ -347,7 +349,8 @@ export class FomDetailComponent implements OnInit, OnDestroy {
   }
 
   private calculateDaysRemaining(){
-    this.daysRemaining =
+    this.daysRemaining = (this.project.workflowState.code === WorkflowStateEnum.Initial) ?
+      moment(this.project.commentingClosedDate).diff(moment(this.project.commentingOpenDate), 'days') :
       moment(this.project.commentingClosedDate).diff(moment(this.today), 'days');
     if(this.daysRemaining < 0){
       this.daysRemaining = 0;