updates

Author: Jon Roobottom

app/views/site/remove/check-answers.html

@@ -19,18 +19,25 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
         <div class="nhsuk-summary-list__row">
           <dt class="nhsuk-summary-list__key">Sessions</dt>
           <dd class="nhsuk-summary-list__value">
+            {% if data['select-all'][0] == 'true' %}
+              {# {{ data['select-date'] | length }} sessions<br> #}
+              All sessions from {{ group.session.from | nhsTime }} to {{ group.session.until | nhsTime }}<br>
+              on {{ data['select-date'][0] | formatDate('cccc, d MMMM yyyy') }}<br>
+              to {{ data['select-date'][data['select-date'] | length - 1] | formatDate('cccc, d MMMM yyyy') }}
+            {% else %}
             <p>From {{ group.session.from | nhsTime }} to {{ group.session.until | nhsTime }} on:</p>
             <ol class="nhsuk-list nhsuk-list--bullet">
               {% for date in data['select-date'] %}
               <li>{{ date | formatDate('cccc, d MMM yyyy') }}</li>
               {% endfor %}
             </ol>
+            {% endif %}
             <dd class="nhsuk-summary-list__actions"><a href="#">Change</a></dd>
           </dd>
         </div>
 
         <div class="nhsuk-summary-list__row">
-          <dt class="nhsuk-summary-list__key">Keep affected bookings</dt>
+          <dt class="nhsuk-summary-list__key">Keep bookings</dt>
           <dd class="nhsuk-summary-list__value">{{ 'Yes' if data.currentGroup['honour-bookings'] == 'true' }}{{ 'No' if data.currentGroup['honour-bookings'] == 'false' }}</dd>
           <dd class="nhsuk-summary-list__actions"><a href="/site/{{ site_id }}/remove/{{ itemId }}/do-you-want-to-cancel-bookings">Change</a></dd>
         </div>

app/views/site/remove/do-you-want-to-cancel-bookings.html

@@ -1,6 +1,6 @@
 {% extends '../../layouts/layout.html' %}
 
-{% set pageName = 'Removing these sessions will affect 17 existing bookings' %}
+{% set pageName = 'Removing these sessions will affect 17 bookings' %}
 
 
 {% block beforeContent %}
@@ -14,8 +14,8 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
-      <p>If you choose to cancel the bookings, people will be sent a text message or email to confirm</p>
-      <p>Either way, no further bookings can be made for these sessions.</p>
+      <p>If you choose to cancel the bookings, people will be sent a text message or email to confirm.</p>
+      {# <p>Either way, no further bookings can be made for these sessions.</p> #}
       <form action="/site/{{ site_id }}/remove/{{ itemId }}/check-answers" method="post">
         {{ radios({
 
@@ -30,7 +30,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
           items: [
             {
               value: "true",
-              text: "Yes"
+              text: "Yes, keep the bookings"
             },
             {
               value: "false",

app/views/site/remove/select-availability.html

@@ -90,7 +90,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
             <td class="nhsuk-table__cell">{{ selectCheckBox({
               id: 'select-date'~date,
               name: 'select-date',
-              label: date | formatDate('cccc, d MMMM yyyy'),
+              label: group.session.from | nhsTime  ~ ' to ' ~ group.session.until | nhsTime ~' on ' ~ date | formatDate('cccc d MMMM yyyy'),
               value: date
             }) }}</td>
             <td class="nhsuk-table__cell nhsuk-table__cell--numeric">{{ summaries.daily[date].bookedSlots }}</td>