From d53ba674e075423da5ddf6f7b1ff1be7a938c2bc Mon Sep 17 00:00:00 2001
From: Nathan Bockisch <nbockisc@nrao.edu>
Date: Wed, 5 Apr 2023 08:55:25 -0600
Subject: [PATCH] WS-1515: Add color indicator for when staff are assigned or
not
---
.../active-capability-requests.component.html | 25 ++++++++++---------
.../active-capability-requests.component.scss | 12 ++++++---
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
index 1df166a99..d092e9b36 100644
--- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
+++ b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
@@ -193,18 +193,18 @@
>
Processing has not started
</td>
- <td>
+ <td
+ [ngClass]="{
+ 'staff-assigned' : request.assigned_da,
+ 'staff-unassigned' : !request.assigned_da
+ }"
+ >
<span *ngIf="qaStaff.DA">
Assigned DA:
<div ngbDropdown #daDrop="ngbDropdown" (openChange)="pausePolling($event)">
<form>
<mat-form-field>
- <mat-label
- [ngClass]="{
- 'staff-assigned' : request.assigned_da,
- 'staff-unassigned' : !request.assigned_da
- }"
- >
+ <mat-label>
{{ request.assigned_da ? request.assigned_da : "Assign DA" }}
</mat-label>
<input type="text"
@@ -240,17 +240,18 @@
</div>
</span>
</td>
- <td>
+ <td
+ [ngClass]="{
+ 'staff-assigned' : request.assigned_aod,
+ 'staff-unassigned' : !request.assigned_aod
+ }"
+ >
<span *ngIf="qaStaff.AOD">
Assigned AOD:
<div ngbDropdown #aodDrop="ngbDropdown" (openChange)="pausePolling($event)">
<form>
<mat-form-field>
<mat-label
- [ngClass]="{
- 'staff-assigned' : request.assigned_aod,
- 'staff-unassigned' : !request.assigned_aod
- }"
>
{{ request.assigned_aod ? request.assigned_aod : "Assign AOD" }}
</mat-label>
diff --git a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.scss b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.scss
index 20f799f9d..7404b88e3 100644
--- a/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.scss
+++ b/apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.scss
@@ -1,10 +1,16 @@
.staff-assigned {
- color: black;
- opacity: 1 !important;
+ mat-label {
+ color: black;
+ opacity: 1 !important;
+ }
}
.staff-unassigned {
- opacity: 1 !important;
+ background-color: #bfbfbf;
+
+ mat-label {
+ opacity: 1 !important;
+ }
}
mat-option:last-child:before {
--
GitLab