Combine programme and dates check

It's no longer possible to edit the programmes for a session after it
has been created, so we can combine the dates and programmes check in to
a single page that is shown when editing dates or when first creating a
session.

Jira-Issue: MAV-2645

Author: thomasleese

app/controllers/draft_sessions_controller.rb

@@ -10,10 +10,7 @@ class DraftSessionsController < ApplicationController
   before_action :set_programmes, if: -> { current_step == :programmes }
   before_action :set_year_group_options, if: -> { current_step == :year_groups }
 
-  with_options only: :show,
-               if: -> do
-                 %i[dates_check programmes_check].include?(current_step)
-               end do
+  with_options only: :show, if: -> { current_step == :dates_check } do
     before_action :set_catch_up_year_groups
     before_action :set_catch_up_patients_vaccinated_percentage
     before_action :set_catch_up_patients_receiving_consent_requests_count
@@ -27,10 +24,7 @@ class DraftSessionsController < ApplicationController
   def show
     authorize @session, @session.new_record? ? :new? : :edit?
 
-    if (current_step == :dates_check && should_skip_dates_check?) ||
-         (current_step == :programmes_check && should_skip_programmes_check?)
-      skip_step
-    end
+    skip_step if current_step == :dates_check && should_skip_dates_check?
 
     render_wizard
   end
@@ -278,7 +272,6 @@ def update_params
       programmes: {
         programme_types: []
       },
-      programmes_check: [],
       register_attendance: %i[requires_registration],
       school: %i[location_id],
       year_groups: {
@@ -332,11 +325,6 @@ def go_to_confirm_after_submission?
       return false
     end
 
-    if current_step == :programmes && steps.include?("programmes-check") &&
-         !should_skip_programmes_check?
-      return false
-    end
-
     # If we're creating a new session, then we skip a few of the later steps
     # in the journey, but users can go to them via the check and confirm page.
 
@@ -369,17 +357,6 @@ def should_skip_dates_check?
     !any_programme_has_high_unvaccinated_count
   end
 
-  def should_skip_programmes_check?
-    return true if @draft_session.new_programmes.empty?
-
-    any_new_programme_has_high_unvaccinated_count =
-      @draft_session.new_programmes.any? do |programme|
-        programme_has_high_unvaccinated_count?(programme)
-      end
-
-    !any_new_programme_has_high_unvaccinated_count
-  end
-
   def programme_has_high_unvaccinated_count?(programme)
     catch_up_year_groups =
       @draft_session.year_groups.select do |year_group|

app/models/draft_session.rb

@@ -40,8 +40,6 @@ def wizard_steps
     steps << :school if school? && !editing?
 
     steps << :programmes
-    steps << :programmes_check if school?
-
     steps << :year_groups if school? && !editing?
 
     steps << :dates

app/views/draft_sessions/_catch_up_warning.html.erb

@@ -1,5 +1,38 @@
-<%= render "catch_up_warning",
-          programmes: @draft_session.programmes.map(&:name).to_sentence,
-          submit_button_text: "Keep session dates",
-          cancel_link_text: "Remove session dates",
-          cancel_link_path: draft_session_path("dates") %>
+<% content_for :before_main do %>
+  <%= govuk_back_link(href: @back_link_path) %>
+<% end %>
+
+<% title = t(".title", programmes: @draft_session.programmes.map(&:name).to_sentence) %>
+<% content_for :page_title, title %>
+
+<%= govuk_panel(title_text: title, classes: %w[app-panel--interruption]) do %>
+  <p>
+    <%= @catch_up_patients_vaccinated_percentage == 0 ? "" : "Only " %>
+    <%= @catch_up_patients_vaccinated_percentage %>% of children in
+    <%= format_year_groups(@catch_up_year_groups) %> in
+    this session have vaccination records. This is unusually low coverage for
+    catch-up year groups.
+  </p>
+
+  <p>
+    Check and confirm that vaccination records have been imported for all
+    children in this school before you continue.
+  </p>
+
+  <% if @draft_session.open_for_consent? && @catch_up_patients_receiving_consent_requests_count > 0 %>
+    <p>
+      Scheduling this session now will send consent requests to
+      <%= pluralize(@catch_up_patients_receiving_consent_requests_count, "parent") %>
+      of children in <%= format_year_groups(@catch_up_year_groups) %> on
+      <%= @draft_session.send_consent_requests_at.to_fs(:long) %>. Many of them
+      may be parents of already vaccinated children.
+    </p>
+  <% end %>
+
+  <%= form_with model: @draft_session, url: wizard_path, method: :put do |f| %>
+    <div class="nhsuk-button-group">
+      <%= f.govuk_submit "Keep session dates", class: "nhsuk-button--reverse" %>
+      <%= link_to "Remove session dates", draft_session_path("dates") %>
+    </div>
+  <% end %>
+<% end %>

app/views/draft_sessions/dates_check.html.erb

@@ -624,7 +624,7 @@ en:
         personal_choice: Why are they refusing to give consent?
         will_be_vaccinated_elsewhere: Where will their child get their vaccination?
   draft_sessions:
-    catch_up_warning:
+    dates_check:
       title: Have you imported historical vaccination records for %{programmes}?
   import_duplicate_form:
     options:

app/views/draft_sessions/programmes_check.html.erb

@@ -34,7 +34,6 @@ en:
     parent: parent
     parent_details: parent-details
     programmes: programmes
-    programmes_check: programmes-check
     questions: questions
     reason_for_refusal: reason-for-refusal
     reason_for_refusal_notes: reason-for-refusal-notes

config/locales/en.yml

@@ -3,63 +3,75 @@
 describe "Edit session programmes" do
   around { |example| travel_to(Time.zone.local(2024, 2, 1)) { example.run } }
 
-  scenario "add new programme" do
-    given_a_session_exists
-    and_the_session_has_unvaccinated_catch_up_patients
+  before { Flipper.enable(:schools_and_sessions) }
 
-    when_i_visit_the_session_overview_page
-    and_i_click_on_edit_session
-    and_i_add_the_mmr_programme
+  scenario "choosing programmes with a high number of unvaccinated catch up patients" do
+    given_a_school_exists
+    and_the_school_has_unvaccinated_catch_up_patients
+
+    when_i_visit_the_school_page
+    and_i_create_a_new_session
+    and_i_choose_the_programmes
+    and_i_choose_the_year_groups
+    and_i_choose_the_date
     then_i_see_the_warning_panel_about_unvaccinated_patients
 
     when_i_click_continue
     then_i_should_see_the_mmr_programme
-    screenshot_and_save_page
   end
 
-  def given_a_session_exists
+  def given_a_school_exists
     @team =
       create(:team, :with_one_nurse, programmes: [Programme.hpv, Programme.mmr])
 
-    location = create(:school, programmes: [Programme.hpv, Programme.mmr])
-    @session =
-      create(
-        :session,
-        :scheduled,
-        programmes: [Programme.hpv],
-        team: @team,
-        location:
-      )
+    @location =
+      create(:school, team: @team, programmes: [Programme.hpv, Programme.mmr])
   end
 
-  def and_the_session_has_unvaccinated_catch_up_patients
+  def and_the_school_has_unvaccinated_catch_up_patients
     create_list(
       :patient,
       2,
       :eligible_for_vaccination,
-      session: @session,
-      year_group: 9
+      location: @location,
+      year_group: 9,
+      programmes: [Programme.hpv, Programme.mmr]
     )
   end
 
-  def when_i_visit_the_session_overview_page
+  def when_i_visit_the_school_page
     sign_in @team.users.first
-    visit session_path(@session)
+    visit school_sessions_path(@location)
   end
 
-  def and_i_click_on_edit_session
-    click_on "Edit session"
+  def and_i_create_a_new_session
+    click_on "Add a new session"
   end
 
-  def and_i_add_the_mmr_programme
-    within(".nhsuk-summary-list__row", text: "Programmes") { click_on "Change" }
+  def and_i_choose_the_programmes
+    check "HPV"
     check "MMR"
-    when_i_click_continue
+    click_on "Continue"
+  end
+
+  def and_i_choose_the_year_groups
+    check "Year 8"
+    check "Year 9"
+    check "Year 10"
+    check "Year 11"
+    click_on "Continue"
+  end
+
+  def and_i_choose_the_date
+    fill_in "Year", with: "2024"
+    fill_in "Month", with: "2"
+    fill_in "Day", with: "8"
+    click_on "Continue"
   end
 
   def then_i_see_the_warning_panel_about_unvaccinated_patients
     expect(page).to have_content(
-      "Have you imported historical vaccination records for MMR?"
+      "Have you imported historical vaccination records for HPV and MMR?"
     )
     expect(page).to have_content(
       "0% of children in Years 9 to 11 in this session have vaccination " \
@@ -73,7 +85,7 @@ def then_i_see_the_warning_panel_about_unvaccinated_patients
   end
 
   def when_i_click_continue
-    click_on "Continue"
+    click_on "Keep session dates"
   end
 
   def then_i_should_see_the_mmr_programme