Skip to content

Commit

Permalink
ADJST-536 Fixing display of unused deductions. (#736)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ldlharper
ldlharper committed Jun 14, 2024
1 parent 527c971 commit 09df8bf
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 54 deletions.
2 changes: 2 additions & 0 deletions server/routes/checkInformationRoutes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,8 @@ describe('Check information routes tests', () => {
.expect(200)
.expect('Content-Type', /html/)
.expect(res => {
const $ = cheerio.load(res.text)
expect($('[data-qa=unused-deductions-total-days]').text()).toContain('2')
expect(res.text).toContain('Unused deductions')
expect(res.text).not.toContain('Unused remand')
})
Expand Down
69 changes: 41 additions & 28 deletions server/views/pages/partials/checkInformation/adjustmentDetails.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,38 +182,51 @@
{% endif %}
{% if adjustments.unusedRemand.aggregate != 0 %}
<h4 class="govuk-heading-s govuk-!-margin-bottom-2">Unused {% if user and user.hasAdjustmentsAccess %}deductions{% else %}remand{% endif %}</h4>
<table class="govuk-table govuk-!-margin-bottom-8">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header" scope="col">Dates</th>
<th class="govuk-table__header" scope="col">Days</th>
</tr>
</thead>
<tbody class="govuk-table__body">
{% for adjustment in adjustments.unusedRemand.details %}
{% if user and user.hasAdjustmentsAccess and adjustments.unusedRemand.details.length == 1 %}
<dl class="govuk-summary-list">
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key column-width-eighty-percent govuk-!-text-align-right">
Total days
</dt>
<dd data-qa="unused-deductions-total-days" class="govuk-summary-list__value">
{{adjustments.unusedRemand.aggregate}}
</dd>
</div>
</dl>
{% else %}
<table class="govuk-table govuk-!-margin-bottom-8">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header" scope="col">Dates</th>
<th class="govuk-table__header" scope="col">Days</th>
</tr>
</thead>
<tbody class="govuk-table__body">
{% for adjustment in adjustments.unusedRemand.details %}
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell">
{% if adjustment.from or adjustment.to %}
From {{ adjustment.from | date('DD MMMM YYYY') }} to {{ adjustment.to | date('DD MMMM YYYY') }}
{% endif %}
{% if adjustment.analysisResult?? and adjustment.analysisResult === 'NEW' %}
({{ adjustment.analysisResult.toLowerCase() }})
{% endif %}</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustment.days}}</td>
</tr>
{% endfor %}
<!-- Total -->
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell">
{% if adjustment.from or adjustment.to %}
From {{ adjustment.from | date('DD MMMM YYYY') }} to {{ adjustment.to | date('DD MMMM YYYY') }}
{% endif %}
{% if adjustment.analysisResult?? and adjustment.analysisResult === 'NEW' %}
({{ adjustment.analysisResult.toLowerCase() }})
{% endif %}</td>
<td class="govuk-table__cell govuk-!-font-weight-bold govuk-!-text-align-right">Total days</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustment.days}}</td>
<td class="govuk-table__cell">{{adjustments.unusedRemand.aggregate}}
</td>
</tr>
{% endfor %}
<!-- Total -->
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell govuk-!-font-weight-bold govuk-!-text-align-right">Total days</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustments.unusedRemand.aggregate}}
</td>
</tr>
</tbody>
</table>
</tbody>
</table>
{% endif %}
{% endif %}
{% endif %}
{% if adjustments.hasAnyAdditionAdjustments() %}
Expand Down
65 changes: 39 additions & 26 deletions server/views/pages/partials/genuineOverrides/adjustmentDetails.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,36 +163,49 @@
{% endif %}
{% if adjustments.unusedRemand.aggregate != 0 %}
<h4 class="govuk-heading-s govuk-!-margin-bottom-2">Unused {% if user and user.hasAdjustmentsAccess %}deductions{% else %}remand{% endif %}</h4>
<table class="govuk-table govuk-!-margin-bottom-8">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header" scope="col">Dates</th>
<th class="govuk-table__header" scope="col">Days</th>
</tr>
</thead>
<tbody class="govuk-table__body">
{% for adjustment in adjustments.unusedRemand.details %}
{% if user and user.hasAdjustmentsAccess and adjustments.unusedRemand.details.length == 1 %}
<dl class="govuk-summary-list">
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key column-width-eighty-percent govuk-!-text-align-right">
Total days
</dt>
<dd data-qa="unused-deductions-total-days" class="govuk-summary-list__value">
{{adjustments.unusedRemand.aggregate}}
</dd>
</div>
</dl>
{% else %}
<table class="govuk-table govuk-!-margin-bottom-8">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header" scope="col">Dates</th>
<th class="govuk-table__header" scope="col">Days</th>
</tr>
</thead>
<tbody class="govuk-table__body">
{% for adjustment in adjustments.unusedRemand.details %}
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell">
{% if adjustment.from or adjustment.to %}
From {{ adjustment.from | date('DD MMMM YYYY') }} to {{ adjustment.to | date('DD MMMM YYYY') }}
{% endif %}
</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustment.days}}</td>
</tr>
{% endfor %}
<!-- Total -->
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell">
{% if adjustment.from or adjustment.to %}
From {{ adjustment.from | date('DD MMMM YYYY') }} to {{ adjustment.to | date('DD MMMM YYYY') }}
{% endif %}
</td>
<td class="govuk-table__cell govuk-!-font-weight-bold govuk-!-text-align-right">Total days</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustment.days}}</td>
<td class="govuk-table__cell">{{adjustments.unusedRemand.aggregate}}
</td>
</tr>
{% endfor %}
<!-- Total -->
<tr class="govuk-table__row">
<!-- Dates -->
<td class="govuk-table__cell govuk-!-font-weight-bold govuk-!-text-align-right">Total days</td>
<!-- Days -->
<td class="govuk-table__cell">{{adjustments.unusedRemand.aggregate}}
</td>
</tr>
</tbody>
</table>
</tbody>
</table>
{% endif %}
{% endif %}
{% endif %}
{% if adjustments.hasAnyAdditionAdjustments() %}
Expand Down

0 comments on commit 09df8bf

Please sign in to comment.