From 861405417e363e190460e34b3dde0427c3d40456 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 14:33:55 +0100 Subject: [PATCH 1/9] Add a page to show we creating the report to the Reports section --- app/views/reports/creating-report.html | 60 ++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 app/views/reports/creating-report.html diff --git a/app/views/reports/creating-report.html b/app/views/reports/creating-report.html new file mode 100644 index 00000000..e1ba6139 --- /dev/null +++ b/app/views/reports/creating-report.html @@ -0,0 +1,60 @@ +{% extends 'layout.html' %} + +{% set pageName = "Add a list of NHS numbers" %} + +{% set currentSection = "lists" %} + + +{% block content %} +
+
+ + {% if (errors | length) > 0 %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errors + }) }} + {% endif %} + +
+ +

We are creating your report

+ +

This can take up to 2 minutes.

+ + +
+ + +
+ + +

Looking up NHS numbers
Found 16 out of 104

+ + + + + +{% endblock %} From cd64eb1b3d7a141ea27683489b8f9a447de981fd Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 16:01:00 +0100 Subject: [PATCH 2/9] Update creating report page --- app/views/reports/creating-report.html | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/app/views/reports/creating-report.html b/app/views/reports/creating-report.html index e1ba6139..7dd8e67a 100644 --- a/app/views/reports/creating-report.html +++ b/app/views/reports/creating-report.html @@ -1,26 +1,17 @@ {% extends 'layout.html' %} -{% set pageName = "Add a list of NHS numbers" %} - -{% set currentSection = "lists" %} +{% set pageName = "Creating report" %} {% block content %}
- {% if (errors | length) > 0 %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: errors - }) }} - {% endif %} - - +

We are creating your report

-

This can take up to 2 minutes.

+

This can take a few minutes.

@@ -48,12 +39,6 @@

We are creating your report

} -
- - -

Looking up NHS numbers
Found 16 out of 104

- - From 1835671feb02fa89bec9a19d7219b63ef4acce25 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 16:21:30 +0100 Subject: [PATCH 3/9] Create alt-index.html for Reports section This is an alternative landing page for the Reports section - it would appear if a user select 'Reports' in the navigation while another report is being created for their organisation. --- app/views/reports/alt-index.html | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 app/views/reports/alt-index.html diff --git a/app/views/reports/alt-index.html b/app/views/reports/alt-index.html new file mode 100644 index 00000000..351626e4 --- /dev/null +++ b/app/views/reports/alt-index.html @@ -0,0 +1,37 @@ +{% extends 'layout.html' %} + +{% set pageName = "Reports" %} + +{% set currentSection = "reports" %} + +{% block content %} + +
+
+ + {% include "includes/notification.html" %} + +
+
+ +
+
+ +

Reports

+

Create and download reports.

+ + {% if vaccinationsRecordedCount > 0 %} + + {{ insetText({ + html: "

You need to wait for 3 minutes before you can start creating a report. This is because another report is currently being created for your organisation.

" + })}} + + + {% else %} +

You have not yet recorded any vaccinations.

+ {% endif %} + +
+
+ +{% endblock %} From d21897afc5c5ab5eefcf336b7caaf71adb7c5cb5 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 16:24:57 +0100 Subject: [PATCH 4/9] Update report download message Change msg on last page to make it generic. Previous message, which referenced the vaccines and sites included in the report, would have got very long if an org was creating a report across multiple sites and for multiple vaccines. --- app/views/reports/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/reports/download.html b/app/views/reports/download.html index ff31a7b5..111ec869 100644 --- a/app/views/reports/download.html +++ b/app/views/reports/download.html @@ -11,7 +11,7 @@

Your report is ready

-

You have created a report from 16 July to 30 July 2024 for COVID-19 and flu at Verrington (RH635)

+

You can now download your report.

{{ button({ "text": "Download report", From bc271164ea21f3209314cbdb92a9a8b01bac8721 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 16:53:45 +0100 Subject: [PATCH 5/9] Replaced inset html with nunjucks --- app/views/reports/alt-index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/reports/alt-index.html b/app/views/reports/alt-index.html index 351626e4..0309b656 100644 --- a/app/views/reports/alt-index.html +++ b/app/views/reports/alt-index.html @@ -20,16 +20,16 @@

Reports

Create and download reports.

- {% if vaccinationsRecordedCount > 0 %} + {% from "inset-text/macro.njk" import insetText %} - {{ insetText({ - html: "

You need to wait for 3 minutes before you can start creating a report. This is because another report is currently being created for your organisation.

" - })}} +{% set insetTextHtml %} +

You need to wait for 3 minutes before you can start creating a report. This is because another report is currently being created for your organisation.

+{% endset %} +{{ insetText({ + html: insetTextHtml +}) }} - {% else %} -

You have not yet recorded any vaccinations.

- {% endif %}
From 62da774b6ac962c855dff795ecae6e6e47ad88d7 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 16:58:08 +0100 Subject: [PATCH 6/9] Amended inset text --- app/views/reports/alt-index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/reports/alt-index.html b/app/views/reports/alt-index.html index 0309b656..7136f79a 100644 --- a/app/views/reports/alt-index.html +++ b/app/views/reports/alt-index.html @@ -23,7 +23,8 @@

Reports

{% from "inset-text/macro.njk" import insetText %} {% set insetTextHtml %} -

You need to wait for 3 minutes before you can start creating a report. This is because another report is currently being created for your organisation.

+

You need to wait 3 minutes before you can start creating a report.

+

This is because another report is in progress for your organisation.

{% endset %} {{ insetText({ From b87e58a71ff4255095930c6ac972aea81c249976 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 23 Jun 2026 17:05:28 +0100 Subject: [PATCH 7/9] Updated inset text --- app/views/reports/alt-index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/reports/alt-index.html b/app/views/reports/alt-index.html index 7136f79a..3815cb52 100644 --- a/app/views/reports/alt-index.html +++ b/app/views/reports/alt-index.html @@ -23,8 +23,7 @@

Reports

{% from "inset-text/macro.njk" import insetText %} {% set insetTextHtml %} -

You need to wait 3 minutes before you can start creating a report.

-

This is because another report is in progress for your organisation.

+

You need to wait 3 minutes before you can start creating a report. This is because another report is already in progress for your organisation.

{% endset %} {{ insetText({ From 8ac9397d0a68629833dbbd82233605e28943260f Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Wed, 24 Jun 2026 09:17:37 +0100 Subject: [PATCH 8/9] Change redirect URL in creating-report.html --- app/views/reports/creating-report.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/reports/creating-report.html b/app/views/reports/creating-report.html index 7dd8e67a..b7f42734 100644 --- a/app/views/reports/creating-report.html +++ b/app/views/reports/creating-report.html @@ -39,7 +39,7 @@

We are creating your report

} - + {% endblock %} From 84e7d7b86befec0ac82692a24e9eec87406ff7a2 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Wed, 24 Jun 2026 09:23:30 +0100 Subject: [PATCH 9/9] Changed url for redirect --- app/views/reports/creating-report.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/reports/creating-report.html b/app/views/reports/creating-report.html index b7f42734..989620a7 100644 --- a/app/views/reports/creating-report.html +++ b/app/views/reports/creating-report.html @@ -39,7 +39,8 @@

We are creating your report

} - + + {% endblock %}