Merge branch 'main' of https://github.com/NHSDigital/record-a-vaccination-prototype

Author: johnrimmer2

app/routes/vaccinate.js

@@ -303,6 +303,31 @@ module.exports = router => {
 
   })
 
+  router.post('/vaccinate/answer-eligibility', (req, res) => {
+    const data = req.session.data
+
+    let nextPage;
+
+    if (data.patientName && data.patientName != "" && data.repeatPatient === "yes") {
+
+      if (data.vaccine === "Pertussis" || ((data.vaccine == "RSV") && (data.eligibility === "Pregnant"))) {
+        nextPage = "/vaccinate/patient-estimated-due-date"
+      } else {
+        nextPage = "/vaccinate/consent"
+      }
+
+    } else {
+
+      if ((data.vaccine === "COVID-19") || (data.vaccine == "Flu")) {
+        nextPage = "/vaccinate/location"
+      } else {
+        nextPage = "/vaccinate/patient"
+      }
+    }
+
+    res.redirect(nextPage)
+  })
+
   // Routing page after DONE
   router.post('/vaccinate/what-next', (req, res) => {
 
@@ -334,6 +359,7 @@ module.exports = router => {
       req.session.data.vaccine = ""
       req.session.data.vaccineProduct = ""
       req.session.data.vaccineBatch = ""
+      req.session.data.eligibility = ""
 
       res.redirect('/vaccinate/vaccine?repeatPatient=yes&repeatVaccination=no')
 
@@ -354,11 +380,12 @@ module.exports = router => {
 
     if (vaccineBatch === "add-new") {
       redirectPath = "/vaccinate/add-batch"
-    } else if (vaccine === "Pertussis") {
-      redirectPath = "/vaccinate/patient"
-    } else {
-      // RSV, Covid or Flu
+    } else if (["COVID-19", "Flu", "RSV"].includes(data.vaccine)) {
       redirectPath = "/vaccinate/eligibility"
+    } else if (data.repeatPatient === "yes") {
+      redirectPath = "/vaccinate/patient-estimated-due-date"
+    } else {
+      redirectPath = "/vaccinate/patient"
     }
     res.redirect(redirectPath)
   })

app/views/vaccinate/check.html

@@ -239,7 +239,7 @@ <h2 class="nhsuk-heading-m">Vaccination</h2>
                 }
               ]
             }
-          } if ((data.vaccine == "Pertussis") or (data.eligibility | arrayOrStringIncludes("Pregnant"))),
+          } if ((data.vaccine == "Pertussis") or ((data.eligibility | arrayOrStringIncludes("Pregnant"))) and (data.vaccine == "RSV")),
           {
             key: {
               text: "Consent given by"

app/views/vaccinate/eligibility.html

@@ -14,15 +14,7 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      {% 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 %}
-
-      <form action="{{ nextAction }}" method="post" novalidate>
+      <form action="/vaccinate/answer-eligibility" method="post" novalidate>
 
       {% if data.vaccine == "COVID-19" %}
         {% set eligibilityOptions = [