ADJUST1-497-DR-Quashed-ADAs (#250)

* Updated quashed ADAs screen * Formatting --------- Co-authored-by: Pavilion Sahota <pavilion.sahota@justice.gov.uk>
ministryofjustice · Mar 21, 2024 · c13c145 · c13c145
1 parent 6867654
commit c13c145
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/server/views/macros/adaTable.njk b/server/views/macros/adaTable.njk
@@ -52,7 +52,7 @@ showTotalPerDateCharged: optional,  defaults to false, should the total be shown
                       <div class="status-tag-row">
                       {% if ada.status === 'SUSPENDED' %}
                         <strong class="govuk-tag govuk-tag--red">{{ ada.status | title }}</strong>
-                      {% elif ada.status === 'AWARDED' %}
+                      {% elif ada.status === 'AWARDED' or ada.status === 'PENDING APPROVAL' %}
                         <strong class="govuk-tag govuk-tag--green">{{ ada.status | title }}</strong>
                       {% else %}
                         <strong class="govuk-tag govuk-tag--blue">{{ ada.status | title }}</strong>

diff --git a/server/views/pages/adjustments/additional-days/review-and-approve.njk b/server/views/pages/adjustments/additional-days/review-and-approve.njk
@@ -19,8 +19,8 @@
       <div class="govuk-form-group govuk-body">
         <h1 class="govuk-heading-l">
           <span class="govuk-caption-xl">Adjustments</span>
-              Review and approve ADAs
-            </h1>
+          Review and approve ADAs
+        </h1>
 
         <p>
           {% if adasToReview.intercept.type == 'FIRST_TIME'%}
@@ -64,12 +64,12 @@
           }) }}
 
         {% if adasToReview.quashed | length %}
-          <h2 class="govuk-heading-m">Review and approve quashed ADAs</h2>
+          <h2 class="govuk-heading-m">Quashed ADAs</h2>
           {{ adaTable({
             tableId: 'quashed-approval-adas',
             adas: adasToReview.quashed,
             total: adasToReview.totalQuashed,
-            totalText: 'Total quashed ADAs',
+            totalText: 'Total days',
             mainTitle: 'Once you have reviewed and approved the quashed ADAs, they will not be added to the sentence calculation.'
             }) }}
         {% endif %}