Replace close session with invite to clinic

Author: paulrobertlloyd

app/controllers/session.js

@@ -685,11 +685,11 @@ export const sessionController = {
     response.redirect(session.uri)
   },
 
-  close(request, response) {
+  inviteToClinic(request, response) {
     const { account } = request.app.locals
     const { session_id } = request.params
     const { data } = request.session
-    const { __ } = response.locals
+    const { __mf } = response.locals
 
     // Update session as closed
     const session = Session.update(session_id, { closed: true }, data)
@@ -701,11 +701,13 @@ export const sessionController = {
         programme_ids.some((id) => session.programme_ids.includes(id))
       )
 
+    // Find patients to invite to clinic
+    const patientSessionsForClinic = session.patientSessionsForClinic.map(
+      (patient) => patient.uuid
+    )
+
     // Move patients to clinic
     if (clinic) {
-      const patientSessionsForClinic = session.patientSessionsForClinic.map(
-        (patient) => patient.uuid
-      )
       for (const patientSession of patientSessionsForClinic) {
         const patient = Patient.findOne(patientSession.patient_uuid, data)
         patientSession.removeFromSession({
@@ -716,7 +718,12 @@ export const sessionController = {
       }
     }
 
-    request.flash('success', __(`session.close.success`, { session }))
+    request.flash(
+      'success',
+      __mf(`session.inviteToClinic.success`, {
+        count: patientSessionsForClinic.length
+      })
+    )
 
     response.redirect(session.uri)
   }

app/locales/en.js

@@ -1892,26 +1892,16 @@ export const en = {
         lastName: 'Last name'
       }
     },
-    close: {
-      title: 'Close session',
+    inviteToClinic: {
+      title: 'Invite parents to book a clinic appointment',
+      label: 'Send clinic invitations',
+      count:
+        '{count, plural, =0 {No children} one {1 child} other {# children}} were not vaccinated at this school and have not already been invited to a clinic.',
       description:
-        'All sessions for this school have been completed.\n\nWhen you close this session, the following children will be invited to community clinics:',
-      confirm: 'Close session',
-      success: '{{session.name}} has been closed'
-    },
-    closingSummary: {
-      noConsentRequest: {
-        count:
-          '{count, plural, =0 {No children} one {1 child} other {# children}} whose parents did not receive a consent request'
-      },
-      noConsentResponse: {
-        count:
-          '{count, plural, =0 {No children} one {1 child} other {# children}} whose parents did not give a consent response'
-      },
-      couldNotVaccinate: {
-        count:
-          '{count, plural, =0 {No children} one {1 child} other {# children}} who could not be vaccinated'
-      }
+        'You can send invitations to their parents to book an appointment to have their children vaccinated at a clinic.\n\nThe next clinic is on %s.',
+      confirm: 'Send clinic invitations',
+      success:
+        '{count, plural, =0 {No children} one {1 child} other {# children}} invited to the clinic'
     }
   },
   texts: {

app/models/session.js

@@ -641,31 +641,23 @@ export class Session {
   }
 
   /**
-   * Get closing summary
+   * Get patient sessions that can be moved to a clinic session
    *
-   * @returns {object} Closing summary
+   * @returns {Array<PatientSession>} Patient sessions
    */
-  get closingSummary() {
-    return {
-      noConsentRequest: this.patients.filter(
-        ({ consent }) => consent === ConsentOutcome.NotDelivered
-      ),
-      noConsentResponse: this.patients.filter(
-        ({ consent }) => consent === ConsentOutcome.NoResponse
-      ),
-      couldNotVaccinate: this.patients.filter(
-        ({ report }) => report !== PatientStatus.Vaccinated
-      )
-    }
+  get patientSessionsForClinic() {
+    return this.patients.filter(({ report }) => report === PatientStatus.Due)
   }
 
   /**
-   * Get patient sessions that can be moved to a clinic session
+   * Get next available clinic session
    *
-   * @returns {Array<PatientSession>} Patient sessions
+   * @returns {Session} Session
    */
-  get patientSessionsForClinic() {
-    return this.patients.filter(({ report }) => report === PatientStatus.Due)
+  get nextProgrammeClinic() {
+    return Session.findAll(this.context).find(
+      (session) => session.type === SessionType.Clinic
+    )
   }
 
   /**

app/routes/session.js

@@ -23,7 +23,7 @@ router.all('/:session_id/edit/:view', session.readForm('edit'))
 router.get('/:session_id/edit/:view', session.showForm)
 router.post('/:session_id/edit/:view', session.updateForm)
 
-router.post('/:session_id/close', session.close)
+router.post('/:session_id/invite-to-clinic', session.inviteToClinic)
 router.post('/:session_id/instructions', session.giveInstructions)
 router.post('/:session_id/offline', session.downloadFile)
 router.post('/:session_id/reminders', session.sendReminders)

app/views/session/close.njk

@@ -0,0 +1,17 @@
+{% extends "_layouts/form.njk" %}
+
+{% set title = __("session.inviteToClinic.title") %}
+{% set confirmButtonText = __("session.inviteToClinic.confirm") %}
+
+{% block form %}
+  {{ appHeading({
+    caption: session.location.name,
+    title: title
+  }) }}
+
+  {{ __mf("session.inviteToClinic.count", {
+    count: session.patientSessionsForClinic.length
+  }) | nhsukMarkdown }}
+
+  {{ __("session.inviteToClinic.description", session.nextProgrammeClinic.formatted.date) | nhsukMarkdown }}
+{% endblock %}

app/views/session/invite-to-clinic.njk

@@ -48,8 +48,8 @@
       },
       {
         classes: "nhsuk-button--secondary",
-        text: __("session.close.title"),
-        href: session.uri + "/close"
+        text: __("session.inviteToClinic.label"),
+        href: session.uri + "/invite-to-clinic"
       } if session.isCompleted
     ],
     links: [{