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.

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

MAN-23 - add missing acceptance criteria #171

Merged
merged 4 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 37 additions & 17 deletions integration_tests/e2e/recentCases.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,27 @@ context('Recent Cases', () => {
it('Recent Cases page is rendered', () => {
cy.visit('/recent-cases', {
onBeforeLoad(win) {
const recentCases = []
const recentCase = {
name: 'Wolff,Caroline',
crn: 'X000001',
dob: '9 January 2002',
age: 22,
tierScore: 'B2',
sentence: '12 month Community order',
}

recentCases.push(recentCase)
const recentCases = [
{
name: 'Wolff,Caroline',
crn: 'X000001',
dob: '9 January 2002',
age: 22,
tierScore: 'B2',
numberOfAdditionalSentences: '1',
sentence: '12 month Community order',
},
{
name: 'Berge,Alton',
crn: 'X778160',
dob: '12 March 2012',
age: 12,
tierScore: 'A3',
numberOfAdditionalSentences: '0',
sentence: 'CJA - Std Determinate Custody',
},
]

win.localStorage.setItem('recentCases', JSON.stringify(recentCases))
},
})
Expand Down Expand Up @@ -46,11 +56,21 @@ context('Recent Cases', () => {
cy.get('@row1col2').within(() => cy.contains('9 January 2002'))
cy.get('@row1col2').within(() => cy.contains('span', 22))

cy.get('tbody')
.eq(0)
.within(() => cy.get('td').eq(2).should('contain.text', 'B2'))
cy.get('tbody')
.eq(0)
.within(() => cy.get('td').eq(3).should('contain.text', '12 month Community order'))
cy.get('tbody').within(() => cy.get('td').eq(2).should('contain.text', 'B2'))
cy.get('tbody').within(() => cy.get('td').eq(3).should('contain.text', '12 month Community order'))

cy.get('tbody').within(() =>
cy
.get('tr')
.eq(0)
.within(() => cy.get('a').eq(1).invoke('attr', 'href').should('equal', './case/X000001/sentence')),
)

cy.get('tbody').within(() =>
cy
.get('tr')
.eq(1)
.within(() => cy.get('td').eq(3).should('contain.text', 'CJA - Std Determinate Custody')),
)
})
})
18 changes: 16 additions & 2 deletions server/views/pages/caseload/recent-cases.njk
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,23 @@
rd3.className = "govuk-table__cell"
rd3.innerText = recentCase.tierScore

const rd4 = document.createElement("td")
let rd4 = document.createElement("td")
rd4.className = "govuk-table__cell"
rd4.innerText = recentCase.sentence

if (recentCase.numberOfAdditionalSentences > 0) {
const anchorSentence = document.createElement("a")
anchorSentence.className ="govuk-link"
anchorSentence.href = "./case/" + recentCase.crn + "/sentence"
anchorSentence.text = "+ " + recentCase.numberOfAdditionalSentences + " more"

rd4.innerText = recentCase.sentence
rd4.appendChild(document.createElement("br"))
rd4.appendChild(anchorSentence)

} else {
rd4.innerText = recentCase.sentence
}


row.appendChild(rd1)
row.appendChild(rd2)
Expand Down
7 changes: 6 additions & 1 deletion server/views/pages/overview.njk
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,8 @@
<input type="hidden" id="dob" name="dob" value="{{ headerDob | dateWithYear }}">
<input type="hidden" id="age" name="age" value="{{ headerDob | yearsSince }}">
<input type="hidden" id="tier" name="age" value="{{ tierCalculation.tierScore }}">
<input type="hidden" id="numberOfAdditionalSentences" name="numberOfSentences" value="{{ numberOfSentences - 1 }}">


<script nonce="{{ cspNonce }}">
const crn = document.getElementById("caseCrn").value
Expand All @@ -455,6 +457,7 @@
const age = document.getElementById("age").value
const tier = document.getElementById("tier").value
const sentence = document.getElementById("sentence").value
const numberOfAdditionalSentences = document.getElementById("numberOfAdditionalSentences").value

let recentCases = []
let recentCase
Expand All @@ -475,10 +478,12 @@
dob: dob,
age: age,
tierScore: tier,
sentence: sentence
sentence: sentence,
numberOfAdditionalSentences: numberOfAdditionalSentences
};

recentCases.unshift(recentCase)
recentCases.splice(25)
localStorage.setItem('recentCases', JSON.stringify(recentCases))
</script>
{% endblock %}
27 changes: 0 additions & 27 deletions wiremock/mappings/X778160-full.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,6 @@
"scheduled": 2,
"totalDays": 16
}
},
{
"additionalOffences": [
{
"code": "9087",
"description": "Burglary - 9087"
},
{
"code": "9876",
"description": "Arson - 9876"
}
],
"eventNumber": "2",
"mainOffence": {
"code": "18502",
"description": "(Having possession a picklock or other implement with intent to break into any premises - 18502)"
},
"order": {
"description": "ORA Community Order",
"endDate": "2024-09-01",
"startDate": "2020-03-02"
},
"rar": {
"completed": 9,
"scheduled": 1,
"totalDays": 10
}
}
],
"activity": {
Expand Down
4 changes: 2 additions & 2 deletions wiremock/mappings/caseload.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"description": "AP PA - Accommodation"
},
"latestSentence": "CJA - Std Determinate Custody",
"numberOfAdditionalSentences": 2
"numberOfAdditionalSentences": 0
},
{
"caseName": {
Expand All @@ -71,7 +71,7 @@
"crn": "X000001",
"dob": "2002-01-09",
"latestSentence": "12 month Community order",
"numberOfAdditionalSentences": 0
"numberOfAdditionalSentences": 1
},
{
"caseName": {
Expand Down