Add check answers pages to meeting flows

app/routes/meetings.js

@@ -273,36 +273,53 @@
         // Mark this recipient as accounted for.
         data['recordnoresponse' + idx] = 'yes'
 
+        // Returning from a "Change" link edits a single response then goes back to check answers.
+        if (data['changeMode'] === 'true'){
+            data['changeMode'] = ''
+            return response.redirect("/bfs/meetings-2/cps-offer/check-response")
+        }
+
         if (person < recipients.length){
             response.redirect("/bfs/meetings-2/cps-offer/when-no-response?person=" + (person + 1))
             return
         }
 
-        // Snapshot the selected recipients as a "no response" round so they are
-        // retained and can be redisplayed on the meeting page.
+        response.redirect("/bfs/meetings-2/cps-offer/check-response")
+    })
+
+    // Confirm the offer responses (accepted, declined, or no response). This finalises
+    // the batch: it snapshots any "no response" round, updates how many recipients are
+    // still to respond, and records the response type for the confirmation banner.
+    router.post('/bfs/meetings-2/cps-offer/check-response-answer', function(request, response) {
+        var data = request.session.data
         var offered = [].concat(data['offerRecipients'] || [])
-        var round = []
-        recipients.forEach(function(sel){
-            var i = Number.parseInt(sel, 10)
-            round.push({
-                offeredTo: offered[i - 1],
-                howOffered: data['howoffered' + i],
-                offerDate: data['offerDate' + i],
-                loggedDate: data['noResponseDate' + i]
+        var type = data['offerResponse']
+
+        if (type === 'no-response'){
+            var recipients = [].concat(data['noResponseRecipients'] || [])
+            var round = []
+            recipients.forEach(function(sel){
+                var i = Number.parseInt(sel, 10)
+                round.push({
+                    offeredTo: offered[i - 1],
+                    howOffered: data['howoffered' + i],
+                    offerDate: data['offerDate' + i],
+                    loggedDate: data['noResponseDate' + i]
+                })
             })
-        })
-        var rounds = data['noResponseOffers'] || []
-        rounds.push(round)
-        data['noResponseOffers'] = rounds
+            var rounds = data['noResponseOffers'] || []
+            rounds.push(round)
+            data['noResponseOffers'] = rounds
+            data['lastResponseType'] = 'no-response'
+        } else {
+            data['lastResponseType'] = type
+        }
 
-        // Track how many offered recipients are still to be accounted for
-        // (accepted, declined, or logged as no response).
         var accountedCount = 0
         offered.forEach(function(recipient, i){
             if (data['recordaccepted' + (i + 1)] || data['recorddeclined' + (i + 1)] || data['recordnoresponse' + (i + 1)]) accountedCount++
         })
         data['responsesRemaining'] = offered.length - accountedCount
-        data['lastResponseType'] = 'no-response'
 
         response.redirect("/bfs/victim/index?secondaryNav=ptm&meetingState=responses&meetingSuccess=yes#communications")
     })
@@ -366,19 +383,22 @@
         data['offerHowError'] = ''
         data['offerWhenError'] = ''
 
+        // Returning from a "Change" link edits a single offer then goes back to check answers.
+        if (data['changeMode'] === 'true'){
+            data['changeMode'] = ''
+            return response.redirect("/bfs/meetings-2/cps-offer/check-offer")
+        }
+
         if (person < recipients.length){
             response.redirect("/bfs/meetings-2/cps-offer/how-when-offered?person=" + (person + 1))
             return
         }
 
-        // All offers recorded: route to the confirmation page for the first matching
-        // method by priority, aggregating every recipient's selected method.
-        var howoffered = []
-        Object.keys(data).forEach(function(key){
-            if (key.indexOf('howoffered') === 0){
-                howoffered = howoffered.concat(data[key])
-            }
-        })
+        // All offers recorded: review them on the check answers page before confirming.
+        response.redirect("/bfs/meetings-2/cps-offer/check-offer")
+    })
+
+    router.post('/bfs/meetings-2/cps-offer/check-offer-answer', function(request, response) {
         response.redirect("/bfs/victim/index?secondaryNav=ptm&meetingState=offered&meetingSuccess=yes#communications")
     })
 
@@ -465,22 +485,18 @@
         data['acceptHowError'] = ''
         data['acceptWhenError'] = ''
 
+        // Returning from a "Change" link edits a single response then goes back to check answers.
+        if (data['changeMode'] === 'true'){
+            data['changeMode'] = ''
+            return response.redirect("/bfs/meetings-2/cps-offer/check-response")
+        }
+
         if (person < accepters.length){
             response.redirect("/bfs/meetings-2/cps-offer/how-when-accepted?person=" + (person + 1))
             return
         }
 
-        // Track how many offered recipients are still to be accounted for
-        // (either accepted or declined).
-        var offered = [].concat(data['offerRecipients'] || [])
-        var accountedCount = 0
-        offered.forEach(function(recipient, i){
-            if (data['recordaccepted' + (i + 1)] || data['recorddeclined' + (i + 1)] || data['recordnoresponse' + (i + 1)]) accountedCount++
-        })
-        data['responsesRemaining'] = offered.length - accountedCount
-        data['lastResponseType'] = 'accepted'
-
-        response.redirect("/bfs/victim/index?secondaryNav=ptm&meetingState=responses&meetingSuccess=yes#communications")
+        response.redirect("/bfs/meetings-2/cps-offer/check-response")
     })
 
 
@@ -527,22 +543,18 @@
         data['declineHowError'] = ''
         data['declineWhenError'] = ''
 
+        // Returning from a "Change" link edits a single response then goes back to check answers.
+        if (data['changeMode'] === 'true'){
+            data['changeMode'] = ''
+            return response.redirect("/bfs/meetings-2/cps-offer/check-response")
+        }
+
         if (person < decliners.length){
             response.redirect("/bfs/meetings-2/cps-offer/how-when-declined?person=" + (person + 1))
             return
         }
 
-        // Track how many offered recipients are still to be accounted for
-        // (either accepted or declined).
-        var offered = [].concat(data['offerRecipients'] || [])
-        var accountedCount = 0
-        offered.forEach(function(recipient, i){
-            if (data['recordaccepted' + (i + 1)] || data['recorddeclined' + (i + 1)] || data['recordnoresponse' + (i + 1)]) accountedCount++
-        })
-        data['responsesRemaining'] = offered.length - accountedCount
-        data['lastResponseType'] = 'declined'
-
-        response.redirect("/bfs/victim/index?secondaryNav=ptm&meetingState=responses&meetingSuccess=yes#communications")
+        response.redirect("/bfs/meetings-2/cps-offer/check-response")
     })
 
 
@@ -804,12 +816,24 @@
 
     // 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) {
+        // Returning from a "Change" link goes straight back to check answers.
+        if (request.session.data['changeMode'] === 'true') {
+            request.session.data['changeMode'] = ''
+            return response.redirect('/bfs/meetings-2/cancelled/check-answers')
+        }
         response.redirect('/bfs/meetings-2/cancelled/reason-why')
     })
 
-    // Cancel flow: after capturing the reason, return to the Meetings sub-tab in
-    // the cancelled state.
+    // Cancel flow: the reason is the final question, so both the normal flow and
+    // a "Change" edit end on the check answers page.
     router.post('/bfs/meetings-2/cancelled/reason-why-answer', function(request, response) {
+        request.session.data['changeMode'] = ''
+        response.redirect('/bfs/meetings-2/cancelled/check-answers')
+    })
+
+    // Cancel flow: confirm the details and return to the Meetings sub-tab in the
+    // cancelled state.
+    router.post('/bfs/meetings-2/cancelled/check-answers-answer', function(request, response) {
         response.redirect('/bfs/victim/index?secondaryNav=ptm&meetingState=cancelled&meetingSuccess=yes#communications')
     })
 

app/views/bfs/meetings-2/cancelled/check-answers.html

@@ -0,0 +1,54 @@
+{% extends "layouts/main.html" %}
+
+{% set pageName="Check your answers" %}
+
+{% block header %}
+{% include "/bfs/partials/header/none-selected-bfs.html" %}
+{% endblock %}
+
+{% block beforeContent %}
+{% include "/bfs/partials/identity-bar/bfs-question.html" %}
+{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-one-half">
+
+    {% set reasonText = data['cancelReasonOther'] if data['cancelReason'] == "Other" else data['cancelReason'] %}
+
+    <h1 class="govuk-heading-l">Check your answers before cancelling the meeting</h1>
+
+    <dl class="govuk-summary-list govuk-!-margin-bottom-9">
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">
+          Date and time cancelled
+        </dt>
+        <dd class="govuk-summary-list__value">
+          {{ data['cancelDate'] | formatDate }}{% if data['cancelHour'] %} at {{ data['cancelHour'] }}:{{ data['cancelMinutes'] }}{% endif %}
+        </dd>
+        <dd class="govuk-summary-list__actions">
+          <a class="govuk-link" href="meeting-date?changeMode=true">Change<span class="govuk-visually-hidden"> date and time the meeting was cancelled</span></a>
+        </dd>
+      </div>
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">
+          Reason for cancelling
+        </dt>
+        <dd class="govuk-summary-list__value">
+          {{ reasonText }}
+        </dd>
+        <dd class="govuk-summary-list__actions">
+          <a class="govuk-link" href="reason-why?changeMode=true">Change<span class="govuk-visually-hidden"> reason for cancelling the meeting</span></a>
+        </dd>
+      </div>
+    </dl>
+
+    <form class="form" action="/bfs/meetings-2/cancelled/check-answers-answer" method="post">
+      {{ govukButton({
+        text: "Confirm details"
+      }) }}
+    </form>
+
+  </div>
+</div>
+{% endblock %}

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="cancel-date-picker" data-module="moj-date-picker" data-excluded-days="saturday sunday">
 
-          <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'] }}" />
+          <input type="text" class="govuk-input moj-js-datepicker-input" id="cancel-date" name="cancelDate" autocomplete="off" aria-describedby="cancel-date-hint" value="{% if data['changeMode'] == 'true' %}{{ data['cancelDate'] }}{% endif %}" />
         </div>
       </div>
 
@@ -50,7 +50,7 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
                 <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="cancel-hour" name="cancelHour" type="text" inputmode="numeric" value="{{ data['cancelHour'] }}">
+                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="cancel-hour" name="cancelHour" type="text" inputmode="numeric" value="{% if data['changeMode'] == 'true' %}{{ data['cancelHour'] }}{% endif %}">
               </div>
             </div>
             <div class="govuk-date-input__item" style="margin-right: 10px;">
@@ -62,7 +62,7 @@ <h1 class="govuk-heading-l">When was the meeting cancelled?</h1>
                 <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="cancel-minutes" name="cancelMinutes" type="text" inputmode="numeric" value="{{ data['cancelMinutes'] }}">
+                <input class="govuk-input govuk-date-input__input govuk-input--width-2" id="cancel-minutes" name="cancelMinutes" type="text" inputmode="numeric" value="{% if data['changeMode'] == 'true' %}{{ data['cancelMinutes'] }}{% endif %}">
               </div>
             </div>
 

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

@@ -18,6 +18,7 @@
     {{ govukTextarea({
       id: "cancel-reason-other",
       name: "cancelReasonOther",
+      value: data['cancelReasonOther'] if data['changeMode'] == 'true',
       label: { text: "Provide details" }
     }) }}
     {% endset -%}
@@ -26,6 +27,7 @@
 
       {{ govukRadios({
         name: "cancelReason",
+        value: data['cancelReason'] if data['changeMode'] == 'true',
         fieldset: {
           legend: {
             text: "What is the reason for cancelling the meeting?",

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

@@ -45,24 +45,36 @@ <h1 class="govuk-fieldset__heading">
         {% endif %}
         <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="{{ data['victimSurname'] | upper }}, Margaret (Mother)" {{ checked("attendees", data['victimSurname'] | upper + ", Margaret (Mother)") }}>
-            <label class="govuk-label govuk-checkboxes__label" for="attendees-1">
-              {{ data['victimSurname'] | upper }}, Margaret (Mother)
-            </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-2" name="attendees" type="checkbox" value="{{ data['victimSurname'] | upper }}, David (Father)" {{ checked("attendees", data['victimSurname'] | upper + ", David (Father)") }}>
-            <label class="govuk-label govuk-checkboxes__label" for="attendees-2">
-              {{ data['victimSurname'] | upper }}, David (Father)
-            </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="attendees-3" name="attendees" type="checkbox" value="CARTER, Emma (Sister)" {{ checked("attendees", "CARTER, Emma (Sister)") }}>
-            <label class="govuk-label govuk-checkboxes__label" for="attendees-3">
-              CARTER, Emma (Sister)
-            </label>
-          </div>
+          {% if data['familyMembers'] and data['familyMembers'].length > 0 %}
+            {% for member in data['familyMembers'] %}
+              {% set attendeeValue = (member.lastName | upper) + ", " + member.firstName + (" (" + member.relationship + ")" if member.relationship else "") %}
+              <div class="govuk-checkboxes__item">
+                <input class="govuk-checkboxes__input" id="attendees-family-{{ loop.index }}" name="attendees" type="checkbox" value="{{ attendeeValue }}" {{ checked("attendees", attendeeValue) }}>
+                <label class="govuk-label govuk-checkboxes__label" for="attendees-family-{{ loop.index }}">
+                  {{ attendeeValue }}
+                </label>
+              </div>
+            {% endfor %}
+          {% else %}
+            <div class="govuk-checkboxes__item">
+              <input class="govuk-checkboxes__input" id="attendees-1" name="attendees" type="checkbox" value="{{ data['victimSurname'] | upper }}, Margaret (Mother)" {{ checked("attendees", data['victimSurname'] | upper + ", Margaret (Mother)") }}>
+              <label class="govuk-label govuk-checkboxes__label" for="attendees-1">
+                {{ data['victimSurname'] | upper }}, Margaret (Mother)
+              </label>
+            </div>
+            <div class="govuk-checkboxes__item">
+              <input class="govuk-checkboxes__input" id="attendees-2" name="attendees" type="checkbox" value="{{ data['victimSurname'] | upper }}, David (Father)" {{ checked("attendees", data['victimSurname'] | upper + ", David (Father)") }}>
+              <label class="govuk-label govuk-checkboxes__label" for="attendees-2">
+                {{ data['victimSurname'] | upper }}, David (Father)
+              </label>
+            </div>
+            <div class="govuk-checkboxes__item">
+              <input class="govuk-checkboxes__input" id="attendees-3" name="attendees" type="checkbox" value="CARTER, Emma (Sister)" {{ checked("attendees", "CARTER, Emma (Sister)") }}>
+              <label class="govuk-label govuk-checkboxes__label" for="attendees-3">
+                CARTER, Emma (Sister)
+              </label>
+            </div>
+          {% endif %}
           <div class="govuk-checkboxes__item">
             <input class="govuk-checkboxes__input" id="attendees-4" name="attendees" type="checkbox" value="BIDWELL, Jane (Family liaison officer)" {{ checked("attendees", "BIDWELL, Jane (Family liaison officer)") }}>
             <label class="govuk-label govuk-checkboxes__label" for="attendees-4">