Merge pull request #716 from shruthi-rapala/srapala/dfa-public-3.1

EMCRI# 1014 Portal: On Project Amendment form, don't display values in certain fields until project amendment has been approved or approved with exceptions
bcgov · Jan 3, 2025 · f5a4c87 · f5a4c87
2 parents c528ff5 + 3d74107
commit f5a4c87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...dfa/src/app/feature-components/dfa-project-amendment/dfa-project-amendment.component.html b/...dfa/src/app/feature-components/dfa-project-amendment/dfa-project-amendment.component.html
@@ -145,7 +145,7 @@
                 </mat-form-field>
               </div>
             </div>
-            @if (option.amendmentDecision == DecisionEnum.Approved || option.stage == amendmentDecision.ApprovedWithExclusions) {
+            @if (option.amendmentDecision == DecisionEnum.Approved || option.amendmentDecision == DecisionEnum.ApprovedWithExclusions) {
               <div class="row">
                 <div class="col-md-3">
                   <p style="font-size: 15px">

diff --git a/...c-dfa/src/app/feature-components/dfa-project-amendment/dfa-project-amendment.component.ts b/...c-dfa/src/app/feature-components/dfa-project-amendment/dfa-project-amendment.component.ts
@@ -245,7 +245,6 @@ export class DFAProjectAmendmentComponent
           if (dfaAmendment) {
             var amendmentId = this.projectAmendmentForm.controls.amendmentId.value;
             this.ProjectAmendments = dfaAmendment;
-
             if (dfaAmendment && dfaAmendment.length > 0) {
               var selectedAmendment = dfaAmendment.filter(m => m.amendmentId == amendmentId);
               if (selectedAmendment.length > 0) {
@@ -322,8 +321,8 @@ export class DFAProjectAmendmentComponent
           objStatItem.currentStep = true;
           isFound = true
 
-          if (objAmendment.stage) {
-            objStatItem.stage = objAmendment.stage;
+          if (objAmendment.amendmentDecision) {
+            objStatItem.stage = objAmendment.amendmentDecision;
           }
 
           objAmendment.statusColor = objStatItem.statusColor;