Merge pull request #4547 from nhsuk/fix-viewing-patient-session-registration

Fix viewing patient when there's no date today

Author: thomasleese

app/components/app_patient_session_record_component.rb

@@ -20,7 +20,7 @@ def render?
       (
         patient_session.registration_status&.attending? ||
           patient_session.registration_status&.completed? ||
-          !session.requires_registration?
+          (!session.requires_registration? && session.today?)
       )
   end
 

spec/factories/sessions.rb

@@ -71,6 +71,10 @@
       date { Date.current }
     end
 
+    trait :yesterday do
+      date { Date.yesterday }
+    end
+
     trait :unscheduled do
       date { nil }
     end

spec/features/manage_attendance_spec.rb

@@ -71,27 +71,64 @@
     then_i_do_not_see_the_register_tab
   end
 
+  scenario "Viewing a patient from yesterday with attendance turned off" do
+    given_my_team_is_running_an_hpv_vaccination_programme
+    and_there_is_a_vaccination_session_yesterday_that_requires_no_registration
+    and_the_session_has_patients
+
+    when_i_go_to_the_session
+    and_i_click_on_the_record_tab
+    then_i_cant_see_the_patients
+
+    when_i_go_to_the_session
+    and_i_click_on_the_children_tab
+    and_i_go_to_a_patient
+    then_i_cant_record_a_vaccination
+  end
+
   def given_my_team_is_running_an_hpv_vaccination_programme
     @programmes = [create(:programme, :hpv_all_vaccines)]
-    @team = create(:team, :with_one_nurse, programmes: @programmes)
+    @team =
+      create(
+        :team,
+        :with_one_nurse,
+        :with_generic_clinic,
+        programmes: @programmes
+      )
   end
 
   def and_there_is_a_vaccination_session_today
-    location = create(:school, team: @team)
     @session =
-      create(:session, :today, programmes: @programmes, team: @team, location:)
+      create(
+        :session,
+        :today,
+        programmes: @programmes,
+        team: @team,
+        location: create(:school, team: @team)
+      )
   end
 
   def and_there_is_a_vaccination_session_today_that_requires_no_registration
-    location = create(:school, team: @team)
     @session =
       create(
         :session,
         :today,
         :requires_no_registration,
         programmes: @programmes,
         team: @team,
-        location:
+        location: create(:school, team: @team)
+      )
+  end
+
+  def and_there_is_a_vaccination_session_yesterday_that_requires_no_registration
+    @session =
+      create(
+        :session,
+        :yesterday,
+        :requires_no_registration,
+        programmes: @programmes,
+        team: @team,
+        location: create(:school, team: @team)
       )
   end
 
@@ -112,18 +149,28 @@ def when_i_go_to_the_session
     click_link @session.location.name
   end
 
+  def and_i_click_on_the_children_tab
+    within(".app-secondary-navigation") { click_on "Children" }
+  end
+
   def and_i_click_on_the_register_tab
     click_link "Register"
   end
 
-  def when_i_click_on_the_record_vaccinations_tab
+  def and_i_click_on_the_record_tab
     click_link "Record vaccinations"
   end
 
   def then_i_do_not_see_the_register_tab
     expect(page).not_to have_content("Register")
   end
 
+  def then_i_cant_see_the_patients
+    expect(page).to have_content(
+      "You can record vaccinations when a session is in progress."
+    )
+  end
+
   def then_i_should_not_see_link_to_update_attendance
     expect(page).not_to have_content("Update attendance")
   end
@@ -226,4 +273,8 @@ def and_i_turn_off_register_attendance
     choose "No"
     click_on "Continue"
   end
+
+  def then_i_cant_record_a_vaccination
+    expect(page).not_to have_content("Record vaccination")
+  end
 end