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-86 Add total row to adjustment details table #22

Merged
merged 2 commits into from
Jul 19, 2023
Merged

ADJUST1-86 Add total row to adjustment details table #22

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
d486a57
ADJUST1-86 Add total row to adjustment details table
yasinmustafa Jul 18, 2023
840be47
ADJUST1-86 Fix rada integration test - new title
yasinmustafa Jul 19, 2023
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/rada.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ context('Enter a RADA', () => {
cy.signIn()
let hub = HubPage.goTo('A1234AB')
hub.viewRadaLink().click()
const viewPage = ViewPage.verifyOnPage<ViewPage>(ViewPage, 'Restore additional days awarded (RADA) details')
const viewPage = ViewPage.verifyOnPage<ViewPage>(ViewPage, 'RADA details')
const id = '4c3c057c-896d-4793-9022-f3001e209a36'
viewPage.editLink(id).click()
const form = FormPage.verifyOnPage<FormPage>(FormPage, 'Enter RADA details')
Expand All @@ -61,7 +61,7 @@ context('Enter a RADA', () => {
cy.signIn()
let hub = HubPage.goTo('A1234AB')
hub.viewRadaLink().click()
const viewPage = ViewPage.verifyOnPage<ViewPage>(ViewPage, 'Restore additional days awarded (RADA) details')
const viewPage = ViewPage.verifyOnPage<ViewPage>(ViewPage, 'RADA details')
const id = '4c3c057c-896d-4793-9022-f3001e209a36'
viewPage.removeLink(id).click()
const removePage = RemovePage.verifyOnPage<RemovePage>(RemovePage, 'Remove RADA')
Expand Down
4 changes: 3 additions & 1 deletion server/model/adjustmentTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { AdjustmentTypes } from '../@types/adjustments/adjustmentsTypes'
export type AdjustmentType = {
value: AdjustmentTypes
text: string
alternativeText: string
shortText: string
url: string
}
Expand Down Expand Up @@ -34,7 +35,8 @@ const adjustmentTypes: AdjustmentType[] = [
} as AdjustmentType,
{
value: 'RESTORATION_OF_ADDITIONAL_DAYS_AWARDED',
text: 'Restore additional days awarded (RADA)',
text: 'RADA (Restoration of added days)',
alternativeText: 'RADA',
shortText: 'RADA',
url: 'restored-additional-days',
} as AdjustmentType,
Expand Down
13 changes: 12 additions & 1 deletion server/model/viewModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class ViewModel {
public table() {
return {
head: this.columnHeadings(),
rows: this.rows(),
rows: this.rows().concat(this.totalRow()),
}
}

Expand Down Expand Up @@ -61,6 +61,17 @@ export default class ViewModel {
})
}

public totalRow() {
const total = this.adjustments.map(it => it.days).reduce((a, b) => a + b, 0)
if (this.adjustmentType.value === 'RESTORATION_OF_ADDITIONAL_DAYS_AWARDED') {
return [
[{ html: '<b>Total days</b>' }, { text: '' }, { html: `<b>${total}</b>`, format: 'numeric' }, { html: '' }],
]
}

return [[{ html: '<b>Total days</b>' }, { html: `<b>${total}</b>`, format: 'numeric' }, { text: '' }, { html: '' }]]
}

private actionCell(adjustment: Adjustment) {
return {
html: `
Expand Down
1 change: 1 addition & 0 deletions server/routes/adjustmentRoutes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ describe('Adjustment routes tests', () => {
expect(res.text).toContain('Doris McNealy')
expect(res.text).toContain('edit/this-is-an-id')
expect(res.text).toContain('remove/this-is-an-id')
expect(res.text).toContain('Total days')
})
})

Expand Down
20 changes: 10 additions & 10 deletions server/views/pages/adjustments/view.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}

{% set pageTitle = applicationName + " - view " + model.adjustmentType.shortText%}
{% set pageTitle = applicationName + " - view " + model.adjustmentType.shortText %}
{% set mainClasses = "app-container govuk-body" %}

{% block beforeContent %}
{{ super() }}
<nav>
{{ govukBackLink({
text: "Back",
href: "/" + model.prisonerDetail.offenderNo
}) }}
text: "Back",
href: "/" + model.prisonerDetail.offenderNo
}) }}
</nav>
{% endblock %}

Expand All @@ -21,22 +21,22 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">
<span class="govuk-caption-xl">Adjust release dates</span>
{{model.adjustmentType.text}} details
</h1>
{{ model.adjustmentType.alternativeText or model.adjustmentType.text }} details
</h1>
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
{{govukTable(
{{ govukTable(
model.table()
)}}
) }}
<div>
{{ govukButton({
text: "Add new",
text: "Add new",
href: "/" + model.prisonerDetail.offenderNo + "/" + model.adjustmentType.url + "/add"
}) }}
</div>
<a href="/{{model.prisonerDetail.offenderNo}}" class="govuk-link">Return to dashboard</a>
<a href="/{{ model.prisonerDetail.offenderNo }}" class="govuk-link">Return to dashboard</a>
</div>
</div>
{% endblock %}