Merge pull request #4821 from nhsuk/fix-still-to-vaccinate-filter

Fix pagination for "Still to vaccinate" filter on patients tab

Author: jhenderson

app/components/app_patient_search_form_component.rb

@@ -32,7 +32,7 @@ class AppPatientSearchFormComponent < ViewComponent::Base
           <% end %>
         <% end %>
         
-        <% if tallying_enabled? %>
+        <% if tallying_enabled? && show_still_to_vaccinate %>
           <%= f.govuk_check_boxes_fieldset :show_only, multiple: false, legend: { text: "Show only", size: "s" } do %>
             <%= f.govuk_check_box :still_to_vaccinate,
                         1, 0,
@@ -211,7 +211,8 @@ def initialize(
     vaccine_methods: [],
     year_groups: [],
     heading_level: 3,
-    show_aged_out_of_programmes: false
+    show_aged_out_of_programmes: false,
+    show_still_to_vaccinate: false
   )
     @form = form
     @url = url
@@ -226,6 +227,7 @@ def initialize(
     @year_groups = year_groups
     @heading_level = heading_level
     @show_aged_out_of_programmes = show_aged_out_of_programmes
+    @show_still_to_vaccinate = show_still_to_vaccinate
   end
 
   private
@@ -241,7 +243,8 @@ def initialize(
               :vaccine_methods,
               :year_groups,
               :heading_level,
-              :show_aged_out_of_programmes
+              :show_aged_out_of_programmes,
+              :show_still_to_vaccinate
 
   delegate :format_year_group,
            :govuk_button_link_to,

app/components/app_session_overview_tallies_component.html.erb

@@ -30,7 +30,7 @@
     <%= render AppCardComponent.new do |card| %>
       <% if session.today? %>
         <%= govuk_inset_text classes: "nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" do %>
-          <%= link_to "#{still_to_vaccinate_count} children with consent have not been vaccinated yet",
+          <%= link_to t(".still_to_vaccinate_message", count: still_to_vaccinate_count),
                       session_patients_path(session, still_to_vaccinate: 1) %>
         <% end %>
       <% end %>

app/controllers/sessions/patients_controller.rb

@@ -15,7 +15,9 @@ def show
       @session.patients.includes(:vaccination_statuses, notes: :created_by)
 
     patients = @form.apply(scope)
-    @pagy, @patients = pagy(patients)
+
+    @pagy, @patients =
+      patients.is_a?(Array) ? pagy_array(patients) : pagy(patients)
   end
 
   private

app/views/sessions/patients/show.html.erb

@@ -16,6 +16,7 @@
           programmes: @session.programmes,
           vaccination_statuses: @statuses,
           year_groups: @session.year_groups,
+          show_still_to_vaccinate: true,
         ) %>
   </div>
 

config/locales/components.en.yml

@@ -4,4 +4,9 @@ en:
       one: >-
         1 child is due a vaccination this year and has not been vaccinated at another location
       other: >-
-        %{count} children are due a vaccination this year and have not been vaccinated at another location
+        %{count} children are due a vaccination this year and have not been vaccinated at another location
+    still_to_vaccinate_message:
+      one: >-
+        1 child with consent has not been vaccinated yet
+      other: >-
+        %{count} children with consent have not been vaccinated yet

spec/features/tallying_session_overview_spec.rb

@@ -13,6 +13,10 @@
     and_i_visit_the_session_record_tab
 
     when_i_click_on_each_tally_the_filters_match_the_same_count
+
+    when_i_visit_the_session_record_tab
+    and_i_click_on_the_link_to_view_patients_still_to_vaccinate
+    then_i_should_see_the_patient_that_needs_to_be_vaccinated
   end
 
   def given_a_session_for_flu_is_running_today
@@ -29,6 +33,8 @@ def given_a_session_for_flu_is_running_today
   def and_i_visit_the_session_record_tab
     visit session_path(@session, tallying: true)
   end
+  alias_method :when_i_visit_the_session_record_tab,
+               :and_i_visit_the_session_record_tab
 
   def and_the_tallying_feature_flag_is_enabled
     Flipper.enable(:tallying)
@@ -133,4 +139,14 @@ def when_i_click_on_each_tally_the_filters_match_the_same_count
     expect(page).to have_content("Showing 1 to 1 of 1 children")
     expect(page).to have_content(@patients.fifth.given_name)
   end
+
+  def and_i_click_on_the_link_to_view_patients_still_to_vaccinate
+    click_link "2 children with consent have not been vaccinated yet"
+  end
+
+  def then_i_should_see_the_patient_that_needs_to_be_vaccinated
+    expect(page).to have_content("Showing 1 to 2 of 2 children")
+    expect(page).to have_content(@patients.second.given_name)
+    expect(page).to have_content(@patients.third.given_name)
+  end
 end