Implement meeting reschedule and cancel flows

app/routes/meetings.js

@@ -743,9 +743,12 @@
         var selected = [].concat(data[selectedKey] || []).filter(function(p){ return p && p !== '_unchecked' })
         persons.forEach(function(p){
             if (!p) return
-            var name = (p.first_name || '').trim()
-            var role = (p.last_name || '').trim()
-            if (!name && !role) return
+            var first = (p.first_name || '').trim()
+            var last = (p.last_name || '').trim()
+            var role = (p.role || '').trim()
+            if (!first && !last && !role) return
+            // Display as "LASTNAME, Firstname" to match the predefined options.
+            var name = last ? (last.toUpperCase() + (first ? ', ' + first : '')) : first
             var label = role ? (name + ' (' + role + ')') : name
             if (pool.indexOf(label) === -1) pool.push(label)
             if (selected.indexOf(label) === -1) selected.push(label)
@@ -756,19 +759,90 @@
 
     // --- Confirm meeting arrangements flow (shared: bfs, v50, v51) ---
 
+    // The reschedule flow reuses the confirm-arrangements edit pages. When the
+    // user is rescheduling, changeMode edits must return to the reschedule
+    // check-answers page (not confirm-arrangements) and mark that a change was made.
+    var rescheduleCheckAnswers = '/bfs/meetings-2/rescheduled/check-answers'
+
+    // Arriving on the reschedule check-answers page. ?start=true means a fresh
+    // entry from the arranged/rescheduled state, so reset the "changed" flag and
+    // snapshot the current arrangement into previous_* keys so the rescheduled
+    // view can show what was previously arranged.
+    var rescheduleSnapshotKeys = ['meetingDate','meetingHour','meetingMinutes','meetingRequestedBy','meetingFormat','meetingLocationType','cpsLocation','magistratesLocation','crownLocation','policeStationLocation','otherLocation','attendees','meetingLead','interpreterNeeded','interpreterDetails','supportPersonNeeded','supportPersonDetails','otherSupportNeeds']
+    router.get(rescheduleCheckAnswers, function(request, response, next) {
+        var data = request.session.data
+        if (request.query.start === 'true') {
+            data['rescheduleChanged'] = ''
+            rescheduleSnapshotKeys.forEach(function(key){
+                data['previous_' + key] = data[key]
+            })
+        }
+        data['rescheduleMode'] = 'true'
+        next()
+    })
+
+    // Confirm the (possibly unchanged) reschedule details. Only when a change
+    // was made do we ask for a reason before returning to the Meetings sub-tab.
+    router.post('/bfs/meetings-2/rescheduled/check-answers-answer', function(request, response) {
+        var data = request.session.data
+        var changed = data['rescheduleChanged'] === 'true'
+        data['rescheduleMode'] = ''
+        if (changed) {
+            return response.redirect('/bfs/meetings-2/rescheduled/reason-why')
+        }
+        data['rescheduleChanged'] = ''
+        response.redirect('/bfs/victim/index?secondaryNav=ptm&meetingState=arranged#communications')
+    })
+
+    // After capturing the reason for change, return to the Meetings sub-tab in
+    // the rescheduled state.
+    router.post('/bfs/meetings-2/rescheduled/reason-why-answer', function(request, response) {
+        request.session.data['rescheduleChanged'] = ''
+        request.session.data['meetingRescheduled'] = 'true'
+        response.redirect('/bfs/victim/index?secondaryNav=ptm&meetingState=rescheduled&meetingSuccess=yes#communications')
+    })
+
+    // Cancel flow: capture when the meeting was cancelled, then ask for a reason.
+    router.post('/bfs/meetings-2/cancelled/meeting-date-answer', function(request, response) {
+        response.redirect('/bfs/meetings-2/cancelled/reason-why')
+    })
+
+    // Cancel flow: after capturing the reason, return to the Meetings sub-tab in
+    // the cancelled state.
+    router.post('/bfs/meetings-2/cancelled/reason-why-answer', function(request, response) {
+        response.redirect('/bfs/victim/index?secondaryNav=ptm&meetingState=cancelled&meetingSuccess=yes#communications')
+    })
+
+    // Where a confirm-arrangements answer route should return after a Change.
+    // In reschedule mode it returns to the reschedule check-answers and records
+    // that a change was made.
+    function caCheckAnswersTarget(request, caBase) {
+        if (request.session.data['rescheduleMode'] === 'true') {
+            request.session.data['rescheduleChanged'] = 'true'
+            return rescheduleCheckAnswers
+        }
+        return caBase + 'check-answers'
+    }
+
     // When a "Change" link on check-answers is used, ?changeMode=true is stored
     // in the session; each answer route returns to check-answers instead of
     // advancing the flow.
     function caChangeReturn(request, response, caBase, nextUrl) {
         if (request.session.data['changeMode'] === 'true') {
             request.session.data['changeMode'] = ''
-            return response.redirect(caBase + 'check-answers')
+            return response.redirect(caCheckAnswersTarget(request, caBase))
         }
         response.redirect(nextUrl)
     }
 
     function registerConfirmArrangements(caBase) {
 
+    // Loading the normal arrange check-answers means we are not rescheduling.
+    router.get(caBase + 'check-answers', function(request, response, next) {
+        request.session.data['rescheduleMode'] = ''
+        next()
+    })
+
     router.post(caBase + 'who-requested-meeting-answer', function(request, response) {
         var data = request.session.data
         if (!data['meetingRequestedBy']){
@@ -804,7 +878,7 @@
                 return response.redirect(caBase + 'meeting-location?changeMode=true')
             }
             data['changeMode'] = ''
-            return response.redirect(caBase + 'check-answers')
+            return response.redirect(caCheckAnswersTarget(request, caBase))
         }
         if (needsLocation){
             response.redirect(caBase + 'meeting-location')
@@ -848,6 +922,18 @@
         caChangeReturn(request, response, caBase, caBase + 'support-needs')
     })
 
+    // "Add another person" submits the attendees form so the current checkbox
+    // selections are saved to the session before navigating to the add page.
+    router.post(caBase + 'attendees-add-another', function(request, response) {
+        response.redirect(caBase + 'add-attendee')
+    })
+
+    // "Add another person" submits the meeting-lead form so the current lead
+    // selection is saved to the session before navigating to the add page.
+    router.post(caBase + 'meeting-lead-add-another', function(request, response) {
+        response.redirect(caBase + 'add-meeting-lead')
+    })
+
     // Custom attendee added on the attendees page -> becomes a selected attendee
     router.post(caBase + 'add-attendee-answer', function(request, response) {
         appendAddedPeople(request, 'addedAttendees', 'attendees')
@@ -871,10 +957,12 @@
         data['interpreterNeededError'] = ''
         data['supportPersonNeededError'] = ''
         data['changeMode'] = ''
-        response.redirect(caBase + 'check-answers')
+        response.redirect(caCheckAnswersTarget(request, caBase))
     })
 
     router.post(caBase + 'check-answers-answer', function(request, response) {
+        // A freshly arranged meeting has no prior arrangement to show as previous.
+        request.session.data['meetingRescheduled'] = ''
         if (caBase.indexOf('/bfs') === 0) {
             response.redirect('/bfs/victim/index?secondaryNav=ptm&meetingState=arranged&meetingSuccess=yes#communications')
         } else {

app/views/bfs/meetings-2/cancelled/meeting-date.html

@@ -16,20 +16,20 @@
 
     <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
 
-    <form action="/v20/record/telephone-call-2-details-answer" method="post" accept-charset="UTF-8" id="myForm" name="myForm" onsubmit="return validateForm()">
+    <form action="/bfs/meetings-2/cancelled/meeting-date-answer" method="post" accept-charset="UTF-8" id="myForm" name="myForm">
 
       <div class="govuk-form-group" id="error-form-group-1">
-        <label class="govuk-label govuk-label--m" for="telephone-call-date-2">
+        <label class="govuk-label govuk-label--m" for="cancel-date">
           Date
         </label>
 
-        <div class="govuk-hint" id="telephone-call-date-hint-2">
+        <div class="govuk-hint" id="cancel-date-hint">
           Use the date picker or enter a date. For example, 17/05/2025.
         </div>
 
-        <div class="moj-datepicker" id="telephone-call-date-picker" data-module="moj-date-picker" data-excluded-days="saturday sunday">
+        <div class="moj-datepicker" id="cancel-date-picker" data-module="moj-date-picker" data-excluded-days="saturday sunday">
 
-          <input type="text" class="govuk-input moj-js-datepicker-input" id="telephone-call-date-2" name="telephoneCallDate2" autocomplete="off" aria-describedby="telephone-call-date-hint-2" value="{% if data['changeMode'] == 'true' %}{{ data['telephoneCallDate2'] }}{% endif %}" />
+          <input type="text" class="govuk-input moj-js-datepicker-input" id="cancel-date" name="cancelDate" autocomplete="off" aria-describedby="cancel-date-hint" value="{{ data['cancelDate'] }}" />
         </div>
       </div>
 
@@ -47,10 +47,10 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
 
             <div class="govuk-date-input__item" style="margin-right: 10px;">
               <div class="govuk-form-group">
-                <label class="govuk-label govuk-date-input__label" for="call-hour-2">
+                <label class="govuk-label govuk-date-input__label" for="cancel-hour">
                   Hour
                 </label>
-                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="call-hour-2" name="callHour2" type="text" inputmode="numeric">
+                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="cancel-hour" name="cancelHour" type="text" inputmode="numeric" value="{{ data['cancelHour'] }}">
               </div>
             </div>
             <div class="govuk-date-input__item" style="margin-right: 10px;">
@@ -59,10 +59,10 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
 
             <div class="govuk-date-input__item">
               <div class="govuk-form-group">
-                <label class="govuk-label govuk-date-input__label" for="call-minutes-2">
+                <label class="govuk-label govuk-date-input__label" for="cancel-minutes">
                   Minutes
                 </label>
-                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="call-minutes-2" name="callMinutes2" type="text" inputmode="numeric">
+                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="cancel-minutes" name="cancelMinutes" type="text" inputmode="numeric" value="{{ data['cancelMinutes'] }}">
               </div>
             </div>
 
@@ -71,9 +71,7 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
       </div>
 
       <div class="govuk-button-group">
-        <a href="reason-why" class="govuk-button govuk-button--primary govuk-!-margin-bottom-2" data-module="govuk-button">
-          Continue<span class="govuk-visually-hidden"> to offer a CPS pre-trial meeting</span>
-        </a>
+        {{ govukButton({ text: "Continue" }) }}
       </div>
     </form>
   </div>

app/views/bfs/meetings-2/cancelled/reason-why.html

@@ -14,94 +14,43 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-one-half">
 
-    {% from "govuk/components/radios/macro.njk" import govukRadios %}
-    {% from "govuk/components/input/macro.njk" import govukInput %}
-
-    {% set emailHtml %}
-    {{ govukInput({
-  id: "contact-by-email",
-  name: "contactByEmail",
-  type: "email",
-  autocomplete: "email",
-  spellcheck: false,
-  classes: "govuk-!-width-one-third",
-  label: {
-    text: "Email address"
-  }
-}) }}
-    {% endset -%}
-
-    {% set phoneHtml %}
-    {{ govukInput({
-  id: "contact-by-phone",
-  name: "contactByPhone",
-  type: "tel",
-  autocomplete: "tel",
-  classes: "govuk-!-width-one-third",
-  label: {
-    text: "Phone number"
-  }
-}) }}
-    {% endset -%}
-
-    {% set textHtml %}
-    {{ govukTextarea ({
-  id: "contact-by-text",
-  name: "contactByText",
-  type: "tel",
-  autocomplete: "tel",
-  classes: "govuk-input--width-20",
-  label: {
-    text: "Provide details"
-  }
-}) }}
+    {% set otherHtml %}
+    {{ govukTextarea({
+      id: "cancel-reason-other",
+      name: "cancelReasonOther",
+      label: { text: "Provide details" }
+    }) }}
     {% endset -%}
 
-    {{ govukRadios({
-  name: "contact",
-  fieldset: {
-    legend: {
-      text: "What is the reason for cancelling the meeting?",
-      isPageHeading: true,
-      classes: "govuk-fieldset__legend--l"
-    }
-  },
-
-  items: [
-    {
-      value: "email",
-      text: "Sarah Phillips's bereaved family withdrew"
-
-
-    },
-    {
-      value: "phone",
-      text: "Meeting created in error"
-    },
-     {
-      value: "phone",
-      text: "Change of court date"
-    },
-    {
-      value: "phone",
-      text: "No longer required"
-    },
-    {
-      value: "text",
-      text: "Other",
-      conditional: {
-        html: textHtml
-      }
-    }
-  ]
-}) }}
-
-    <div class="govuk-button-group">
-
-      <a href="/bfs/victim/index?secondaryNav=ptm&meetingState=cancelled&meetingSuccess=yes#communications" class="govuk-button govuk-button--primary govuk-!-margin-bottom-2" data-module="govuk-button">
-        Continue<span class="govuk-visually-hidden"> to offer a CPS pre-trial meeting</span>
-      </a>
-    </div>
+    <form action="/bfs/meetings-2/cancelled/reason-why-answer" method="post" accept-charset="UTF-8">
+
+      {{ govukRadios({
+        name: "cancelReason",
+        fieldset: {
+          legend: {
+            text: "What is the reason for cancelling the meeting?",
+            isPageHeading: true,
+            classes: "govuk-fieldset__legend--l"
+          }
+        },
+        items: [
+          { value: "Sarah Phillips's bereaved family withdrew", text: "Sarah Phillips's bereaved family withdrew" },
+          { value: "Meeting created in error", text: "Meeting created in error" },
+          { value: "Change of court date", text: "Change of court date" },
+          { value: "No longer required", text: "No longer required" },
+          {
+            value: "Other",
+            text: "Other",
+            conditional: {
+              html: otherHtml
+            }
+          }
+        ]
+      }) }}
+
+      <div class="govuk-button-group">
+        {{ govukButton({ text: "Continue" }) }}
+      </div>
     </form>
   </div>
 </div>

app/views/bfs/meetings-2/confirm-arrangements/add-attendee.html

@@ -21,14 +21,19 @@ <h2 class="govuk-heading-l moj-add-another__heading" tabindex="-1">Who is invite
         <fieldset class="govuk-fieldset moj-add-another__item">
           <div class="govuk-form-group">
             <label class="govuk-label govuk-!-font-weight-bold" for="person[0][first_name]">
-              Name </label>
+              First name </label>
             <input class="govuk-input" id="person[0][first_name]" name="person[0][first_name]" type="text" data-name="person[%index%][first_name]" data-id="person[%index%][first_name]">
           </div>
           <div class="govuk-form-group">
             <label class="govuk-label govuk-!-font-weight-bold" for="person[0][last_name]">
+              Last name </label>
+            <input class="govuk-input" id="person[0][last_name]" name="person[0][last_name]" type="text" data-name="person[%index%][last_name]" data-id="person[%index%][last_name]">
+          </div>
+          <div class="govuk-form-group">
+            <label class="govuk-label govuk-!-font-weight-bold" for="person[0][role]">
               Role
             </label>
-            <input class="govuk-input" id="person[0][last_name]" name="person[0][last_name]" type="text" data-name="person[%index%][last_name]" data-id="person[%index%][last_name]">
+            <input class="govuk-input" id="person[0][role]" name="person[0][role]" type="text" data-name="person[%index%][role]" data-id="person[%index%][role]">
           </div>
 
         </fieldset>

app/views/bfs/meetings-2/confirm-arrangements/add-meeting-lead.html

@@ -21,14 +21,19 @@ <h2 class="govuk-heading-l moj-add-another__heading" tabindex="-1">Who will be t
         <fieldset class="govuk-fieldset moj-add-another__item">
           <div class="govuk-form-group">
             <label class="govuk-label govuk-!-font-weight-bold" for="person[0][first_name]">
-              Name </label>
+              First name </label>
             <input class="govuk-input" id="person[0][first_name]" name="person[0][first_name]" type="text" data-name="person[%index%][first_name]" data-id="person[%index%][first_name]">
           </div>
           <div class="govuk-form-group">
             <label class="govuk-label govuk-!-font-weight-bold" for="person[0][last_name]">
+              Last name </label>
+            <input class="govuk-input" id="person[0][last_name]" name="person[0][last_name]" type="text" data-name="person[%index%][last_name]" data-id="person[%index%][last_name]">
+          </div>
+          <div class="govuk-form-group">
+            <label class="govuk-label govuk-!-font-weight-bold" for="person[0][role]">
               Role
             </label>
-            <input class="govuk-input" id="person[0][last_name]" name="person[0][last_name]" type="text" data-name="person[%index%][last_name]" data-id="person[%index%][last_name]">
+            <input class="govuk-input" id="person[0][role]" name="person[0][role]" type="text" data-name="person[%index%][role]" data-id="person[%index%][role]">
           </div>
 
         </fieldset>