Make vaccines in reports dynamic (#417)

This makes the vaccines list in the Reports section dynamic, so that it
now includes all enabled vaccines.


## Before

<img width="580" height="418" alt="Screenshot 2025-07-22 at 15 07 35"
src="https://github.com/user-attachments/assets/2f72a908-0803-4024-9d7f-cb047ec33d8a"
/>

## After (with all 7 vaccine types enabled)

<img width="672" height="546" alt="Screenshot 2025-07-22 at 15 08 05"
src="https://github.com/user-attachments/assets/7816c0a0-9570-4977-80a0-033add119ee1"
/>

Author: frankieroberto

app/routes/helpers.js

@@ -1,17 +1,32 @@
 module.exports = router => {
 
   router.get('/prototype-setup/setup-batches', (req, res) => {
-
     const data = req.session.data
+    const currentOrganisation = res.locals.currentOrganisation
+
     let vaccineStock = data.vaccineStock
 
+    const organisationVaccines = currentOrganisation.vaccines
+
     const dateNow = new Date()
     const millisecondsPerDay = 86400000
 
     const vaccines = data.vaccines
     const siteId = "RW3NM"
 
     for (vaccine of vaccines) {
+
+      const organisationVaccine = organisationVaccines.find((organisationVaccine) => organisationVaccine.name === vaccine.name)
+
+      if (organisationVaccine) {
+        organisationVaccine.status = "enabled"
+      } else {
+        organisationVaccines.push({
+          name: vaccine.name,
+          status: "enabled"
+        })
+      }
+
       for (vaccineProduct of vaccine.products) {
 
         const numberOfBatchesToAdd = 1 + Math.floor(Math.random() * 10)

app/routes/reports.js

@@ -2,6 +2,20 @@ const filters = require('.././filters.js')()
 
 module.exports = (router) => {
 
+  router.get('/reports/choose-vaccines', (req, res) => {
+    const data = req.session.data
+
+    const organisationVaccines = res.locals.currentOrganisation.vaccines || []
+
+    const enabledVaccines = organisationVaccines
+      .filter((vaccine) => vaccine.status === "enabled")
+
+    res.render('reports/choose-vaccines', {
+      enabledVaccines
+    })
+  })
+
+
   router.get('/reports/choose-dates', (req, res) => {
     const data = req.session.data
 

app/views/reports/check.html

@@ -31,7 +31,7 @@ <h1 class="nhsuk-heading-xl">{{ pageName }}</h1>
             actions: {
               items: [
                 {
-                  href: "/reports/choose-dates-2",
+                  href: "/reports/choose-dates",
                   text: "Change",
                   visuallyHiddenText: "name"
                 }
@@ -60,12 +60,10 @@ <h1 class="nhsuk-heading-xl">{{ pageName }}</h1>
           },
           {
             key: {
-              text: ("Vaccines" if (data.vaccines | length) > 1 else "Vaccine"),
-              classes: "xnhsuk-u-font-weight-bold"
+              text: ("Vaccines" if (data.vaccines | length) > 1 else "Vaccine")
             },
             value: {
-              text: (data.vaccines | join(", ")) if data.vaccines,
-              classes: "xnhsuk-u-font-weight-bold"
+              text: (data.vaccines | sort(false, false, "name") | join(", ") | capitaliseFirstLetter) if data.vaccines
             },
             actions: {
               items: [

app/views/reports/choose-vaccines.html

@@ -13,58 +13,36 @@
 {% endblock %}
 
 {% block content %}
-
-      <div class="nhsuk-grid-row">
-        <div class="nhsuk-grid-column-two-thirds">
-
-
-
-            <form action="/reports/choose-site" method="post">
-              {{ checkboxes({
-                "idPrefix": "vaccines",
-                "name": "vaccines",
-                "fieldset": {
-                  "legend": {
-                    "text": "Choose vaccines",
-                    "classes": "nhsuk-fieldset__legend--xl",
-                    isPageHeading: true
-                  }
-                },
-                "items": [
-                  {
-                    "value": "COVID-19",
-                    "text": "COVID-19",
-                    checked: (data.vaccines | arrayOrStringIncludes("COVID-19"))
-                  },
-                  {
-                    "value": "Flu",
-                    "text": "Flu",
-                    checked: (data.vaccines | arrayOrStringIncludes("Flu"))
-                  },
-                  {
-                    "value": "Pertussis",
-                    "text": "Pertussis",
-                    checked: (data.vaccines | arrayOrStringIncludes("Pertussis"))
-                  },
-                  {
-                    "value": "RSV",
-                    "text": "RSV",
-                    checked: (data.vaccines | arrayOrStringIncludes("RSV"))
-                  }
-                  ]
-              }) }}
-            {{ button({
-              "text": "Continue"
-            }) }}
-          </form>
-
-
-        </div>
-      </div>
-
-
-
-
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+        <form action="/reports/choose-site" method="post">
+
+          {% set items = [] %}
+
+          {% for vaccine in (enabledVaccines | sort(false, false, "name")) %}
+            {% set items = (items.push({
+              value: vaccine.name,
+              text: (vaccine.name | capitaliseFirstLetter)
+            }), items) %}
+          {% endfor %}
+
+          {{ checkboxes({
+            idPrefix: "vaccines",
+            name: "vaccines",
+            fieldset: {
+              legend: {
+                text: "Choose vaccines",
+                classes: "nhsuk-fieldset__legend--xl",
+                isPageHeading: true
+              }
+            },
+            values: data.vaccines,
+            items: items
+          }) }}
+        {{ button({
+          "text": "Continue"
+        }) }}
+      </form>
     </div>
   </div>
 {% endblock %}