diff --git a/app/views/errors/no-and-partial-history-combined.html b/app/views/errors/no-and-partial-history-combined.html new file mode 100644 index 00000000..92aeb89e --- /dev/null +++ b/app/views/errors/no-and-partial-history-combined.html @@ -0,0 +1,39 @@ +{% extends 'layout.html' %} + +{% set pageName = "There is a temporary problem getting Jodie Brown's vaccination history" %} + + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient" }) }} +{% endblock %} + +{% set currentSection = "vaccinate" %} + + +{% block content %} +
+
+

{{ pageName }}

+ +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Try again" +}) }} + +    + +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Continue anyway", + classes: "nhsuk-button--secondary" +}) }} + + + +
+
+ + +{% endblock %} diff --git a/app/views/errors/no-patient-details-alt.html b/app/views/errors/no-patient-details-alt.html new file mode 100644 index 00000000..03e1332e --- /dev/null +++ b/app/views/errors/no-patient-details-alt.html @@ -0,0 +1,37 @@ +{% extends 'layout.html' %} + +{% set pageName = "There is a temporary problem getting the patient's details" %} + + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient" }) }} +{% endblock %} + + +{% block content %} +
+
+

{{ pageName }}

+ + +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Try again" +}) }} + + +    + +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Continue anyway", + classes: "nhsuk-button--secondary" +}) }} + +
+
+ + +{% endblock %} diff --git a/app/views/errors/partial-vaccination-history.html b/app/views/errors/partial-vaccination-history.html index a0e0a9a5..b99e6413 100644 --- a/app/views/errors/partial-vaccination-history.html +++ b/app/views/errors/partial-vaccination-history.html @@ -16,7 +16,7 @@

{{ pageName }}

-

You may not see all the vaccination records that are usually shown in this service.

+

We cannot access flu vaccination records.

{% from "button/macro.njk" import button %} diff --git a/app/views/record-vaccinations/patient-history-none.html b/app/views/record-vaccinations/patient-history-none.html index 09113a13..a878d87c 100644 --- a/app/views/record-vaccinations/patient-history-none.html +++ b/app/views/record-vaccinations/patient-history-none.html @@ -25,7 +25,7 @@
-

Check {{ data.patientName }}’s details

+

Check Jodie Brown’s details

{{ summaryList({ classes: 'xnhsuk-summary-list--no-border', @@ -65,21 +65,15 @@

Check {{ data.patientName }}’s details

] }) }} - {% if data.vaccine == "COVID-19" %} + {% from "warning-callout/macro.njk" import warningCallout %} - {% set screeningConsiderations %} - - {% endset %} +{{ warningCallout({ + heading: "Important", + text: "There was a problem getting the patient's vaccination history. Check previous vaccinations with them." +}) }} - {% endif %} - -
{{ button({ diff --git a/app/views/record-vaccinations/patient-history.html b/app/views/record-vaccinations/patient-history.html index 2b5bb47b..f1e754db 100644 --- a/app/views/record-vaccinations/patient-history.html +++ b/app/views/record-vaccinations/patient-history.html @@ -103,7 +103,8 @@

Check {{ data.firstName }} {{ data.lastName }}’s d }) }} {% endif %} - + +

Vaccination history

This shows NHS vaccinations given in England. Currently it includes COVID-19, flu and RSV, plus some pertussis, pneumococcal and MMR vaccination records.