Update same vaccination different patient (#414)

Plucked from #368

Author: frankieroberto

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

@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 
-{% set pageName = "Review your previous answers" %}
+{% set pageName = "Check these details still apply" %}
 
 {% set currentSection = "vaccinate" %}
 
@@ -12,7 +12,7 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1 class="nhsuk-heading-l">Review your previous answers</h1>
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
       {{ summaryList({
           rows: [
@@ -35,106 +35,106 @@ <h1 class="nhsuk-heading-l">Review your previous answers</h1>
             },
             {
               key: {
-                text: "Vaccine"
+                text: "Site"
               },
               value: {
-                text: data.vaccine
+                text: (currentOrganisation.sites | findById(data.deliveryTeam)).name
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/vaccine",
+                    href: "/record-vaccinations/delivery-team",
                     text: "Change",
-                    visuallyHiddenText: "vaccine"
+                    visuallyHiddenText: "site"
                   }
                 ]
               }
             },
             {
               key: {
-                text: "Product"
+                text: "Vaccinator"
               },
               value: {
-                text: data.vaccineProduct
+                html: (vaccinator.firstName + " " + vaccinator.lastName)
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/vaccine",
+                    href: "/record-vaccinations/vaccinator",
                     text: "Change",
-                    visuallyHiddenText: "vaccine product"
+                    visuallyHiddenText: "contact information"
                   }
                 ]
               }
             },
             {
               key: {
-                text: "Batch"
+                text: "Vaccine"
               },
               value: {
-                html: data.vaccineBatch + "<br>Expires 4 January 2025"
+                html: (data.vaccine | capitaliseFirstLetter) + "<br>" + data.vaccineProduct
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/batch",
+                    href: "/record-vaccinations/vaccine",
                     text: "Change",
-                    visuallyHiddenText: "vaccine batch"
+                    visuallyHiddenText: "vaccine"
                   }
                 ]
               }
             },
             {
               key: {
-                text: "Vaccinator"
+                text: "Batch"
               },
               value: {
-                html: (vaccinator.firstName + " " + vaccinator.lastName)
+                html: data.vaccineBatch + "<br>Expires 4 January 2025"
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/vaccinator",
+                    href: "/record-vaccinations/batch",
                     text: "Change",
-                    visuallyHiddenText: "contact information"
+                    visuallyHiddenText: "vaccine batch"
                   }
                 ]
               }
             },
             {
               key: {
-                text: "Location"
+                text: "Eligibility"
               },
               value: {
-                html: data.locationType
+                html: ((data.eligibility | join("<br>")) if (data.eligibility | isArray) else data.eligibility)
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/location",
+                    href: "/record-vaccinations/eligibility",
                     text: "Change",
-                    visuallyHiddenText: "contact information"
+                    visuallyHiddenText: "eligibility"
                   }
                 ]
               }
-            } if (data.vaccine === "Flu" or data.vaccine == "COVID-19"),
+            } if (data.eligibility),
             {
               key: {
-                text: "Eligibility"
+                text: "Location"
               },
               value: {
-                html: ((data.eligibility | join("<br>")) if (data.eligibility | isArray) else data.eligibility)
+                html: data.locationType
               },
               actions: {
                 items: [
                   {
-                    href: "/record-vaccinations/eligibility",
+                    href: "/record-vaccinations/location",
                     text: "Change",
-                    visuallyHiddenText: "eligibility"
+                    visuallyHiddenText: "contact information"
                   }
                 ]
               }
-            } if (data.vaccine != "Pertussis")
+            } if (data.locationType)
           ]
         }) }}
 
@@ -143,6 +143,8 @@ <h1 class="nhsuk-heading-l">Review your previous answers</h1>
         href: "/record-vaccinations/patient"
       })}}
 
+      <p><a href="/record-vaccinations">Start again</a> to record a vaccination from the beginning.</p>
+
     </div>
   </div>