Locations screen updates for flu for winter 2025-2026 (#399)

Author: frankieroberto

app/routes/record-vaccinations.js

@@ -562,17 +562,16 @@ module.exports = router => {
         nextPage = "/record-vaccinations/patient-history"
       }
 
-    } else {
-
-      if ((data.vaccine === "COVID-19") || (data.vaccine == "flu")) {
-        if (data.eligibility === "Healthcare worker" || data.eligibility.includes("Healthcare worker")) {
-          nextPage = "/record-vaccinations/healthcare-worker"
-        } else {
-          nextPage = "/record-vaccinations/location"
-        }
+    } else if (data.vaccine == "flu") {
+      if (data.eligibility === "Healthcare worker") {
+        nextPage = "/record-vaccinations/healthcare-worker"
       } else {
         nextPage = "/record-vaccinations/patient"
       }
+    } else if (data.vaccine == "COVID-19") {
+      nextPage = "/record-vaccinations/location"
+    } else {
+      nextPage = "/record-vaccinations/patient"
     }
 
     res.redirect(nextPage)

app/views/record-vaccinations/location.html

@@ -20,13 +20,8 @@
       {% endif %}
 
       <form action="/record-vaccinations/answer-location" method="post" novalidate>
-
-        {% from 'radios/macro.njk' import radios %}
-        {% from 'input/macro.njk' import input %}
-
         {% set careHtml %}
 
-
         <div class="nhsuk-form-group">
           <label class="nhsuk-label nhsuk-label--s" for="care-home">
             Care home details
@@ -53,8 +48,6 @@
 
           </select>
         </div>
-
-
       {% endset -%}
 
         {{ radios({
@@ -70,44 +63,26 @@
           hint: {
             text: "This is needed for payment and reporting."
           },
+          value: data.locationType,
           items: [
             {
-              text: "Hospital hub for staff and patients",
-              value: "Hospital hub for staff and patients",
-              checked: (data.locationType === "Hospital hub for staff and patients")
-            },
-            {
-              text: "Vaccination centre open to the public",
-              value: "Vaccination centre open to the public",
-              checked: (data.locationType === "Vaccination centre open to the public")
-            },
-            {
-              text: "Community pharmacy",
-              value: "Community pharmacy",
-              checked: (data.locationType === "Community pharmacy")
+              text: "On site",
+              value: "On site"
             },
             {
               value: "Care home",
               text: "Care home",
-              checked: (data.locationType === "Care home"),
               conditional: {
                 html: careHtml
               }
             },
             {
               text: "Housebound patient’s home",
-              value: "Housebound patient’s home",
-              checked: (data.locationType === "Housebound patient’s home")
+              value: "Housebound patient’s home"
             },
             {
               text: "Outreach event",
-              value: "Outreach event",
-              checked: (data.locationType === "Outreach event")
-            },
-            {
-              text: "GP clinic",
-              value: "GP clinic",
-              checked: (data.locationType === "GP clinic")
+              value: "Outreach event"
             }
           ]