Add change-mode meeting prefill flow

app/filters.js

@@ -120,4 +120,25 @@ addFilter('sortPcdDecisions', decisions => {
     if (dateA !== dateB) return dateB.localeCompare(dateA)
     return (b.loggedAt || 0) - (a.loggedAt || 0)
   })
+})
+
+// Map a meetingPurpose code to its display label. Pass meetingPurposeDetails as
+// the second argument so "other" resolves to the free-text description.
+addFilter('meetingPurposeLabel', (purpose, details) => {
+  const labels = {
+    'pre-trial': 'CPS pre-trial meeting',
+    'pre-charge': 'Pre-charge meeting',
+    'charging-decision': 'Inform victim about charging decision',
+    'charging-decision-family': 'Inform bereaved family about charging decision',
+    'conviction': 'Conviction meeting',
+    'sentencing': 'Sentencing meeting',
+    'acquittal': 'Acquittal meeting',
+    'stopped-altered': 'Stopped or substantially altered charge (VCL Scheme)',
+    'vrr': "Victims' Right to Review (VRR)",
+    'joint': 'Joint CPS and Police meeting',
+    'lesser-offence': 'Lesser offence meeting',
+    'complaint': 'Bereaved family complaint',
+    'other': details || 'Other'
+  }
+  return labels[purpose] || 'CPS pre-trial meeting'
 })

app/routes/meetings.js

@@ -2,6 +2,18 @@
 
 module.exports = router => {
 
+    // Pre-population across /bfs/meetings-2 flows is only wanted when the user
+    // arrives via a "Change" link (which carries ?changeMode=true). On every
+    // other GET into the flow we clear the flag so forms render blank.
+    // The kit copies session.data into res.locals.data BEFORE this handler runs,
+    // so both must be updated for templates on this request to see the value.
+    router.get('/bfs/meetings-2/*', function(request, response, next) {
+        var val = request.query.changeMode === 'true' ? 'true' : ''
+        request.session.data['changeMode'] = val
+        response.locals.data.changeMode = val
+        next()
+    })
+
     // meetings
 
     router.post('/v60/wft-meetings/new-task/next-task-answer', function(request, response) {
@@ -33,7 +45,7 @@
     })
 
 
-          router.post('/bfs/meetings-2//meetings-2/logging-answer', function(request, response) {
+          router.post('/bfs/meetings-2/logging-answer', function(request, response) {
 
         var logging = request.session.data['logging']
         if (logging == "yes"){
@@ -743,6 +755,18 @@
     }
 
     // --- Confirm meeting arrangements flow (shared: bfs, v50, v51) ---
+
+    // 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')
+        }
+        response.redirect(nextUrl)
+    }
+
     function registerConfirmArrangements(caBase) {
 
     router.post(caBase + 'who-requested-meeting-answer', function(request, response) {
@@ -751,7 +775,7 @@
             return response.redirect(caBase + 'who-requested-meeting?meetingRequestedByError=yes')
         }
         data['meetingRequestedByError'] = ''
-        response.redirect(caBase + 'meeting-date')
+        caChangeReturn(request, response, caBase, caBase + 'meeting-date')
     })
 
     router.post(caBase + 'meeting-date-answer', function(request, response) {
@@ -764,7 +788,7 @@
         }
         data['meetingDateError'] = ''
         data['meetingTimeError'] = ''
-        response.redirect(caBase + 'meeting-format')
+        caChangeReturn(request, response, caBase, caBase + 'meeting-format')
     })
 
     router.post(caBase + 'meeting-format-answer', function(request, response) {
@@ -773,10 +797,19 @@
             return response.redirect(caBase + 'meeting-format?meetingFormatError=yes')
         }
         data['meetingFormatError'] = ''
-        if (data['meetingFormat'] == 'virtual'){
-            response.redirect(caBase + 'attendees')
-        } else {
+        var needsLocation = data['meetingFormat'] != 'virtual'
+        if (data['changeMode'] === 'true'){
+            // Changing the format may require a (new) location before returning.
+            if (needsLocation && !data['meetingLocationType']){
+                return response.redirect(caBase + 'meeting-location?changeMode=true')
+            }
+            data['changeMode'] = ''
+            return response.redirect(caBase + 'check-answers')
+        }
+        if (needsLocation){
             response.redirect(caBase + 'meeting-location')
+        } else {
+            response.redirect(caBase + 'attendees')
         }
     })
 
@@ -793,7 +826,7 @@
         }
         data['meetingLocationTypeError'] = ''
         data['meetingLocationDetailError'] = ''
-        response.redirect(caBase + 'attendees')
+        caChangeReturn(request, response, caBase, caBase + 'attendees')
     })
 
     router.post(caBase + 'attendees-answer', function(request, response) {
@@ -803,7 +836,7 @@
             return response.redirect(caBase + 'attendees?attendeesError=yes')
         }
         data['attendeesError'] = ''
-        response.redirect(caBase + 'meeting-lead')
+        caChangeReturn(request, response, caBase, caBase + 'meeting-lead')
     })
 
     router.post(caBase + 'meeting-lead-answer', function(request, response) {
@@ -812,7 +845,7 @@
             return response.redirect(caBase + 'meeting-lead?meetingLeadError=yes')
         }
         data['meetingLeadError'] = ''
-        response.redirect(caBase + 'support-needs')
+        caChangeReturn(request, response, caBase, caBase + 'support-needs')
     })
 
     // Custom attendee added on the attendees page -> becomes a selected attendee
@@ -837,6 +870,7 @@
         }
         data['interpreterNeededError'] = ''
         data['supportPersonNeededError'] = ''
+        data['changeMode'] = ''
         response.redirect(caBase + 'check-answers')
     })
 

app/views/bfs/meetings-2/age.html

@@ -28,21 +28,21 @@ <h1 class="govuk-fieldset__heading">
           <div class="govuk-radios" id="radio-group">
 
             <div class="govuk-radios__item">
-              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-phone" name="attemptToContactAgain" value="Call" {{ checked('attemptToContactAgain','Phone') }}>
+              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-phone" name="attemptToContactAgain" value="Call" {% if data['changeMode'] == 'true' %}{{ checked('attemptToContactAgain','Phone') }}{% endif %}>
               <label class="govuk-label govuk-radios__label" for="attempt-to-contact-again-phone">
                 CPS pre trial meeting
               </label>
             </div>
 
             <div class="govuk-radios__item">
-              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-email" name="attemptToContactAgain" value="Email" {{ checked('attemptToContactAgain','Email') }} aria-describedby="attempt-to-contact-again-email-hint">
+              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-email" name="attemptToContactAgain" value="Email" {% if data['changeMode'] == 'true' %}{{ checked('attemptToContactAgain','Email') }}{% endif %} aria-describedby="attempt-to-contact-again-email-hint">
               <label class="govuk-label govuk-radios__label" for="attempt-to-contact-again-email">
                 Inform victim about charging decision
               </label>
             </div>
 
             <div class="govuk-radios__item">
-              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-post" name="attemptToContactAgain" value="Post" {{ checked('attemptToContactAgain','Post') }} aria-describedby="attempt-to-contact-again-post-hint">
+              <input type="radio" class="govuk-radios__input" id="attempt-to-contact-again-post" name="attemptToContactAgain" value="Post" {% if data['changeMode'] == 'true' %}{{ checked('attemptToContactAgain','Post') }}{% endif %} aria-describedby="attempt-to-contact-again-post-hint">
               <label class="govuk-label govuk-radios__label" for="attempt-to-contact-again-post">
                 Bereavement meeting
               </label>

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

@@ -29,7 +29,7 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
 
         <div class="moj-datepicker" id="telephone-call-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="{{ data['telephoneCallDate2'] }}" />
+          <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 %}" />
         </div>
       </div>
 

app/views/bfs/meetings-2/choose-meeting.html

@@ -18,7 +18,7 @@
 
       {{ govukRadios({
       name: "meeting2",
-      value: data['meeting2'],
+      value: data['meeting2'] if data['changeMode'] == 'true',
       fieldset: {
         legend: {
           text: "Arrange details for an offered meeting",

app/views/bfs/meetings-2/confirm-arrangements/attendees-updated.html

@@ -47,49 +47,49 @@ <h1 class="govuk-fieldset__heading">
         <input type="hidden" name="attendees" value="_unchecked">
         <div class="govuk-checkboxes" data-module="govuk-checkboxes">
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-1" name="attendees" type="checkbox" value="BIDWELL, Jane (Family liaison officer)" {{ checked("attendees", "BIDWELL, Jane (Family liaison officer)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-1" name="attendees" type="checkbox" value="BIDWELL, Jane (Family liaison officer)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "BIDWELL, Jane (Family liaison officer)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-1">
               BIDWELL, Jane (Family liaison officer)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-2" name="attendees" type="checkbox" value="SAKAMOTO, Hadji (Independent domestic violence adviser (IDVA))" {{ checked("attendees", "SAKAMOTO, Hadji (Independent domestic violence adviser (IDVA))") }}>
+            <input class="govuk-checkboxes__input" id="attendees-2" name="attendees" type="checkbox" value="SAKAMOTO, Hadji (Independent domestic violence adviser (IDVA))" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "SAKAMOTO, Hadji (Independent domestic violence adviser (IDVA))") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-2">
               SAKAMOTO, Hadji (Independent domestic violence adviser (IDVA))
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-3" name="attendees" type="checkbox" value="HAMER, Olivia (Counsel)" {{ checked("attendees", "HAMER, Olivia (Counsel)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-3" name="attendees" type="checkbox" value="HAMER, Olivia (Counsel)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "HAMER, Olivia (Counsel)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-3">
               HAMER, Olivia (Counsel)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-4" name="attendees" type="checkbox" value="FIELD, Sally (Paralegal officer)" {{ checked("attendees", "FIELD, Sally (Paralegal officer)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-4" name="attendees" type="checkbox" value="FIELD, Sally (Paralegal officer)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "FIELD, Sally (Paralegal officer)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-4">
               FIELD, Sally (Paralegal officer)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-5" name="attendees" type="checkbox" value="SMITH, Michael (Reviewing lawyer)" {{ checked("attendees", "SMITH, Michael (Reviewing lawyer)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-5" name="attendees" type="checkbox" value="SMITH, Michael (Reviewing lawyer)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "SMITH, Michael (Reviewing lawyer)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-5">
               SMITH, Michael (Reviewing lawyer)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-6" name="attendees" type="checkbox" value="SHEAF, Jessica (High court advocate)" {{ checked("attendees", "SHEAF, Jessica (High court advocate)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-6" name="attendees" type="checkbox" value="SHEAF, Jessica (High court advocate)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "SHEAF, Jessica (High court advocate)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-6">
               SHEAF, Jessica (High court advocate)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-7" name="attendees" type="checkbox" value="PC FISHER, Jane (Police officer in charge)" {{ checked("attendees", "PC FISHER, Jane (Police officer in charge)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-7" name="attendees" type="checkbox" value="PC FISHER, Jane (Police officer in charge)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "PC FISHER, Jane (Police officer in charge)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-7">
               PC FISHER, Jane (Police officer in charge)
             </label>
           </div>
           <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-8" name="attendees" type="checkbox" value="Victim liaison officer (VLO)" {{ checked("attendees", "Victim liaison officer (VLO)") }}>
+            <input class="govuk-checkboxes__input" id="attendees-8" name="attendees" type="checkbox" value="Victim liaison officer (VLO)" {% if data['changeMode'] == 'true' %}{{ checked("attendees", "Victim liaison officer (VLO)") }}{% endif %}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-8">
               Victim liaison officer (VLO)
             </label>