Patient detail changes for new scenarios

app/data/organisations.js

@@ -8283,6 +8283,31 @@ module.exports = [
     status: 'Active',
     region: "Y62"
   },
+  {
+    id: 'FA425',
+    name: 'Simpsons Surgery',
+    companyId: "P0191N",
+    sites: [
+      {
+        id: "FA425X",
+        name: "Simpsons Surgery"
+      }
+    ],
+    address: {
+      line1: '8 Spencer Court',
+      town: 'Corby',
+      postcode: 'NN17 1NU'
+    },
+    type: 'GP Surgery',
+    vaccines: [
+      {name: "RSV", status: "enabled"},
+      {name: "COVID-19", status: "enabled"},
+      {name: "pertussis", status: "disabled"},
+      {name: "flu", status: "enabled"}
+    ],
+    status: 'Active',
+    region: "Y62"
+  },
   {
     id: 'FA02S',
     name: 'Addlestone Pharmacy',

app/data/users.js

@@ -13954,5 +13954,20 @@ module.exports = [
         "vaccinator": true
       }
     ]
-  }
+  },
+  // Add an example GP user linked to GP org
+  {
+    "id": "12345678",
+    "email": "lydia.harris@nhs.net",
+    "organisations": [
+      {
+        "id": "FA425",
+        "permissionLevel": "Lead administrator",
+        "status": "Active",
+        "vaccinator": true
+      }
+    ],
+    "firstName": "Lydia",
+    "lastName": "Harris"
+  },
 ]

app/routes/prototype-admin.js

@@ -484,6 +484,11 @@ module.exports = (router) => {
     } else if (scenario === 'support') {
       data.currentUserId = '66435353634'
       data.currentOrganisationId = null
+    } else if (scenario === 'gp') {
+      data.currentUserId = '12345678'
+      data.currentOrganisationId = 'FA425' 
+      setupBatchesForOrg(data, 'FA425')
+      addRandomVaccinations(data, 'FA425', 30)
     } else {
       res.redirect('/')
       return
@@ -699,6 +704,26 @@ module.exports = (router) => {
     res.redirect(getDefaultLandingPath(data, data.currentOrganisationId))
   })
 
+  // ----------------------------------------------------------------
+  // Preset: Basic GP user
+  // ----------------------------------------------------------------
+
+  router.get('/prototype-setup/preset/gp-surgery', (req, res) => {
+    resetSession(req)
+    const data = req.session.data
+
+    const scenarioUser = SIGN_IN_USERS.find(user => user.id === '12345678')
+    ensureUserExistsForScenario(data, scenarioUser)
+
+    data.currentUserId = '12345678'
+    data.currentOrganisationId = 'FA425'
+    setAppointmentsInterfaceForUserOrganisations(data, data.currentUserId, false)
+
+    setupBatchesForOrg(data, 'FA425')
+    addRandomVaccinations(data, 'FA425', 10)
+    res.redirect(getDefaultLandingPath(data, data.currentOrganisationId))
+  })
+
   // ----------------------------------------------------------------
   // Custom configuration — Step 1: Choose user
   // ----------------------------------------------------------------

app/routes/record-vaccinations.js

@@ -227,8 +227,17 @@ module.exports = router => {
     const nhsNumberKnown = req.session.data.nhsNumberKnown;
     req.session.data.nhsNumber = req.session.data.nhsNumber.trim()
     const nhsNumber = req.session.data.nhsNumber.replaceAll(' ', '')
+    const data = req.session.data
+
+    if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) &&  nhsNumber.startsWith('9') && data.gpit === "noGP") {
+
+      req.session.data.firstName = "Jodie"
+      req.session.data.lastName = "Brown"
+      req.session.data.dateOfBirth = {day: "15", month: "8", year: "1949"}
+      req.session.data.postcode = "GD3 I83"
 
-    if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) &&  nhsNumber.startsWith('9')) {
+      res.redirect('/record-vaccinations/patient-history-no-gp')
+    } else if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) &&  nhsNumber.startsWith('9')) {
 
       req.session.data.firstName = "Jodie"
       req.session.data.lastName = "Brown"
@@ -439,7 +448,7 @@ module.exports = router => {
 
     if (firstName != '' && lastName != '' && dateOfBirth.day != '' && dateOfBirth.month != '' && dateOfBirth.year != '' && postcode != '' && gender != '') {
 
-      res.redirect('/record-vaccinations/consent')
+      res.redirect('/record-vaccinations/patient-history-none')
     } else {
       res.redirect('/record-vaccinations/create-a-record?showErrors=yes')
     }
@@ -891,6 +900,10 @@ module.exports = router => {
 
     if (!data.locationType) {
       redirectPath = "/record-vaccinations/location?showErrors=yes"
+    } else if (data.gpit === "notInPCN" && data.locationType !== "Outreach event"){
+      redirectPath = "/record-vaccinations/covid-19/not-in-pcn-warning"
+    } else if (data.gpit === "noGP" && data.locationType !== "Outreach event"){
+      redirectPath = "/record-vaccinations/covid-19/no-gp-surgery-warning"
     } else {
       redirectPath = "/record-vaccinations/consent"
     }

app/views/includes/_preset-scenarios-table.html

@@ -110,6 +110,14 @@
     userEmail: "jeremy13.blue@nhs.net",
     role: "Lead administrator",
     scenarioDetails: "Pharmacy configured for MMR and flu (London service) only."
+  },
+  {
+    presetLabel: "GP surgery",
+    presetPath: "/prototype-setup/preset/gp-surgery",
+    userName: "Lydia Harris",
+    userEmail: "lydia.harris@nhs.net",
+    role: "Lead administrator",
+    scenarioDetails: "Basic GP surgery"
   }
 ] %}
 

app/views/index.html

@@ -105,6 +105,17 @@ <h2>Main interface</h2>
         <li><a href="/prototype-setup/quick-access/pharmacy?next=/user-profile">Profile page</a></li>
       </ul>
 
+      <h2>GP scenarios</h2>
+      <ul>
+        <li><a href="/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=inPCN">Record vaccinations (in PCN)</a></li>
+        <li><a href="/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=notInPCN">Record vaccinations (not in PCN)</a></li>
+        <li><a href="/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=noGP">Record vaccinations (no GP surgery)</a>
+          <ul>  
+            <li><a href="/record-vaccinations/patient-history-none?gpit=noGP">Patient details - no NHS number and no GP surgery</a></li>
+            </ul>
+        </li>
+      </ul>
+
       <h2>Regions interface</h2>
 
       <ul>
@@ -150,6 +161,8 @@ <h3>COVID-19</h3>
       <ul>
         <li><a href="/record-vaccinations/covid-19/interval-warning">Had a COVID-19 vaccine less than 3 months ago</a></li>
         <li><a href="/record-vaccinations/covid-19/too-young-warning">Too young for product</a></li>
+        <li><a href="/record-vaccinations/covid-19/no-gp-surgery-warning">No GP surgery and not outreach</a></li>
+        <li><a href="/record-vaccinations/covid-19/not-in-PCN-warning">Not in PCN and not outreach</a></li>
       </ul>
 
       <h3>flu</h3>

app/views/record-vaccinations/covid-19/no-gp-surgery-warning.html

@@ -0,0 +1,48 @@
+
+{% extends 'layout.html' %}
+
+{% set pageName = "Patient has no GP surgery" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% block beforeContent %}
+  {{ backLink({ href: "/record-vaccinations/patient-history" }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      {% if data.firstName and data.lastName %}
+        {% set displayName = data.firstName ~ ' ' ~ data.lastName %}
+      {% else %}
+        {% set displayName = 'Patient Name' %}
+      {% endif %}
+
+      {% if data.locationType %}
+        {% set locationType = data.locationType %}
+      {% else %}
+        {% set locationType = '[Location Type]' %}
+      {% endif %}
+
+      {% set panelHtml %}
+        {# <p>This patient does not have a registered GP surgery.</p> #}
+        <p>Your organisation may not be paid for this vaccination.</p>
+
+        {{ button({
+          "text": "Continue anyway",
+          "href": "/record-vaccinations/consent",
+          "classes": "nhsuk-button--reverse"
+        }) }}
+      {% endset %}
+
+      {{ panel({
+        titleText: displayName + " is not registered with a GP surgery",
+        html: panelHtml,
+        classes: "nhsuk-panel--interruption"
+      }) }}
+
+    </div>
+  </div>
+{% endblock %}
+

app/views/record-vaccinations/covid-19/not-in-pcn-warning.html

@@ -0,0 +1,42 @@
+
+{% extends 'layout.html' %}
+
+{% set pageName = "Patient not in PCN" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% block beforeContent %}
+  {{ backLink({ href: "/record-vaccinations/patient-history" }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+
+      {% if data.firstName and data.lastName %}
+        {% set displayName = data.firstName ~ ' ' ~ data.lastName %}
+      {% else %}
+        {% set displayName = 'Patient Name' %}
+      {% endif %}
+
+      {% set panelHtml %}
+        <p>Your organisation may not be paid for this vaccination.</p>
+
+        {{ button({
+          "text": "Continue anyway",
+          "href": "/record-vaccinations/consent",
+          "classes": "nhsuk-button--reverse"
+        }) }}
+      {% endset %}
+
+      {{ panel({
+        titleText: displayName + "'s GP surgery is not in your PCN",
+        html: panelHtml,
+        classes: "nhsuk-panel--interruption"
+      }) }}
+
+    </div>
+  </div>
+{% endblock %}
+