Merge pull request #373 from sancsoft/352-gray-out-text-on-psrs-for-c…

…urrent-week Graying PSR Row
sancsoft · Sep 6, 2024 · e8a381b · e8a381b
2 parents 92a75cf + 54f1583
commit e8a381b
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/angular/hq/src/app/psr/psrlist/psrlist.component.html b/src/angular/hq/src/app/psr/psrlist/psrlist.component.html
@@ -150,12 +150,15 @@ <h1 class="text-center py-4 font-bold">No matching records found</h1>
     }
     @for ((report of projectStatusReports$ | async); track report.id) {
       <tr
-        [class]="
-          (!report.submittedAt || report.thisPendingHours > 0) &&
-          !report.isCurrentPsrPeriod
-            ? 'bg-red-850'
-            : 'even:bg-gray-850 odd:bg-black-alt'
-        "
+        [ngClass]="{
+          'bg-red-850':
+            (!report.submittedAt || report.thisPendingHours > 0) &&
+            !report.isCurrentPsrPeriod,
+          'even:bg-gray-850 odd:bg-black-alt':
+            (!report.submittedAt && report.thisPendingHours <= 0) ||
+            report.isCurrentPsrPeriod,
+          'text-gray-50': report.isCurrentPsrPeriod,
+        }"
       >
         <td class="border-b border-black py-2 pl-5">{{ report.chargeCode }}</td>
         <td class="border-b border-black py-2">{{ report.startDate }}</td>
@@ -263,7 +266,10 @@ <h1 class="text-center py-4 font-bold">No matching records found</h1>
         <td width="80" class="border-b border-black py-2 text-right pr-5">
           <a
             [routerLink]="[report.id]"
-            class="truncate text-teal-200 hover:text-teal-300"
+            class="truncate hover:text-teal-300"
+            [class]="
+              report.isCurrentPsrPeriod ? ' text-gray-50' : ' text-teal-200'
+            "
             >VIEW</a
           >
         </td>