Skip to content

MAN-280: Put disabilties and adjustment on new lines #284

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

Merged
merged 2 commits into from
Jan 24, 2025
Merged

MAN-280: Put disabilties and adjustment on new lines #284

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
fc6436e
MAN-280: Put disabilties and adjustment on new lines
pmcphee77 Jan 24, 2025
77cc470
MAN-280: Put disabilties and adjustment on new lines
pmcphee77 Jan 24, 2025
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
4 changes: 2 additions & 2 deletions integration_tests/e2e/overview.cy.ts
View file
Open in desktop
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
View file
Open in desktop
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
Loading