reorder cancel a date range

Author: Jon Roobottom

app/routes/cancel-availability.js

@@ -40,16 +40,11 @@ const getStartAndEndDates = (data) => {
 // Cancel availability for a date range
 // -----------------------------------------------------------------------------
 router.get('/site/:id/cancel-availability', (req, res) => {
-  res.render(`site/cancel-availability/dates`);
+  res.render(`site/cancel-availability/edit-guidance`);
 });
 
-router.all('/site/:id/cancel-availability/cancel-or-edit', (req, res) => {
-  const { startDate, endDate } = getStartAndEndDates(req.session.data);
-
-  res.render(`site/cancel-availability/cancel-or-edit`, { 
-    startDate, 
-    endDate
-  });
+router.get('/site/:id/cancel-availability/dates', (req, res) => {
+  res.render(`site/cancel-availability/dates`);
 });
 
 router.post('/site/:id/cancel-availability/cancel-or-edit-choice', (req, res) => {

app/views/site/cancel-availability/dates.html

@@ -4,15 +4,15 @@
 
 {% block beforeContent %}
 {{ backLink({
-  href: 'javascript:history.back()'
+  href: '/site/' ~ site_id ~ '/cancel-availability'
 }) }}
 {% endblock %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-full">
       <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
-      <form method="post" action="/site/{{ site_id }}/cancel-availability/cancel-or-edit">
+      <form method="post" action="/site/{{ site_id }}/cancel-availability/sessions-and-bookings">
         {{ dateInput({
           id: "start-date",
           namePrefix: "[cancelAvailability][startDate]",

app/views/site/cancel-availability/edit-guidance.html

@@ -1,6 +1,6 @@
 {% extends '../../layouts/layout.html' %}
 
-{% set pageName = "What to do next" %}
+{% set pageName = "Before you continue" %}
 
 {% block beforeContent %}
 {{ backLink({
@@ -22,7 +22,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
       {{ button({
         text: "Continue",
-        href: '/site/' + site_id + '/cancel-availability/sessions-and-bookings'
+        href: '/site/' + site_id + '/cancel-availability/dates'
       }) }}
     </div>
   </div>

app/views/site/cancel-availability/sessions-and-bookings.html

@@ -132,7 +132,7 @@
 
 {% block beforeContent %}
 {{ backLink({
-  href: '/site/' + site_id + '/cancel-availability/cancel-or-edit'
+  href: '/site/' + site_id + '/cancel-availability/dates'
 }) }}
 {% endblock %}