diff --git a/app/views/record-vaccinations/add-batch.html b/app/views/record-vaccinations/add-batch.html index a2c351e3..1be2957a 100644 --- a/app/views/record-vaccinations/add-batch.html +++ b/app/views/record-vaccinations/add-batch.html @@ -45,7 +45,7 @@ }) }} {% endif %} -

{{ pageName }}

+

{{ data.firstName }} {{ data.lastName }}, {{ data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age }} old, {{ data.vaccine }}{{ pageName }}

diff --git a/app/views/record-vaccinations/batch.html b/app/views/record-vaccinations/batch.html index b42feb36..75bb97c5 100644 --- a/app/views/record-vaccinations/batch.html +++ b/app/views/record-vaccinations/batch.html @@ -59,12 +59,15 @@ {% endif %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ "idPrefix": "vaccineBatch", "name": "vaccineBatch", "fieldset": { "legend": { - "text": ("Which batch are you using?" if data.vaccinationToday == 'yes' else "Which batch was it?"), + "html": captionHtml + ("Which batch are you using?" if data.vaccinationToday == 'yes' else "Which batch was it?"), "size": "l", "isPageHeading": true } @@ -82,7 +85,7 @@ {% else %} -

{{ pageName }}

+

{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{{ pageName }}

{% if organisationSetting.permissionLevel == "Recorder" %}

An admin user needs to add a vaccine before you can record a vaccination.

diff --git a/app/views/record-vaccinations/consent.html b/app/views/record-vaccinations/consent.html index e38e2344..99e51be7 100644 --- a/app/views/record-vaccinations/consent.html +++ b/app/views/record-vaccinations/consent.html @@ -163,12 +163,15 @@ }) }} {% endset %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ idPrefix: "consent", name: "consent", fieldset: { legend: { - text: ("Who is giving consent?" if data.vaccinationToday == 'yes' else "Who gave consent?"), + html: captionHtml + ("Who is giving consent?" if data.vaccinationToday == 'yes' else "Who gave consent?"), size: "l", isPageHeading: "true" } diff --git a/app/views/record-vaccinations/delivery-team.html b/app/views/record-vaccinations/delivery-team.html index 77431849..5efa8638 100644 --- a/app/views/record-vaccinations/delivery-team.html +++ b/app/views/record-vaccinations/delivery-team.html @@ -42,12 +42,15 @@ {% endif %} {% endfor %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{% endset %} + {{ radios({ idPrefix: "site-id", name: "siteId", fieldset: { legend: { - text: ("Which site is it?" if data.vaccinationToday == 'yes' else "Which site was it?"), + html: captionHtml + ("Which site is it?" if data.vaccinationToday == 'yes' else "Which site was it?"), size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/dose-amount.html b/app/views/record-vaccinations/dose-amount.html index 083da4c4..a2498c66 100644 --- a/app/views/record-vaccinations/dose-amount.html +++ b/app/views/record-vaccinations/dose-amount.html @@ -35,12 +35,15 @@ + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ idPrefix: "dose-amount", name: "doseAmount", fieldset: { legend: { - text: ("Did you give a full dose of the vaccine?" if data.vaccinationToday == 'yes' else "Was a full dose of the vaccine given?"), + html: captionHtml + ("Did you give a full dose of the vaccine?" if data.vaccinationToday == 'yes' else "Was a full dose of the vaccine given?"), classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/record-vaccinations/dose.html b/app/views/record-vaccinations/dose.html index a222fe84..ab30a8fb 100644 --- a/app/views/record-vaccinations/dose.html +++ b/app/views/record-vaccinations/dose.html @@ -126,6 +126,8 @@ {% endif %} {% if radiosHint %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} {{ radios({ idPrefix: "vaccineDose", name: "vaccineDose", @@ -134,7 +136,7 @@ } if (errors | length) > 0, fieldset: { legend: { - text: ("Which dose of the " + data.vaccine + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + data.vaccine + " vaccine was it?"), + html: captionHtml + ("Which dose of the " + data.vaccine + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + data.vaccine + " vaccine was it?"), classes: "nhsuk-fieldset__legend--l", isPageHeading: true } @@ -153,7 +155,7 @@ } if (errors | length) > 0, fieldset: { legend: { - text: ("Which dose of the " + data.vaccine + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + data.vaccine + " vaccine was it?"), + html: captionHtml + ("Which dose of the " + data.vaccine + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + data.vaccine + " vaccine was it?"), classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/record-vaccinations/eligibility.html b/app/views/record-vaccinations/eligibility.html index fb3a6765..4332e0d7 100644 --- a/app/views/record-vaccinations/eligibility.html +++ b/app/views/record-vaccinations/eligibility.html @@ -158,9 +158,12 @@ }), items) %} {% endfor %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {% call fieldset({ legend: { - text: ("Why are you giving them the " + data.vaccine + " vaccine?" if data.vaccinationToday == 'yes' else "Why was the patient eligible for the " + data.vaccine + " vaccine?"), + html: captionHtml + ("Why are you giving them the " + data.vaccine + " vaccine?" if data.vaccinationToday == 'yes' else "Why was the patient eligible for the " + data.vaccine + " vaccine?"), size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/healthcare-worker.html b/app/views/record-vaccinations/healthcare-worker.html index ab115043..b4327f1c 100644 --- a/app/views/record-vaccinations/healthcare-worker.html +++ b/app/views/record-vaccinations/healthcare-worker.html @@ -36,12 +36,15 @@ + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ idPrefix: "healthcare-worker", name: "healthcareWorker", fieldset: { legend: { - text: pageName, + html: captionHtml + pageName, size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/injection-site.html b/app/views/record-vaccinations/injection-site.html index 95ce0d86..cc994ccc 100644 --- a/app/views/record-vaccinations/injection-site.html +++ b/app/views/record-vaccinations/injection-site.html @@ -81,12 +81,15 @@ {% endset %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ idPrefix: "injection-site", name: "injectionSite", fieldset: { legend: { - text: ("Where did you give the injection?" if data.vaccinationToday == 'yes' else "Where was the injection given?"), + html: captionHtml + ("Where did you give the injection?" if data.vaccinationToday == 'yes' else "Where was the injection given?"), size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/location.html b/app/views/record-vaccinations/location.html index 8f3aa8fa..fc9e7475 100644 --- a/app/views/record-vaccinations/location.html +++ b/app/views/record-vaccinations/location.html @@ -60,12 +60,15 @@ {% endset -%} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ radios({ idPrefix: "location-type", name: "locationType", fieldset: { legend: { - text: ("Where is the vaccination taking place?" if data.vaccinationToday == 'yes' else "Where did the vaccination take place?"), + html: captionHtml + ("Where is the vaccination taking place?" if data.vaccinationToday == 'yes' else "Where did the vaccination take place?"), size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/patient-estimated-due-date.html b/app/views/record-vaccinations/patient-estimated-due-date.html index 04c094be..8f757728 100644 --- a/app/views/record-vaccinations/patient-estimated-due-date.html +++ b/app/views/record-vaccinations/patient-estimated-due-date.html @@ -35,12 +35,15 @@ + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{% endset %} + {{ dateInput({ id: "pregnancyDueDate", namePrefix: "pregnancyDueDate", fieldset: { legend: { - text: "What is " + data.firstName + " " + data.lastName + "’s estimated due date?", + html: captionHtml + "What is " + data.firstName + " " + data.lastName + "'s estimated due date?", size: "l", isPageHeading: true } diff --git a/app/views/record-vaccinations/review-previous.html b/app/views/record-vaccinations/review-previous.html index 64935ccd..862a9e3a 100644 --- a/app/views/record-vaccinations/review-previous.html +++ b/app/views/record-vaccinations/review-previous.html @@ -12,7 +12,9 @@
-

{{ pageName }}

+ {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + +

{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{{ pageName }}

{{ summaryList({ rows: [ diff --git a/app/views/record-vaccinations/vaccination-date.html b/app/views/record-vaccinations/vaccination-date.html index f7085bc0..cbcec9c0 100644 --- a/app/views/record-vaccinations/vaccination-date.html +++ b/app/views/record-vaccinations/vaccination-date.html @@ -61,12 +61,15 @@ }) }} {% endset -%} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set legendHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} oldIs the vaccination today?{% endset %} + {{ radios({ idPrefix: "vaccinationToday", name: "vaccinationToday", fieldset: { legend: { - text: "Is the vaccination today?", + html: legendHtml, classes: "nhsuk-fieldset__legend--l", isPageHeading: "true" } diff --git a/app/views/record-vaccinations/vaccinator.html b/app/views/record-vaccinations/vaccinator.html index 5637a542..80809176 100644 --- a/app/views/record-vaccinations/vaccinator.html +++ b/app/views/record-vaccinations/vaccinator.html @@ -47,12 +47,15 @@ }), items) %} {% endfor %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{% endset %} + {{ radios({ idPrefix: "vaccinator", name: "vaccinatorId", fieldset: { legend: { - text: ("Who is the vaccinator?" if data.vaccinationToday == 'yes' else "Who was the vaccinator?"), + html: captionHtml + ("Who is the vaccinator?" if data.vaccinationToday == 'yes' else "Who was the vaccinator?"), size: "l", isPageHeading: "true" } diff --git a/app/views/record-vaccinations/vaccine.html b/app/views/record-vaccinations/vaccine.html index df7366bb..dba06692 100644 --- a/app/views/record-vaccinations/vaccine.html +++ b/app/views/record-vaccinations/vaccine.html @@ -99,12 +99,15 @@ }), items) %} {% endfor %} + {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %} + {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{% endset %} + {{ radios({ "idPrefix": "vaccine", "name": "vaccine", "fieldset": { "legend": { - "text": question, + "html": captionHtml + question, "size": "l", "isPageHeading": true }