diff --git a/integration-tests/integration/createIncident/view-your-report.cy.js b/integration-tests/integration/createIncident/view-your-report.cy.js index 3e438553..5789d9ba 100644 --- a/integration-tests/integration/createIncident/view-your-report.cy.js +++ b/integration-tests/integration/createIncident/view-your-report.cy.js @@ -134,8 +134,8 @@ context('A reporter views their own report', () => { const yourReportPage = YourReportPage.verifyOnPage() yourReportPage.location().contains('–') - yourReportPage.batonDrawnAgainstPrisonerLabel().contains('Was a baton drawn against the prisoner?') - yourReportPage.pavaDrawnAgainstPrisonerLabel().contains('Was PAVA drawn against the prisoner?') + yourReportPage.batonDrawnAgainstPrisonerLabel().contains('Was a baton drawn by anyone against this prisoner?') + yourReportPage.pavaDrawnAgainstPrisonerLabel().contains('Was PAVA drawn by anyone against this prisoner?') }) it('A user can view reports and it will show the old version of the Baton and PAVA questions', () => { diff --git a/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js b/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js index 0ed73293..f0ae38d1 100644 --- a/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js +++ b/integration-tests/pages/createReport/selectPrimaryUofReasonPage.js @@ -12,7 +12,9 @@ const selectPrimaryUofReasonPage = () => }, () => { cy.get('h1').contains('Use of force details') - cy.get('legend.govuk-fieldset__legend--l').contains('What was the primary reason use of force was applied?') + cy.get('legend.govuk-fieldset__legend--l').contains( + 'What was the primary reason use of force was applied against this prisoner?' + ) } ) diff --git a/integration-tests/pages/createReport/selectUofReasonsPage.js b/integration-tests/pages/createReport/selectUofReasonsPage.js index 16038051..af7fdaef 100644 --- a/integration-tests/pages/createReport/selectUofReasonsPage.js +++ b/integration-tests/pages/createReport/selectUofReasonsPage.js @@ -14,7 +14,7 @@ const selectUofReasonsPage = () => }, () => { cy.get('h1').contains('Use of force details') - cy.get('legend.govuk-fieldset__legend--l').contains('Why was use of force applied?') + cy.get('legend.govuk-fieldset__legend--l').contains('Why was use of force applied against this prisoner?') } ) diff --git a/server/routes/creatingReports/checkYourAnswers.test.ts b/server/routes/creatingReports/checkYourAnswers.test.ts index 251620d4..99b1a278 100644 --- a/server/routes/creatingReports/checkYourAnswers.test.ts +++ b/server/routes/creatingReports/checkYourAnswers.test.ts @@ -71,7 +71,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).not.toContain('Which pain inducing techniques were used?') + expect(res.text).not.toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -98,7 +98,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -125,7 +125,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) @@ -151,7 +151,7 @@ describe('GET /check-your-answers', () => { .expect(200) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Which pain inducing techniques were used?') + expect(res.text).toContain('Which pain inducing techniques were used against this prisoner?') }) }) it('Should contain prisoner compliant', () => { diff --git a/server/routes/creatingReports/whyWasUoFApplied.test.ts b/server/routes/creatingReports/whyWasUoFApplied.test.ts index 8186ce41..7c79f830 100644 --- a/server/routes/creatingReports/whyWasUoFApplied.test.ts +++ b/server/routes/creatingReports/whyWasUoFApplied.test.ts @@ -35,7 +35,7 @@ describe('/why-was-uof-applied', () => { .get(paths.whyWasUofApplied(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('Why was use of force applied?') + expect(res.text).toContain('Why was use of force applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_BY_A_MEMBER_OF_PUBLIC.label) }) }) @@ -131,7 +131,7 @@ describe('/what-was-the-primary-reason-of-uof', () => { .get(paths.whatWasPrimaryReasonForUoF(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('What was the primary reason use of force was applied?') + expect(res.text).toContain('What was the primary reason use of force was applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_ON_ANOTHER_PRISONER.label) expect(res.text).toContain(UofReasons.HOSTAGE_NTRG.label) // Not present as reasons from flash used rather than DB @@ -150,7 +150,7 @@ describe('/what-was-the-primary-reason-of-uof', () => { .get(paths.whatWasPrimaryReasonForUoF(-19)) .expect('Content-Type', /html/) .expect(res => { - expect(res.text).toContain('What was the primary reason use of force was applied?') + expect(res.text).toContain('What was the primary reason use of force was applied against this prisoner?') expect(res.text).toContain(UofReasons.ASSAULT_ON_ANOTHER_PRISONER.label) expect(res.text).toContain(UofReasons.ASSAULT_BY_A_MEMBER_OF_PUBLIC.label) }) diff --git a/server/views/formPages/incident/select-primary-uof-reason.html b/server/views/formPages/incident/select-primary-uof-reason.html index a91a67ef..dfa85a76 100644 --- a/server/views/formPages/incident/select-primary-uof-reason.html +++ b/server/views/formPages/incident/select-primary-uof-reason.html @@ -20,7 +20,7 @@

{{ pageTitle }}

name: "primaryReason", fieldset: { legend: { - text: "What was the primary reason use of force was applied?", + text: "What was the primary reason use of force was applied against this prisoner?", isPageHeading: false, classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-8" } diff --git a/server/views/formPages/incident/select-uof-reasons.html b/server/views/formPages/incident/select-uof-reasons.html index 7446b8c7..4e4d478c 100644 --- a/server/views/formPages/incident/select-uof-reasons.html +++ b/server/views/formPages/incident/select-uof-reasons.html @@ -2,7 +2,7 @@ {% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %} {% from "govuk/components/button/macro.njk" import govukButton %} -{% set pageTitle = 'Use of force details - why was use of force applied?' %} +{% set pageTitle = 'Use of force details - why was use of force applied against this prisoner?' %} {% set saveButtonInEditModeText = 'Save and continue' %} {% block formItems %} @@ -15,7 +15,7 @@

Use of force details

name: "reasons[]", fieldset: { legend: { - text: "Why was use of force applied?", + text: "Why was use of force applied against this prisoner?", isPageHeading: false, classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-8" } diff --git a/server/views/formPages/incident/useOfForceDetails.html b/server/views/formPages/incident/useOfForceDetails.html index 70fe345f..0dec2a17 100644 --- a/server/views/formPages/incident/useOfForceDetails.html +++ b/server/views/formPages/incident/useOfForceDetails.html @@ -24,7 +24,7 @@

{{ pageTitle }}

{{ incidentMacro.radio( { - text: "Was positive communication used to de-escalate the situation?", + text: "Was positive communication used to de-escalate the situation with this prisoner?", name: "positiveCommunication", value: data.positiveCommunication, options: yesNoOptions, @@ -50,7 +50,7 @@

{{ pageTitle }}

{{ incidentMacro.radio( { - text: "Were any personal protection techniques used?", + text: "Were any personal protection techniques used against this prisoner?", name: "personalProtectionTechniques", value: data.personalProtectionTechniques, options: yesNoOptions, @@ -60,14 +60,14 @@

{{ pageTitle }}

{{ incidentMacro.radiosWithNestedRadios({ primaryQuestion: { - text: "Was a baton drawn against the prisoner?", + text: "Was a baton drawn by anyone against this prisoner?", name: "batonDrawnAgainstPrisoner", value: data.batonDrawnAgainstPrisoner, options: yesNoOptions, errorMessage: errors | findError('batonDrawnAgainstPrisoner') }, followUpQuestion: { - text: "Was it used?", + text: "Was it used against this prisoner?", value: data.batonUsed, name: "batonUsed", options: yesNoOptions, @@ -81,7 +81,7 @@

{{ pageTitle }}

{{ incidentMacro.radiosWithNestedRadios({ primaryQuestion: { - text: "Was PAVA drawn against the prisoner?", + text: "Was PAVA drawn by anyone against this prisoner?", name: "pavaDrawnAgainstPrisoner", value: data.pavaDrawnAgainstPrisoner, options: yesNoOptions, @@ -89,7 +89,7 @@

{{ pageTitle }}

}, followUpQuestion: { - text: "Was it used?", + text: "Was it used against this prisoner?", name: "pavaUsed", value: data.pavaUsed, options: yesNoOptions, @@ -120,7 +120,7 @@

{{ pageTitle }}

{{ incidentMacro.radiosWithNestedRadios({ primaryQuestion: { - text: "Was a guiding hold used?", + text: "Was a guiding hold used against this prisoner?", name: "guidingHold", value: data.guidingHold, options: yesNoOptions, @@ -148,7 +148,7 @@

{{ pageTitle }}

{{ incidentMacro.radio( { - text: "Was an escorting hold used?", + text: "Was an escorting hold used against this prisoner?", name: "escortingHold", value: data.escortingHold, options: yesNoOptions, @@ -159,7 +159,7 @@

{{ pageTitle }}

{{ incidentMacro.checkboxesWithNestedCheckboxes({ primaryQuestion: { - text: "Which control and restraint positions were used?", + text: "Which control and restraint positions were used against this prisoner?", hint: "Select all that apply.", name: "restraintPositions", value: data.restraintPositions | toArray, @@ -174,7 +174,7 @@

{{ pageTitle }}

{{ incidentMacro.checkboxesWithNestedCheckboxes({ primaryQuestion: { - text: "Which pain inducing techniques were used?", + text: "Which pain inducing techniques were used against this prisoner?", hint: "Select all that apply.", name: "painInducingTechniquesUsed", value: data.painInducingTechniquesUsed or [], @@ -187,7 +187,7 @@

{{ pageTitle }}

{{ incidentMacro.radio( { - text: "Were handcuffs applied?", + text: "Were handcuffs applied against this prisoner?", name: "handcuffsApplied", value: data.handcuffsApplied, options: yesNoOptions, diff --git a/server/views/pages/reportDetailMacro.njk b/server/views/pages/reportDetailMacro.njk index 39b77c42..b34d3a23 100644 --- a/server/views/pages/reportDetailMacro.njk +++ b/server/views/pages/reportDetailMacro.njk @@ -155,7 +155,7 @@ {% if data.useOfForceDetails.reasonsForUseOfForce %} {{ reportDetailsMacros.tableRow({ - label: 'Why was use of force applied?', + label: 'Why was use of force applied against this prisoner?', 'data-qa': 'reasonsForUseOfForce', dataValue: data.useOfForceDetails.reasonsForUseOfForce, print: print @@ -165,7 +165,7 @@ {% if data.useOfForceDetails.primaryReason %} {{ reportDetailsMacros.tableRow({ - label: 'What was the primary reason use of force was applied?', + label: 'What was the primary reason use of force was applied against this prisoner?', 'data-qa': 'primaryReason', dataValue: data.useOfForceDetails.primaryReason, print: print @@ -174,7 +174,7 @@ {% endif %} {{ reportDetailsMacros.tableRow({ - label: 'Was positive communication used to de-escalate the situation?', + label: 'Was positive communication used to de-escalate the situation with this prisoner?', 'data-qa': 'positiveCommunication', dataValue: data.useOfForceDetails.positiveCommunicationUsed | toYesNo, print: print @@ -192,7 +192,7 @@ {{ reportDetailsMacros.tableRow({ - label: 'Were any personal protection techniques used?', + label: 'Were any personal protection techniques used against this prisoner?', 'data-qa': 'personalProtection', dataValue: data.useOfForceDetails.personalProtectionTechniques | toYesNo, print: print @@ -211,7 +211,7 @@ {% else %} {{ reportDetailsMacros.tableRow({ - label: 'Was a baton drawn against the prisoner?', + label: 'Was a baton drawn by anyone against this prisoner?', 'data-qa': 'batonDrawnAgainstPrisoner', dataValue: data.useOfForceDetails.batonDrawnAgainstPrisoner, print: print @@ -231,7 +231,7 @@ {% else %} {{ reportDetailsMacros.tableRow({ - label: 'Was PAVA drawn against the prisoner?', + label: 'Was PAVA drawn by anyone against this prisoner?', 'data-qa': 'pavaDrawnAgainstPrisoner', dataValue: data.useOfForceDetails.pavaDrawnAgainstPrisoner, print: print @@ -252,7 +252,7 @@ {{ reportDetailsMacros.tableRow({ - label: 'Was a guiding hold used?', + label: 'Was a guiding hold used against this prisoner?', 'data-qa': 'guidingHold', dataValue: data.useOfForceDetails.guidingHoldUsed | capitalize, print: print @@ -261,7 +261,7 @@ {% if data.useOfForceDetails.escortingHoldUsed != undefined %} {{ reportDetailsMacros.tableRow({ - label: 'Was an escorting hold used?', + label: 'Was an escorting hold used against this prisoner?', 'data-qa': 'escortingHold', dataValue: data.useOfForceDetails.escortingHoldUsed | toYesNo, print: print @@ -270,7 +270,7 @@ {% endif %} {{ reportDetailsMacros.tableRow({ - label: 'Which control and restraint techniques were used?', + label: 'Which control and restraint positions were used against this prisoner?', 'data-qa': 'restraintUsed', dataValue: data.useOfForceDetails.controlAndRestraintUsed | toArray, print: print, @@ -282,7 +282,7 @@ {% if data.useOfForceDetails.painInducingTechniques != undefined and not details.painInducingTechniquesUsed %} {{ reportDetailsMacros.tableRow({ - label: 'Which pain inducing techniques were used?', + label: 'Which pain inducing techniques were used against this prisoner?', 'data-qa': 'painInducingTechniques', dataValue: data.useOfForceDetails.painInducingTechniques | capitalize, print: print @@ -291,7 +291,7 @@ {% endif %} {{ reportDetailsMacros.tableRow({ - label: 'Were handcuffs applied?', + label: 'Were handcuffs applied against this prisoner?', 'data-qa': 'handcuffsApplied', dataValue: data.useOfForceDetails.handcuffsApplied | toYesNo, print: print