Skip to content

Commit

Permalink
MAN-280: Put disabilties and adjustment on new lines (#284)
Browse files Browse the repository at this point in the history
* MAN-280: Put disabilties and adjustment on new lines

* MAN-280: Put disabilties and adjustment on new lines
  • Loading branch information
pmcphee77 authored Jan 24, 2025
1 parent 2c48858 commit 0e034a6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions integration_tests/e2e/overview.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ context('Overview', () => {
page
.getRowData('personalDetails', 'currentCircumstances', 'Value')
.should('contain.text', 'Committed/ Transferred to Crown: Life imprisonment (Adult)')
page.getRowData('personalDetails', 'disabilities', 'Value').should('contain.text', 'Dyslexia, Arthritis')
page.getRowData('personalDetails', 'adjustments', 'Value').should('contain.text', 'Hand Rails, Special Furniture')
page.getRowData('personalDetails', 'disabilities', 'Value').should('contain.text', 'Dyslexia')
page.getRowData('personalDetails', 'adjustments', 'Value').should('contain.text', 'Special Furniture')
page.getCardHeader('sentence2').should('contain.text', 'ORA Community Order')
page
.getRowData('sentence2', 'mainOffence', 'Value')
Expand Down
18 changes: 14 additions & 4 deletions server/views/pages/overview.njk
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,27 @@
{% endset %}

{% set disabilities %}
{% set commaJoiner = joiner(', ') %}
{% if overview.personalDetails.disabilities.length > 0 %}
{% for adjustment in overview.personalDetails.disabilities %}{{ commaJoiner() }}{{ adjustment.description }}{% endfor %}
<ul class="govuk-list">
{% for adjustment in overview.personalDetails.disabilities %}
<li>
{{ adjustment.description }}
</li>
{% endfor %}
</ul>
{% else %}
No disabilities
{% endif %}
{% endset %}
{% set adjustments %}
{% set commaJoiner = joiner(', ') %}
{% if overview.personalDetails.provisions.length > 0 %}
{% for provisions in overview.personalDetails.provisions %}{{ commaJoiner() }}{{ provisions.description }}{% endfor %}
<ul class="govuk-list">
{% for provisions in overview.personalDetails.provisions %}
<li>
{{ provisions.description }}
</li>
{% endfor %}
</ul>
{% else %}
No adjustments
{% endif %}
Expand Down

0 comments on commit 0e034a6

Please sign in to comment.