Merge pull request #2021 from bcgov/feature/ALCS-1858-status-pills-QA1

ALCS1858 Ui Fixes and Function logic changes
bcgov · Dec 17, 2024 · 2f3a75a · 2f3a75a
2 parents d1c4b82 + 9d8a475
commit 2f3a75a
Show file tree

Hide file tree

Showing 3 changed files with 327 additions and 55 deletions.
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html
@@ -26,34 +26,6 @@ <h3>View Conditions</h3>
           <span *ngIf="!decision.reconsideredBy?.length">N/A</span>
         </div>
       </div>
-      <div class="header">
-        <div class="subheading1 title">
-          <h5>Decision</h5>
-          <div *ngIf="decision.index === decisions.length - 1 && application">
-            <span class="days" matTooltip="Active Days">
-              <mat-icon class="icon">calendar_month</mat-icon>
-              {{ application.activeDays }}
-            </span>
-            <span class="days" matTooltip="Paused Days">
-              <mat-icon class="icon">pause</mat-icon>
-              {{ application.pausedDays }}
-            </span>
-          </div>
-          <ng-container *ngIf="!!decision.reconsiders">
-            <app-application-type-pill [type]="reconLabel"></app-application-type-pill>
-          </ng-container>
-          <ng-container *ngIf="!!decision?.modifies">
-            <app-application-type-pill [type]="modificationLabel"></app-application-type-pill>
-          </ng-container>
-          <span class="body-text">Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}</span>
-          <ng-container *ngIf="decision.isDraft === true"
-            ><app-application-type-pill [type]="dratDecisionLabel"></app-application-type-pill>
-          </ng-container>
-          <ng-container *ngIf="decision?.isDraft === false"
-            ><app-application-type-pill [type]="releasedDecisionLabel"></app-application-type-pill>
-          </ng-container>
-        </div>
-      </div>
       <div class="no-conditions" *ngIf="decision.conditions.length < 1">
         <app-no-data text="No conditions added. Return to decision draft to add conditions."></app-no-data>
       </div>
@@ -77,7 +49,7 @@ <h5>Decision</h5>
       [routerLink]="['../../']"
       [queryParams]="{ uuid: decision.uuid }"
     >
-      back to decision view
+      back to decision #{{ decision.index }}
     </button>
   </div>
 </section>
diff --git a/...-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html b/...-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html
@@ -21,31 +21,6 @@ <h3>View Conditions</h3>
           <span *ngIf="!decision.modifiedBy?.length">N/A</span>
         </div>
       </div>
-      <div class="header">
-        <div class="subheading1 title">
-          <h5>Decision</h5>
-          <div *ngIf="decision.index === decisions.length - 1 && noticeOfIntent">
-            <span class="days" matTooltip="Active Days">
-              <mat-icon class="icon">calendar_month</mat-icon>
-              {{ noticeOfIntent.activeDays }}
-            </span>
-            <span class="days" matTooltip="Paused Days">
-              <mat-icon class="icon">pause</mat-icon>
-              {{ noticeOfIntent.pausedDays }}
-            </span>
-          </div>
-          <ng-container *ngIf="!!decision?.modifies">
-            <app-application-type-pill [type]="modificationLabel"></app-application-type-pill>
-          </ng-container>
-          <span class="body-text">Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}</span>
-          <ng-container *ngIf="decision.isDraft === true"
-            ><app-application-type-pill [type]="dratDecisionLabel"></app-application-type-pill>
-          </ng-container>
-          <ng-container *ngIf="decision?.isDraft === false"
-            ><app-application-type-pill [type]="releasedDecisionLabel"></app-application-type-pill>
-          </ng-container>
-        </div>
-      </div>
       <div class="no-conditions" *ngIf="decision.conditions.length < 1">
         <app-no-data text="No conditions added. Return to decision draft to add conditions."></app-no-data>
       </div>
@@ -69,7 +44,7 @@ <h5>Decision</h5>
       [routerLink]="['../../']"
       [queryParams]="{ uuid: decision.uuid }"
     >
-      back to decision view
+      back to decision #{{ decision.index }}
     </button>
   </div>
 </section>