✨ WFP-2381: add registration flags to active/inactive regist… (#904)

* ✨ WFP-2381: add registration flags to active/inactive registrations table * ✨ WFP-2381: remove null flag from mock data and int test
ministryofjustice · Apr 17, 2024 · d5364fe · d5364fe
1 parent 7850d90
commit d5364fe
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/integration_tests/integration/risk.spec.ts b/integration_tests/integration/risk.spec.ts
@@ -76,16 +76,19 @@ context('Risk', () => {
       .getTable()
       .should('deep.equal', [
         {
+          Flag: 'RoSH',
           Type: 'Suicide/self-harm',
           Registered: '13 December 2020',
           Notes: 'Previous suicide /self-harm attempt. Needs further investigating.',
         },
         {
+          Flag: 'Alerts',
           Type: 'Child concerns',
           Registered: '13 December 2020',
           Notes: 'Awaiting outcome of social services enquiry.',
         },
         {
+          Flag: 'Safeguarding',
           Type: 'Medium RoSH',
           Registered: '9 November 2021',
           Notes: '-',
@@ -103,12 +106,14 @@ context('Risk', () => {
       .getTable()
       .should('deep.equal', [
         {
+          Flag: 'Information',
           Type: 'Domestic abuse perpetrator',
           Registered: '14 June 2012',
           'End date': '26 November 2019',
           Notes: '-',
         },
         {
+          Flag: 'Public protection',
           Type: 'Mental health issues',
           Registered: '13 December 2017',
           'End date': '13 June 2019',

diff --git a/integration_tests/mockApis/risk.ts b/integration_tests/mockApis/risk.ts
@@ -21,18 +21,21 @@ export default {
               registered: '2020-12-13',
               nextReviewDate: '2022-06-13',
               notes: 'Previous suicide /self-harm attempt. Needs further investigating.',
+              flag: 'RoSH',
             },
             {
               type: 'Child concerns',
               registered: '2020-12-13',
               nextReviewDate: '2022-03-13',
               notes: 'Awaiting outcome of social services enquiry.',
+              flag: 'Alerts',
             },
             {
               type: 'Medium RoSH',
               registered: '2021-11-09',
               nextReviewDate: '2022-05-09',
               notes: null,
+              flag: 'Safeguarding',
             },
           ],
           inactiveRegistrations: [
@@ -41,12 +44,14 @@ export default {
               registered: '2012-06-14',
               endDate: '2019-11-26',
               notes: null,
+              flag: 'Information',
             },
             {
               type: 'Mental health issues',
               registered: '2017-12-13',
               endDate: '2019-06-13',
               notes: null,
+              flag: 'Public protection',
             },
           ],
           roshRisk: {

diff --git a/server/models/Registration.ts b/server/models/Registration.ts
@@ -3,4 +3,5 @@ export default interface Registration {
   registered: string
   notes: string
   endDate: string
+  flag: string
 }
diff --git a/server/views/pages/risk.njk b/server/views/pages/risk.njk
@@ -9,7 +9,9 @@
     classes: 'active-registrations-table',
     caption: 'Active registrations',
     captionClasses: 'govuk-table__caption--m',
+    firstCellIsHeader: true,
     head: [
+        { text: 'Flag'},
         { text: 'Type'},
         { text: 'Registered'},
         { text: 'Notes'}
@@ -20,7 +22,10 @@
 {% for registration in data.activeRegistrations %}
     {{
     activeRegistrationsData.rows.push([
-        { text: registration.type },
+        { text: registration.flag },
+        { text: registration.type,
+          classes: 'govuk-table__header'
+        },
         { text: registration.registered | dateFormat },
         { text: registration.notes if registration.notes | length else '-'}
     ])
@@ -31,7 +36,9 @@
     classes: 'inactive-registrations-table',
     caption: 'Inactive registrations',
     captionClasses: 'govuk-table__caption--m',
+    firstCellIsHeader: true,
     head: [
+        { text: 'Flag'},
         { text: 'Type'},
         { text: 'Registered'},
         { text: 'End date'},
@@ -43,7 +50,10 @@
 {% for registration in data.inactiveRegistrations %}
     {{
     inactiveRegistrationsData.rows.push([
-        { text: registration.type },
+        { text: registration.flag },
+        { text: registration.type,
+          classes: 'govuk-table__header'
+        },
         { text: registration.registered | dateFormat},
         { text: registration.endDate | dateFormat},
         { text: registration.notes if registration.notes | length else '-'}