Merge pull request #6505 from NHSDigital/alistair/national-reporting-cut-off-banner-extend-nivs

Change NIVS switch-off date to 2 days after cutoff

Author: alistair-white-horne-tng

app/models/team.rb

@@ -44,6 +44,9 @@ class Team < ApplicationRecord
 
   NATIONAL_REPORTING_YEAR_GROUPS = (-2..13).to_a.freeze
 
+  # The number of days after the national reporting cut-off date when users will lose access to NIVS
+  NIVS_SWITCH_OFF_DELAY_DAYS = 2
+
   audited associated_with: :organisation
   has_associated_audits
 

app/views/immunisation_imports/new.html.erb

@@ -6,14 +6,18 @@
 
 <% content_for :page_title, title %>
 
-<% if (cutoff_date = current_team.national_reporting_cut_off_date) && Date.today <= cutoff_date %>
+<% if (cutoff_date = current_team.national_reporting_cut_off_date) &&
+      Date.today <= cutoff_date + Team::NIVS_SWITCH_OFF_DELAY_DAYS.days %>
   <%= 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>
+    <p>
+      Upload to NIVS by <%= (cutoff_date + Team::NIVS_SWITCH_OFF_DELAY_DAYS.days).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>

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 after the cutoff date" do
-      around { |example| travel_to(cutoff_date + 1.day) { example.run } }
+    context "when today is more than 2 days after the cutoff date" do
+      around { |example| travel_to(cutoff_date + 3.days) { example.run } }
 
       scenario "banner is not shown" do
         given_mavis_logins_are_configured(
@@ -69,6 +69,22 @@
       end
     end
 
+    context "when today is within 2 days after the cutoff date" do
+      around { |example| travel_to(cutoff_date + 2.days) { 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 before the cutoff date" do
       around { |example| travel_to(cutoff_date - 1.day) { example.run } }
 
@@ -100,7 +116,7 @@
         )
         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."
+          "Upload to NIVS by 22 April 2026. After this, NIVS will no longer be available."
         )
         expect(page).to have_content(
           "Vaccinations given on or after 20 April 2026"