Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADJUST1-497-DR-Quashed-ADAs #250

Merged
merged 2 commits into from
Mar 21, 2024
Merged

ADJUST1-497-DR-Quashed-ADAs #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cfa261
Updated quashed ADAs screen
Mar 21, 2024
f79d600
Formatting
Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/views/macros/adaTable.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions server/views/pages/adjustments/additional-days/review-and-approve.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'%}
Expand Down Expand Up @@ -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 %}
Expand Down