Merge pull request #28 from NHSDigital/jan-updates

Adds confirmation page when taking mammograms
Renames service to Manage breast screening
Reworks clinic list to include date of birth and age, and tweaks design
Adds participant views
Adds participant list
Adds minimal searching for participants
Refactors main event page
Adds page before imaging
Misc refactoring

Author: edwardhorsford

app.js

@@ -73,6 +73,9 @@ nunjucksAppEnv.addGlobal('version', packageInfo.version);
 // Add Nunjucks filters
 utils.addNunjucksFilters(nunjucksAppEnv);
 
+// Add Nunjucks functions
+utils.addNunjucksFunctions(nunjucksAppEnv);
+
 // Session uses service name to avoid clashes with other prototypes
 const sessionName = `nhsuk-prototype-kit-${(Buffer.from(config.serviceName, 'utf8')).toString('hex')}`;
 const sessionOptions = {

app/assets/sass/_misc.scss

@@ -8,3 +8,15 @@
     margin-left: 5px;
   }
 }
+
+
+.app-suppress-link-styles * {
+  text-decoration: none;
+  color: $nhsuk-secondary-text-color;
+}
+
+
+.app-image-flip-horizontal {
+  -webkit-transform: scaleX(-1);
+  transform: scaleX(-1);
+}

app/assets/sass/components/_overrides.scss

@@ -0,0 +1,11 @@
+
+
+// Reduce the large default margins the component comes with
+.nhsuk-inset-text {
+  @include nhsuk-responsive-margin(3, "top");
+  @include nhsuk-responsive-margin(4, "bottom");
+}
+
+p:has(+ .nhsuk-inset-text) {
+  margin-bottom: 0;
+}

app/assets/sass/main.scss

@@ -8,6 +8,9 @@
 @import 'components/header-organisation';
 @import 'components/secondary-navigation';
 @import 'components/count';
+@import 'components/overrides';
+
+@import 'pages/events';
 
 @import 'misc';
 

app/assets/sass/pages/_events.scss

@@ -0,0 +1,10 @@
+.app-event-header {
+  position: relative;
+}
+
+.app-event-status {
+  position: absolute;
+  top: 10px;
+  right: 0px;
+}
+

app/config.js

@@ -5,7 +5,7 @@ const path = require('path')
 
 module.exports = {
   // Service name
-  serviceName: 'Manage screening events',
+  serviceName: 'Manage breast screening',
 
   // Port to run nodemon on locally
   port: 2000,

app/data/breast-screening-units.js

@@ -15,6 +15,10 @@ module.exports = [
     phoneNumber: '01865235621',
     abbreviation: 'WSB',
     clinicTypes: ['screening', 'assessment'], // Can do both
+    riskLevelHandling: [
+      'routine',
+      'moderate',
+    ],
     // Default operating hours for the BSU
     sessionPatterns: [
       // {
@@ -39,6 +43,11 @@ module.exports = [
         name: 'West Sussex BSS',
         type: 'hospital',
         isMainSite: true,
+        // Main sites can handle all supported risk levels
+        riskLevelHandling: [
+          'routine',
+          'moderate',
+        ],
         address: {
           line1: 'Breast Screening Unit',
           line2: 'Worthing Hospital',
@@ -66,6 +75,10 @@ module.exports = [
         type: 'mobile_unit',
         isMainSite: false,
         clinicTypes: ['screening'], // Can only do screening
+        // Mobile units only handle routine screening
+        riskLevelHandling: [
+          'routine',
+        ],
         registration: 'JA1 CP7',
         // Override BSU session patterns for this location
         sessionPatterns: [
@@ -84,6 +97,10 @@ module.exports = [
         type: 'mobile_unit',
         isMainSite: false,
         clinicTypes: ['screening'], // Can only do screening
+        // Mobile units only handle routine screening
+        riskLevelHandling: [
+          'routine',
+        ],
         registration: 'WX71 HCR',
         // Override BSU session patterns for this location
         sessionPatterns: [
@@ -102,6 +119,10 @@ module.exports = [
       //   type: "mobile_unit",
       //   isMainSite: false,
       //   clinicTypes: ['screening'],  // Can only do screening
+      //   // Mobile units only handle routine screening
+      //   riskLevelHandling: [
+      //     'routine',
+      //   ],
       //   registration: "CD1 5HR",
       //   // Override BSU session patterns for this location
       //   sessionPatterns: [

app/data/risk-levels.js

@@ -0,0 +1,35 @@
+// app/data/risk-levels.js
+
+module.exports = {
+
+  routine: {
+    weight: 0.7,
+    frequency: 36, // months
+    ageRange: {
+      upper: 70,
+      lower: 50
+    }
+  },
+  moderate: {
+    weight: 0.25,
+    frequency: 12, // months
+    ageRange: {
+      upper: 50,
+      lower: 40
+    }
+  },
+  high: {
+    weight: 0.05,
+    frequency: 12, // months
+    ageRange: {
+      upper: 70,
+      lower: 50
+    }
+  },
+  // veryHigh: {
+  //   frequency: 12, // months
+  //   ageRange: {
+  //     upper: 40,
+  //   }
+  // }
+}

app/data/test-scenarios.js

@@ -16,12 +16,15 @@ module.exports = [
         middleName: null,
         lastName: 'Williams',
         dateOfBirth: '1959-07-22',
+        ethnicGroup: null,
+        ethnicBackground: null,
       },
       extraNeeds: ['Wheelchair user'],
+      defaultRiskLevel: 'routine',
     },
     scheduling: {
       whenRelativeToToday: 0,
-      status: 'scheduled', 
+      status: 'event_scheduled',
       approximateTime: '10:30',
     },
   },
@@ -33,12 +36,15 @@ module.exports = [
         lastName: 'McIntosh',
         middleName: 'Rose',
         dateOfBirth: '1964-03-15',
+        ethnicGroup: null,
+        ethnicBackground: null,
       },
       extraNeeds: null,
+      defaultRiskLevel: 'routine',
     },
     scheduling: {
       whenRelativeToToday: 0,
-      status: 'checked_in',
+      status: 'event_checked_in',
       approximateTime: '11:30',
       // slotIndex: 20,
     },