Fix flow for same vax different patient (#517)

This fixes the flow for changing the answers for eligibility or role
from a previous vaccination when recording the same vaccination for the
next patient.

Author: frankieroberto

app/routes/record-vaccinations.js

@@ -548,6 +548,7 @@ module.exports = router => {
 
   router.get('/record-vaccinations/eligibility', (req, res) => {
     const data = req.session.data
+    const from = req.query.from
     const eligibility = data.eligibility
     let errors = []
 
@@ -561,7 +562,8 @@ module.exports = router => {
     }
 
     res.render('record-vaccinations/eligibility', {
-      errors
+      errors,
+      from
     })
   })
 
@@ -583,16 +585,22 @@ module.exports = router => {
         nextPage = "/record-vaccinations/patient-history"
       }
 
-    } else if (data.vaccine == "flu") {
-      if (data.eligibility === "Health or social care worker") {
-        nextPage = "/record-vaccinations/healthcare-worker"
-      } else {
-        nextPage = "/record-vaccinations/patient"
-      }
-    } else if (data.vaccine == "COVID-19") {
+    } else if (data.vaccine == "flu" && data.eligibility === "Health or social care worker" && (!data.healthcareWorker || data.healthcareWorker === "")) {
+
+      nextPage = "/record-vaccinations/healthcare-worker"
+
+    } else if (data.vaccine == "COVID-19" && (!data.locationType || data.locationType === "")) {
+
       nextPage = "/record-vaccinations/location"
+
+    } else if (data.repeatVaccination === "yes") {
+
+      nextPage = "/record-vaccinations/review-previous"
+
     } else {
+
       nextPage = "/record-vaccinations/patient"
+
     }
 
     res.redirect(nextPage)
@@ -695,10 +703,12 @@ module.exports = router => {
     const healthcareWorker = data.healthcareWorker
     let nextPage
 
-    if (healthcareWorker && healthcareWorker != '') {
-      nextPage = '/record-vaccinations/location'
-    } else {
+    if (!healthcareWorker || healthcareWorker === '') {
       nextPage = '/record-vaccinations/healthcare-worker?showErrors=yes'
+    } else if (data.repeatVaccination === "yes") {
+      nextPage = '/record-vaccinations/review-previous'
+    } else {
+      nextPage = '/record-vaccinations/location'
     }
 
     res.redirect(nextPage)
@@ -737,7 +747,7 @@ module.exports = router => {
         data.newBatchNumber = ""
       }
 
-      res.redirect('/record-vaccinations/review-previous')
+      res.redirect('/record-vaccinations/review-previous?repeatVaccination=yes&repeatPatient=no')
 
     } else if (answer === 'same-patient-another-vaccination') {
 
@@ -759,7 +769,7 @@ module.exports = router => {
       req.session.data.legalMechanism = ""
       req.session.data.healthcareWorker = ""
 
-      res.redirect('/record-vaccinations/vaccine')
+      res.redirect('/record-vaccinations/vaccine?repeatPatient=no&repeatVaccination=no')
     } else {
       res.redirect('/record-vaccinations/done?showErrors=yes')
     }

app/views/record-vaccinations/eligibility.html

@@ -5,7 +5,9 @@
 {% set currentSection = "vaccinate" %}
 
 {% block beforeContent %}
-  {{ backLink({ href: "/record-vaccinations/legal-mechanism" }) }}
+  {% set backHref = from if from else "/record-vaccinations/legal-mechanism" %}
+
+  {{ backLink({ href: backHref }) }}
 {% endblock %}
 
 {% set CovidEligibilityOptions = [

app/views/record-vaccinations/review-previous.html

@@ -128,7 +128,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/eligibility",
+                    href: "/record-vaccinations/eligibility?from=/record-vaccinations/review-previous",
                     text: "Change",
                     visuallyHiddenText: "eligibility"
                   }