Clinic setup pt2 (#246)

Main changes are:

* Added all clinic locations to the default team
* Switch between radios and autocomplete depending on number of clinic locations
* Various bug fixes and robustness measures

Squashed commit messages:

* Fix "undefined" in clinic session page's caption

Was trying to show the year groups, but that's a school session only thing.

* Use autocomplete for clinic selection with many clinics

Use radio buttons with 16 or fewer clinics, or the autocomplete search field over that.

* Give the 'default' clinic a specific name and address

* Give the Coventry team all of its clinic locations

Now that we let the user choose a location, we're fine to show all of them.

* Reduce the number of faked clinic bookings to keep on top of memory issues.

* Improve the content on the vaccination periods page

* Make clinic setup robust to lack of date entry

Previously, the lack of a date would cause the recording of session start and end times to fail, as the Date object we wanted to create was invalid with only times in it.

* If vaccinator counts are consistent, simplify check-answers

* Take the MMR consent comms question out of clinics

* Content refinements for the vaccination-periods page.

As suggested by EmmaH-F.

Author: malross

app/controllers/session.js

@@ -24,7 +24,11 @@ import {
   Session,
   Team
 } from '../models.js'
-import { getDateValueDifference } from '../utils/date.js'
+import {
+  convertIsoDateToObject,
+  getDateValueDifference,
+  today
+} from '../utils/date.js'
 import { getResults, getPagination } from '../utils/pagination.js'
 import { getSessionYearGroups } from '../utils/session.js'
 import { formatYearGroup } from '../utils/string.js'
@@ -563,7 +567,8 @@ export const sessionController = {
               [`/${session_id}/${type}/appointment-length`]: {}
             }),
         //[`/${session_id}/${type}/date-check`]: {},
-        ...(session.presetNames?.includes(SessionPresetName.MMR)
+        ...(session.presetNames?.includes(SessionPresetName.MMR) &&
+        session.type === SessionType.School
           ? {
               [`/${session_id}/${type}/mmr-consent`]: {}
             }
@@ -587,17 +592,28 @@ export const sessionController = {
       response.locals.paths.next =
         response.locals.paths.next || `${session.uri}/new/check-answers`
 
-      response.locals.clinicIdItems = Object.values(team.clinics)
-        .map((clinic) => new Clinic(clinic))
-        .map((clinic) => ({
-          text: clinic.name,
-          value: clinic.id,
-          ...(clinic.address && {
-            attributes: {
-              'data-hint': clinic.formatted.address
-            }
-          })
-        }))
+      // Set up different methods for clinic selection, based on number of clinics
+      if (session.type === SessionType.Clinic) {
+        const usableNumberOfRadios = 16
+        if (team.clinics.length <= usableNumberOfRadios) {
+          response.locals.clinicRadios = Object.values(team.clinics)
+            .map((clinic) => new Clinic(clinic))
+            .map((clinic) => ({
+              text: clinic.name,
+              value: clinic.id,
+              ...(clinic.address && {
+                attributes: {
+                  'data-hint': clinic.formatted.address
+                },
+                hint: {
+                  text: clinic.formatted.address
+                }
+              })
+            }))
+        } else {
+          response.locals.clinics = Clinic.findAll(data)
+        }
+      }
 
       if (session.type === SessionType.School) {
         const schools = School.findAll(data)
@@ -667,11 +683,14 @@ export const sessionController = {
         for (const [period_id, vaccinationPeriod] of Object.entries(
           request.body.vaccinationPeriods
         )) {
+          const sessionDate_ = session.date
+            ? session.date_
+            : convertIsoDateToObject(today())
           ClinicVaccinationPeriod.update(
             period_id,
             _.merge(
-              // make sure we keep up to date with the session date
-              { startAt_: session.date_, endAt_: session.date_ },
+              // make sure the period start and end have date information as well as time
+              { startAt_: { ...sessionDate_ }, endAt_: { ...sessionDate_ } },
               vaccinationPeriod
             ),
             data.wizard

app/datasets/clinics.js

@@ -439,8 +439,10 @@ export default {
   },
   X99999: {
     id: 'X99999',
-    name: 'Community clinic',
-    addressLevel1: 'Coventry',
+    name: 'The Kenilworth Centre',
+    addressLine1: 'Abbey End',
+    addressLevel1: 'Kenilworth',
+    postalCode: 'CV8 1QJ',
     team_id: '001',
     presetNames
   }

app/datasets/teams.js

@@ -1,3 +1,4 @@
+import clinics from './clinics.js'
 import schools from './schools.js'
 
 export default [
@@ -9,7 +10,9 @@ export default [
     tel: '01632 960000',
     privacyPolicyUrl: 'https://www.covwarkpt.nhs.uk/download.cfm?ver=8286',
     password: 'secret',
-    clinic_ids: ['X99999'],
+    clinic_ids: Object.values(clinics)
+      .filter((clinic) => clinic.team_id == '001')
+      .map((clinic) => clinic.id),
     school_ids: Object.keys(schools)
   }
 ]

app/locales/en.js

@@ -2186,11 +2186,15 @@ export const en = {
       title: 'Which year groups do you want to invite to this session?'
     },
     clinic: {
-      label: 'Clinic',
-      title: 'Where is this community clinic taking place?'
+      label: 'Clinic location',
+      title: 'Where is this community clinic taking place?',
+      search: {
+        label: 'Select a clinic location'
+      }
     },
     vaccinationPeriods: {
       title: 'When will the session start and end?',
+      hint: 'Parents will be able to book appointments between these times.',
       label: 'Vaccination period(s)',
       period: {
         title: 'Vaccination period %d',
@@ -2208,7 +2212,7 @@ export const en = {
       },
       addPeriod: {
         description:
-          'Adding multiple vaccination periods will allow you to schedule breaks and to vary staffing levels across the session.',
+          'Adding more than one time period allows you to schedule breaks and vary staffing levels across the session.',
         label: 'Add another period'
       }
     },

app/models/clinic.js

@@ -23,6 +23,19 @@ export class Clinic extends Location {
     return `/teams/${this.team_id}/clinics/${this.id}`
   }
 
+  /**
+   * Find all
+   *
+   * @param {object} context - Context
+   * @returns {Array<Clinic>|undefined} All clinics on the context
+   * @static
+   */
+  static findAll(context) {
+    return Object.values(context.clinics).map(
+      (clinic) => new Clinic(clinic, context)
+    )
+  }
+
   /**
    * Find one
    *

app/views/session/form/check-answers.njk

@@ -56,7 +56,9 @@
       session won't find them on its global context
     #}
     {% set startAndEndTimes = "" %}
-    {% set vaccinatorCount = vaccinationPeriods[0].vaccinatorCount if vaccinationPeriods.length === 1 else "" %}
+    {% set vaccinatorCounts = "" %}
+    {% set lastVaccinatorCount = -1 %}
+    {% set hasVariableVaccinatorCounts = false %}
     {% set totalSlots = 0 %}
     {% for vaccinationPeriod in vaccinationPeriods %}
       {% set thisPeriod = __("session.vaccinators.input.singlePeriodLabel", {
@@ -71,10 +73,15 @@
 
       {% set totalSlots = totalSlots + vaccinationPeriod.appointmentCount(session.appointmentLength) %}
 
-      {% if vaccinationPeriods.length > 1 %}
-        {% set vaccinatorCount = vaccinatorCount + vaccinationPeriod.vaccinatorCount + " from " + thisPeriod + "<br>" %}
+      {% set vaccinatorCounts = vaccinatorCounts + vaccinationPeriod.vaccinatorCount + " from " + thisPeriod + "<br>" %}
+      {% if lastVaccinatorCount !== -1 and lastVaccinatorCount !== vaccinationPeriod.vaccinatorCount %}
+        {% set hasVariableVaccinatorCounts = true %}
       {% endif %}
+      {% set lastVaccinatorCount = vaccinationPeriod.vaccinatorCount %}
     {% endfor %}
+    {% if not hasVariableVaccinatorCounts %}
+      {% set vaccinatorCounts = lastVaccinatorCount %}
+    {% endif %}
 
     {{ summaryList({
       card: {
@@ -103,7 +110,7 @@
         },
         vaccinators: {
           href: session.uri + "/new/vaccinators",
-          value: vaccinatorCount
+          value: vaccinatorCounts
         },
         appointmentLength: {
           href: session.uri + "/new/appointment-length"

app/views/session/form/clinic.njk

@@ -3,15 +3,23 @@
 {% set title = __("session.clinic.title") %}
 
 {% block form %}
-  {{ radios({
-    fieldset: {
-      legend: {
-        isPageHeading: true,
-        text: title,
-        size: "l"
+  {{ appHeading({
+    title: title
+  }) }}
+
+  {% if clinicRadios %}
+    {{ radios({
+      items: clinicRadios,
+      decorate: "session.clinic_id"
+    })}}
+  {% else %}
+    {{ select({
+      label: { text: __("session.clinic.search.label") },
+      items: locationItems(clinics, session.clinic_id),
+      decorate: "session.clinic_id",
+      attributes: {
+        "data-module": "app-autocomplete"
       }
-    },
-    items: clinicIdItems,
-    decorate: "session.clinic_id"
-  })}}
+    }) }}
+  {% endif %}
 {% endblock %}

app/views/session/form/vaccination-periods.njk

@@ -6,8 +6,10 @@
 {% block form %}
   {{ appHeading({
     title: title
-  })}}
+  }) }}
 
+  {{ __("session.vaccinationPeriods.hint") | nhsukMarkdown }}
+  
   {% for vaccinationPeriod in vaccinationPeriods %}
     {% call fieldset({
       legend: {

app/views/session/show.njk

@@ -2,7 +2,9 @@
 
 {% set title = session.shortName %}
 {% set heading = title %}
-{% set caption = session.formatted.date + " – " + session.formatted.yearGroups %}
+{% set caption = session.formatted.date
+   + (" – " + session.formatted.yearGroups if session.type === SessionType.School)
+%}
 
 {% block content %}
   {{ warningCallout({

lib/create-data.js

@@ -70,7 +70,7 @@ import { generateDataFile } from './generate-data-file.js'
 const totalUsers = Number(process.env.USERS) || 20
 const totalTeams = Number(process.env.TEAMS) || 5
 const totalBatches = Number(process.env.BATCHES) || 100
-const totalClinicBookings = Number(process.env.CLINIC_BOOKINGS) || 20
+const totalClinicBookings = Number(process.env.CLINIC_BOOKINGS) || 10
 const totalPatients = Number(process.env.RECORDS) || 4000
 
 // Context