Update patient search flow (#217)

This updates the patient search flow with some changes and additional
screens.

Changes:

* postcode is optional on the initial search
* there’s a different screen if you have more than 1 matching result,
which tells you to refine the search (and where postcode becomes
required)
* if you choose to continue without an NHS number (after getting no
results), then postcode and a gender field are required
* on the check your answers screen, if there was no NHS number found,
then the name, date of birth, postcode and gender are all shown with a
'Change' link, as these are now editable (but no change link shown if
data came from PDS)

---------

Co-authored-by: Frankie Roberto <[email protected]>
Co-authored-by: Anna-Sutton <[email protected]>

Author: 3 people

app/routes/vaccinate.js

@@ -247,18 +247,17 @@ module.exports = router => {
       })
     }
 
-    if (postcode === "") {
-      postcodeError = "Enter a postcode"
-      errors.push({
-        text: postcodeError,
-        href: "#postcode"
-      })
-    }
-
     if (errors.length === 0) {
 
-      if (Number(dateOfBirth.day) %2) {
+      // If day of month is odd, pretend there’s no search result
+      if (Number(dateOfBirth.day) % 2) {
         res.redirect('/vaccinate/no-search-result')
+
+      // If postcode blank, pretend there’s multiple results
+      } else if (postcode === "") {
+        res.redirect('/vaccinate/refine-search-result')
+
+      // Otherwise pretend there is a single result
       } else {
         res.redirect('/vaccinate/search-result')
       }
@@ -271,9 +270,90 @@ module.exports = router => {
         postcodeError
       })
     }
+  })
+
+
+ router.get('/vaccinate/create-a-record', (req, res) => {
+
+  const firstName = req.session.data.firstName;
+  const lastName = req.session.data.lastName;
+  const dateOfBirth = req.session.data.dateOfBirth;
+  const postcode = req.session.data.postcode;
+  const gender = req.session.data.gender;
+  let errors = []
+  let firstNameError, lastNameError, dateOfBirthError, postcodeError, genderError
+
+  if (req.query.showErrors == 'yes') {
+    if (firstName === "") {
+      firstNameError = "Enter a first name"
+      errors.push({
+        text: firstNameError,
+        href: "#firstName"
+      })
+    }
+
+    if (lastName === "") {
+      lastNameError = "Enter a last name"
+      errors.push({
+        text: lastNameError,
+        href: "#lastName"
+      })
+    }
+
+    if (dateOfBirth.day === "" || dateOfBirth.month  === "" || dateOfBirth.year === "") {
+      dateOfBirthError = "Enter a date of birth"
+      errors.push({
+        text: dateOfBirthError,
+        href: "#dateOfBirth"
+      })
+    }
+
+    if (postcode === "") {
+      postcodeError = "Enter a postcode"
+      errors.push({
+        text: postcodeError,
+        href: "#postcode"
+      })
+    }
+
+    if (!gender) {
+      genderError = "Select an option"
+      errors.push({
+        text: genderError,
+        href: "#gender"
+      })
+    }
+  }
+
+  res.render('vaccinate/create-a-record', {
+    errors,
+    firstNameError,
+    lastNameError,
+    dateOfBirthError,
+    postcodeError,
+    genderError
+  })
+})
+
+
+  router.post('/vaccinate/create-a-record', (req, res) => {
+    const data = req.session.data
+    const firstName = req.session.data.firstName;
+    const lastName = req.session.data.lastName;
+    const dateOfBirth = req.session.data.dateOfBirth;
+    const postcode = req.session.data.postcode;
+    const gender = req.session.data.gender;
+
+    if (firstName != '' && lastName != '' && dateOfBirth.day != '' && dateOfBirth.month != '' && dateOfBirth.year != '' && postcode != '' && gender != '') {
+
+      res.redirect('/vaccinate/consent')
+    } else {
+      res.redirect('/vaccinate/create-a-record?showErrors=yes')
+    }
 
   })
 
+
   router.get('/vaccinate/patient-estimated-due-date', (req, res) => {
 
     const showError = req.query.showError

app/views/vaccinate/check.html

@@ -71,10 +71,15 @@ <h2 class="nhsuk-heading-m">Patient</h2>
               text: "Name"
             },
             value: {
-              text: data.patientName
+              text: (data.patientName if data.patientName else data.firstName + " " + data.lastName)
             },
             actions: {
               items: [
+                {
+                  href: "/vaccinate/create-a-record",
+                  text: "Change",
+                  visuallyHiddenText: "name"
+                } if not data.nhsNumber
               ]
             }
           },
@@ -87,6 +92,11 @@ <h2 class="nhsuk-heading-m">Patient</h2>
             },
             actions: {
               items: [
+                {
+                  href: "/vaccinate/create-a-record",
+                  text: "Change",
+                  visuallyHiddenText: "date of birth"
+                } if not data.nhsNumber
               ]
             }
           },
@@ -111,6 +121,11 @@ <h2 class="nhsuk-heading-m">Patient</h2>
             },
             actions: {
               items: [
+                {
+                  href: "/vaccinate/create-a-record",
+                  text: "Change",
+                  visuallyHiddenText: "postcode"
+                } if not data.nhsNumber
               ]
             }
           } if not data.nhsNumber,
@@ -125,7 +140,24 @@ <h2 class="nhsuk-heading-m">Patient</h2>
               items: [
               ]
             }
-          } if data.nhsNumber
+          } if data.nhsNumber,
+          {
+            key: {
+              text: "Gender"
+            },
+            value: {
+              text: data.gender
+            },
+            actions: {
+              items: [
+                {
+                  href: "/vaccinate/create-a-record",
+                  text: "Change",
+                  visuallyHiddenText: "gender"
+                } if not data.nhsNumber
+              ]
+            }
+          } if not data.nhsNumber
         ]
       }) }}
 

app/views/vaccinate/create-a-record.html

@@ -0,0 +1,156 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Continue with no NHS number" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% block beforeContent %}
+  {{ backLink({ href: "/vaccinate/no-search-result" }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      {% if errors and ((errors | length) > 0) %}
+        {{ errorSummary({
+          titleText: "There is a problem",
+          errorList: errors
+        }) }}
+      {% endif %}
+
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
+
+      <p> You need to {% if not data.postcode%} enter a postcode and {% endif %} select an option for gender. The vaccination record will only be sent to a GP if it can be matched with an NHS number later.</p>
+
+      <form action="/vaccinate/create-a-record" method="post">
+        {{ input({
+            label: {
+              text: "First name"
+            },
+            id: "firstName",
+            name: "firstName",
+            value: data.firstName,
+            classes: "nhsuk-input--width-20",
+            errorMessage: {
+              text: firstNameError
+            } if firstNameError
+        }) }}
+
+            {{ input({
+            label: {
+                text: "Last name"
+            },
+            id: "lastName",
+            name: "lastName",
+            value: data.lastName,
+            classes: "nhsuk-input--width-20",
+            errorMessage: {
+                text: lastNameError
+            } if lastNameError
+            }) }}
+
+            {{ dateInput({
+            id: "dateOfBirth",
+            namePrefix: "dateOfBirth",
+            fieldset: {
+                legend: {
+                text: "Date of birth",
+                classes: ""
+                }
+            },
+            hint: {
+                text: "For example, 15 3 1984"
+            },
+            errorMessage: {
+                text: dateOfBirthError
+            } if dateOfBirthError,
+            items: [
+                {
+                name: "day",
+                classes: "nhsuk-input--width-2 " + ("nhsuk-input--error" if dateOfBirthError else ""),
+                value: data.dateOfBirth.day
+                },
+                {
+                name: "month",
+                classes: "nhsuk-input--width-2 " + ("nhsuk-input--error" if dateOfBirthError else ""),
+                value: data.dateOfBirth.month
+                },
+                {
+                name: "year",
+                classes: "nhsuk-input--width-4 " + ("nhsuk-input--error" if dateOfBirthError else ""),
+                value: data.dateOfBirth.year
+                }
+            ]
+            }) }}
+
+            {{ input({
+            label: {
+                text: "Postcode"
+            },
+            id: "postcode",
+            name: "postcode",
+            value: data.postcode,
+            classes: "nhsuk-input--width-10",
+            errorMessage: {
+                text: postcodeError
+            } if postcodeError
+            }) }}
+
+            {{ details({
+                text: "If the patient is homeless",
+                HTML: "
+                <p>Enter the postcode ZZ99 3VZ </p>
+
+                "
+              }) }}
+
+            {{ radios({
+                idPrefix: "gender",
+                name: "gender",
+                value: data.gender,
+                fieldset: {
+                  legend: {
+                      text: "Gender"
+                  }
+                },
+                errorMessage: {
+                  text: genderError
+                } if genderError,
+                items: [
+                {
+                    value: "Male",
+                    text: "Male",
+                    checked: (data.gender === "Male")
+                },
+                {
+                    value: "Female",
+                    text: "Female",
+                    checked: (data.gender === "Female")
+                },
+                {
+                    value: "Other",
+                    text: "Other",
+                    checked: (data.gender === "Other")
+                },
+                {
+                    value: "Unknown",
+                    text: "Unknown",
+                    checked: (data.gender === "Unknown")
+                }
+                ]
+            }) }}
+
+
+        {{ button({
+          text: "Continue to vaccinate"
+        }) }}
+      </form>
+
+
+
+    </div>
+  </div>
+
+{% endblock %}
+