Fix flow around eligibility question (#169)

Eligibility question should be asked after the batch question for
COVID-19, flu and RSV only.

For COVID-19 and flu it should be followed by the location, question,
but for RSV the next step is to find the the patient.

Author: frankieroberto

app/routes/vaccinate.js

@@ -355,10 +355,9 @@ module.exports = router => {
       redirectPath = "/vaccinate/add-batch"
     } else if (vaccine === "Pertussis") {
       redirectPath = "/vaccinate/patient"
-    } else if (vaccine === "RSV") {
-      redirectPath = "/vaccinate/eligibility"
     } else {
-      redirectPath = "/vaccinate/location"
+      // RSV, Covid or Flu
+      redirectPath = "/vaccinate/eligibility"
     }
     res.redirect(redirectPath)
   })

app/views/vaccinate/add-batch.html

@@ -21,10 +21,8 @@ <h1 class="nhsuks-heading-l">Add batch</h1>
 
       {% if data.vaccine == "Pertussis" %}
         {% set nextPage = "/vaccinate/patient" %}
-      {% elseif data.vaccine == "RSV" %}
-        {% set nextPage = "/vaccinate/eligibility" %}
       {% else %}
-        {% set nextPage = "/vaccinate/location" %}
+        {% set nextPage = "/vaccinate/eligibility" %}
       {% endif %}
 
       <form action="{{ nextPage }}" method="post" novalidate>

app/views/vaccinate/eligibility.html

@@ -16,6 +16,8 @@
 
       {% if data.patientName and data.repeatPatient == "yes" %}
         {% set nextAction = "/vaccinate/injection-site" %}
+      {% elseif data.vaccine == "COVID-19" or data.vaccine == "Flu" %}
+        {% set nextAction = "/vaccinate/location" %}
       {% else %}
         {% set nextAction = "/vaccinate/patient" %}
       {% endif %}

app/views/vaccinate/location.html

@@ -7,7 +7,7 @@
 {% set currentSection = "vaccinate" %}
 
 {% block beforeContent %}
-  {{ backLink({ href: "/vaccinate/batch" }) }}
+  {{ backLink({ href: "/vaccinate/eligibility" }) }}
 {% endblock %}
 
 {% block content %}
@@ -33,7 +33,7 @@
             {
               text: "Hospital hub for staff and patients",
               value: "Hospital hub for staff and patients",
-              checked: (data.locationType === "Hospital Hub for staff and patients")
+              checked: (data.locationType === "Hospital hub for staff and patients")
             },
             {
               text: "Vaccination centre open to the public",