Merge pull request #6504 from NHSDigital/alistair/national-reporting-cut-off-banner-improve-content

Improve content of national reporting cut off banner

Author: alistair-white-horne-tng

app/views/immunisation_imports/new.html.erb

@@ -6,13 +6,17 @@
 
 <% content_for :page_title, title %>
 
-<% if (cutoff_date = current_team.national_reporting_cut_off_date) && cutoff_date.today? %>
-  <%= govuk_notification_banner(title_text: "#{cutoff_date.to_fs(:long)} - Check where to upload records") do |notification_banner| %>
-    <% notification_banner.with_heading(text: "Vaccinations given:") %>
-    <ul>
-      <li>before <%= cutoff_date.to_fs(:long) %> must be uploaded to NIVS by the end of today</li>
-      <li>on or after <%= cutoff_date.to_fs(:long) %> must be uploaded to Mavis national reporting only</li>
-    </ul>
+<% if (cutoff_date = current_team.national_reporting_cut_off_date) && Date.today <= cutoff_date %>
+  <%= govuk_notification_banner(title_text: "Important") do %>
+    <h3 class="nhsuk-notification-banner__heading">
+      Mavis national reporting replaces NIVS on <%= cutoff_date.to_fs(:long) %>
+    </h3>
+
+    <h4 class="nhsuk-u-margin-bottom-2">Vaccinations given before <%= cutoff_date.to_fs(:long) %></h4>
+    <p>Upload to NIVS by <%= cutoff_date.to_fs(:long) %>. After this, NIVS will no longer be available.</p>
+
+    <h4 class="nhsuk-u-margin-bottom-2">Vaccinations given on or after <%= cutoff_date.to_fs(:long) %></h4>
+    <p>Upload to Mavis national reporting only.</p>
   <% end %>
 <% end %>
 

spec/features/import_vaccination_records_national_reporting_spec.rb

@@ -56,8 +56,8 @@
   context "cutoff date banner" do
     let(:cutoff_date) { Date.new(2026, 4, 20) }
 
-    context "when today is not the cutoff date" do
-      around { |example| travel_to(cutoff_date - 1.day) { example.run } }
+    context "when today is after the cutoff date" do
+      around { |example| travel_to(cutoff_date + 1.day) { example.run } }
 
       scenario "banner is not shown" do
         given_mavis_logins_are_configured(
@@ -69,6 +69,22 @@
       end
     end
 
+    context "when today is before the cutoff date" do
+      around { |example| travel_to(cutoff_date - 1.day) { example.run } }
+
+      scenario "banner is shown" do
+        given_mavis_logins_are_configured(
+          national_reporting_cut_off_date: cutoff_date
+        )
+        given_i_am_signed_in_as_a_national_reporting_user
+        when_i_navigate_to_the_upload_page
+        expect(page).to have_css(".nhsuk-notification-banner")
+        expect(page).to have_content(
+          "Mavis national reporting replaces NIVS on 20 April 2026"
+        )
+      end
+    end
+
     context "when today is the cutoff date" do
       around { |example| travel_to(cutoff_date) { example.run } }
 
@@ -79,14 +95,17 @@
         given_i_am_signed_in_as_a_national_reporting_user
         when_i_navigate_to_the_upload_page
         expect(page).to have_css(".nhsuk-notification-banner")
-        expect(page).to have_content("20 April 2026")
-        expect(page).to have_content("Check where to upload records")
         expect(page).to have_content(
-          "before 20 April 2026 must be uploaded to NIVS by the end of today"
+          "Mavis national reporting replaces NIVS on 20 April 2026"
+        )
+        expect(page).to have_content("Vaccinations given before 20 April 2026")
+        expect(page).to have_content(
+          "Upload to NIVS by 20 April 2026. After this, NIVS will no longer be available."
         )
         expect(page).to have_content(
-          "on or after 20 April 2026 must be uploaded to Mavis national reporting only"
+          "Vaccinations given on or after 20 April 2026"
         )
+        expect(page).to have_content("Upload to Mavis national reporting only.")
       end
     end
   end