From 9517d3403c9539ae900a25d4f54b8091891051c4 Mon Sep 17 00:00:00 2001 From: achimber-moj <161360519+achimber-moj@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:20:14 +0000 Subject: [PATCH] MAN-317 update rar details (#276) --- integration_tests/e2e/requirement-note.cy.ts | 4 ++-- integration_tests/e2e/sentence.cy.ts | 6 +++--- server/views/pages/requirement-note.njk | 5 +++-- server/views/pages/sentence.njk | 5 +++-- wiremock/mappings/X000001-requirement-note-0.json | 5 +++-- wiremock/mappings/X000001-sentence.json | 5 +++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/integration_tests/e2e/requirement-note.cy.ts b/integration_tests/e2e/requirement-note.cy.ts index d9e51eaf..84ce69e2 100644 --- a/integration_tests/e2e/requirement-note.cy.ts +++ b/integration_tests/e2e/requirement-note.cy.ts @@ -10,7 +10,7 @@ context('Sentence', () => { cy.get('[data-qa=pageHeading]').eq(0).should('contain.text', 'Sentence') cy.get(`[class=app-summary-card__header]`).within(() => - cy.get('h2').should('contain.text', '1 of 12 RAR days completed'), + cy.get('h2').should('contain.text', '3 of 12 RAR days completed'), ) cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dt').should('have.length', 6)) @@ -21,7 +21,7 @@ context('Sentence', () => { cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dd').eq(0).should('contain.text', '12 days')) cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dt').eq(1).should('contain.text', 'Completed RAR')) - cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dd').eq(1).should('contain.text', '1 day')) + cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dd').eq(1).should('contain.text', '3 days')) cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dt').eq(2).should('contain.text', 'Start date')) cy.get(`[class=app-summary-card__body]`).within(() => cy.get('dd').eq(2).should('contain.text', '12 April 2024')) diff --git a/integration_tests/e2e/sentence.cy.ts b/integration_tests/e2e/sentence.cy.ts index 164c7e29..9beb86ad 100644 --- a/integration_tests/e2e/sentence.cy.ts +++ b/integration_tests/e2e/sentence.cy.ts @@ -199,7 +199,7 @@ context('Sentence', () => { cy.get(`[data-qa="sentenceCard"]`).within(() => cy.get('dt').eq(5).should('contain.text', 'Requirements')) cy.get(`[data-qa="requirementsValue"]`).within(() => - cy.get('details').eq(0).should('contain.text', '1 of 12 RAR days completed'), + cy.get('details').eq(0).should('contain.text', '3 of 12 RAR days completed'), ) cy.get(`[data-qa="requirementsValue"]`).within(() => cy.get('details').eq(1).should('contain.text', 'Curfew (Electronic Monitored)'), @@ -228,7 +228,7 @@ context('Sentence', () => { page.getRequirementLabel(1, 1).should('contain.text', 'Length of RAR') page.getRequirementValue(1, 1).should('contain.text', '12 days') page.getRequirementLabel(1, 2).should('contain.text', 'Completed RAR') - page.getRequirementValue(1, 2).should('contain.text', '1 day') + page.getRequirementValue(1, 2).should('contain.text', '3 days') page.getRequirementLabel(1, 3).should('contain.text', 'Start date') page.getRequirementValue(1, 3).should('contain.text', '12 April 2024') page.getRequirementLabel(1, 4).should('contain.text', 'Notes') @@ -241,6 +241,6 @@ context('Sentence', () => { .should('contain.text', 'Comment added by Jon Jones on 21 August 2024') page.getRequirementValue(1, 4).find('a').click() cy.get(`[data-qa="name"]`).should('contain.text', 'Caroline Wolff') - cy.get('.app-summary-card__header').should('contain.text', '1 of 12 RAR days completed') + cy.get('.app-summary-card__header').should('contain.text', '3 of 12 RAR days completed') }) }) diff --git a/server/views/pages/requirement-note.njk b/server/views/pages/requirement-note.njk index 99e72734..27ea4b06 100644 --- a/server/views/pages/requirement-note.njk +++ b/server/views/pages/requirement-note.njk @@ -28,6 +28,7 @@ {% endblock %} {% block pageContent %} + {% set completedRar = requirementNoteDetails.requirement.rar.completed + requirementNoteDetails.requirement.rar.nsiCompleted %} {% set requirementNote %} {{ govukSummaryList({ rows: [ @@ -41,7 +42,7 @@ } if requirementNoteDetails.requirement.length and requirementNoteDetails.requirement.code !== 'F', { key: { text: 'Completed RAR'}, - value: { text: requirementNoteDetails.requirement.rar.completed + " day" if requirementNoteDetails.requirement.rar.completed == 1 else requirementNoteDetails.requirement.rar.completed + " days" } + value: { text: completedRar + " day" if completedRar == 1 else completedRar + " days" } } if requirementNoteDetails.requirement.rar.completed and requirementNoteDetails.requirement.code == 'F', { key: { text: 'Expected start date' }, @@ -80,7 +81,7 @@ {% endset %} {% if requirementNoteDetails.requirement %} - {% set description = requirementNoteDetails.requirement.rar.completed + " of " + requirementNoteDetails.requirement.rar.totalDays + " RAR days completed" if requirementNoteDetails.requirement.code == 'F' else requirementNoteDetails.requirement.description %} + {% set description = requirementNoteDetails.requirement.description %} {{ appSummaryCard({ titleText: description, attributes: {'data-qa': 'requirementNoteCard'}, diff --git a/server/views/pages/sentence.njk b/server/views/pages/sentence.njk index c41564b6..214d2005 100644 --- a/server/views/pages/sentence.njk +++ b/server/views/pages/sentence.njk @@ -193,7 +193,7 @@ {% set hasRequirements = sentence.requirements and sentence.requirements.length > 0 %} {% set requirements %} {% for requirement in sentence.requirements %} - {% set reqSummary = requirement.rar.completed + " of " + requirement.rar.totalDays + " RAR days completed" if requirement.code == 'F' else requirement.description %} + {% set reqSummary = requirement.description %} {% set reqNotes = '' %} {% for reqNote in requirement.requirementNotes %} {% set note %} @@ -211,6 +211,7 @@ {% endset %} {% set reqNotes = reqNotes.concat(note) %} {% endfor %} + {% set completedRar = requirement.rar.completed + requirement.rar.nsiCompleted %} {% set requirementHtml %} {{ govukSummaryList({ rows: [ @@ -224,7 +225,7 @@ } if requirement.length and requirement.code == 'F', { key: { text: 'Completed RAR' }, - value: { text: requirement.rar.completed + ' day' if requirement.rar.completed == 1 else requirement.rar.completed + ' days' } + value: { text: requirement.rar.completed + ' day' if completedRar == 1 else completedRar + ' days' } } if requirement.code == 'F', { key: { text: "Expected start date" }, diff --git a/wiremock/mappings/X000001-requirement-note-0.json b/wiremock/mappings/X000001-requirement-note-0.json index 28ac225c..d8bf60a4 100644 --- a/wiremock/mappings/X000001-requirement-note-0.json +++ b/wiremock/mappings/X000001-requirement-note-0.json @@ -19,7 +19,7 @@ "requirement": { "code": "F", "actualStartDate": "2024-04-12", - "description": "1 of 12 RAR days", + "description": "3 of 12 RAR days completed", "length": 12, "lengthUnitValue": "Days", "requirementNote": { @@ -30,7 +30,8 @@ }, "rar": { "completed": 1, - "scheduled": 11, + "nsiCompleted": 2, + "scheduled": 9, "totalDays": 12 } } diff --git a/wiremock/mappings/X000001-sentence.json b/wiremock/mappings/X000001-sentence.json index e1fcd4ea..393dfbeb 100644 --- a/wiremock/mappings/X000001-sentence.json +++ b/wiremock/mappings/X000001-sentence.json @@ -238,7 +238,7 @@ "id": 1, "code": "F", "actualStartDate": "2024-04-12", - "description": "1 of 12 RAR days", + "description": "3 of 12 RAR days completed", "length": 12, "lengthUnitValue": "Days", "requirementNotes": [ @@ -252,7 +252,8 @@ ], "rar": { "completed": 1, - "scheduled": 11, + "nsiCompleted": 2, + "scheduled": 9, "totalDays": 12 } },