Remove record_attendance feature flag (#2599)

The recording attendance feature is going to be part of the next release
so we can remove the feature flag for it.

Author: thomasleese

app/components/app_patient_page_component.html.erb

@@ -121,9 +121,6 @@
   <% end %>
 <% end %>
 
-<% show_vaccination_form = helpers.policy(VaccinationRecord).create? %>
-<% show_vaccination_form &&= @patient_session.attending_today? if Flipper.enabled?(:record_attendance) %>
-
-<% if show_vaccination_form %>
+<% if helpers.policy(VaccinationRecord).create? && @patient_session.attending_today? %>
   <%= render AppVaccinateFormComponent.new(@vaccination_record, section: @section, tab: @tab) %>
 <% end %>

app/views/patient_sessions/show.html.erb

@@ -10,27 +10,25 @@
   <%= @patient.full_name %>
 <% end %>
 
-<% if Flipper.enabled?(:record_attendance) %>
-  <ul class="app-action-list">
-    <li class="app-action-list__item">
-      <% if @patient_session.current_attendance %>
-        <% if @patient_session.current_attendance.attending? %>
-          <%= govuk_tag(text: "Attending today’s session") %>
-        <% else %>
-          <%= govuk_tag(text: "Absent from today’s session", colour: "red") %>
-        <% end %>
+<ul class="app-action-list">
+  <li class="app-action-list__item">
+    <% if @patient_session.current_attendance %>
+      <% if @patient_session.current_attendance.attending? %>
+        <%= govuk_tag(text: "Attending today’s session") %>
       <% else %>
-        <%= govuk_tag(text: "Not registered yet", colour: "blue") %>
+        <%= govuk_tag(text: "Absent from today’s session", colour: "red") %>
       <% end %>
-    </li>
-    <li class="app-action-list__item">
-      <%= link_to(
-            "Update attendance",
-            edit_session_patient_attendance_path(patient_id: @patient.id)
-          ) %>
-    </li>
-  </ul>
-<% end %>
+    <% else %>
+      <%= govuk_tag(text: "Not registered yet", colour: "blue") %>
+    <% end %>
+  </li>
+  <li class="app-action-list__item">
+    <%= link_to(
+          "Update attendance",
+          edit_session_patient_attendance_path(patient_id: @patient.id)
+        ) %>
+  </li>
+</ul>
 
 <%= render AppSecondaryNavigationComponent.new do |nav|
       nav.with_item(

app/views/sessions/show.html.erb

@@ -67,7 +67,7 @@
           <% end %>
         </li>
 
-        <% if Flipper.enabled?(:record_attendance) && @session.today? %>
+        <% if @session.today? %>
           <li class="nhsuk-grid-column-full nhsuk-card-group__item">
             <%= render AppCardComponent.new(link_to: session_attendances_path(@session)) do |c| %>
               <% c.with_heading { "Register attendance" } %>

config/locales/en.yml

@@ -849,6 +849,7 @@ en:
     index:
       title: Vaccines
   attendance_flash:
+    absent: "%{name} is absent from today’s session."
     added_to_session: "%{name} is attending today’s session. They still need consent to vaccinate."
     consent_conflicts: "%{name} is attending today’s session. They still need consent to vaccinate."
     consent_given_triage_needed: "%{name} is attending today’s session. A nurse needs to triage their record."
@@ -857,9 +858,9 @@ en:
     delay_vaccination: "%{name} needs to leave the session because their vaccination is delayed to a later date."
     triaged_do_not_vaccinate: "%{name} needs to leave the session because their parent or guardian refused to give consent."
     triaged_kept_in_triage: "%{name} is attending today’s session. A nurse needs to triage their record."
+    triaged_ready_to_vaccinate: "%{name} is attending today’s session. They are safe to vaccinate."
     unable_to_vaccinate: "%{name} needs to leave the session because they cannot be vaccinated."
     vaccinated: "%{name} needs to leave the session because they have already been vaccinated."
-    absent: "%{name} is absent from today’s session."
   wicked:
     address: address
     agree: agree

spec/components/app_patient_page_component_spec.rb

@@ -98,6 +98,7 @@
         :patient_session,
         :triaged_ready_to_vaccinate,
         :session_in_progress,
+        :in_attendance,
         programme:
       )
     end

spec/factories/patient_sessions.rb

@@ -34,6 +34,12 @@
       association :patient, organisation:, school:, home_educated:, year_group:
     end
 
+    trait :in_attendance do
+      session_attendances do
+        [association(:session_attendance, :present, patient_session: instance)]
+      end
+    end
+
     trait :added_to_session
 
     trait :consent_given_triage_not_needed do

spec/factories/patients.rb

@@ -62,6 +62,7 @@
       end
       year_group { nil }
       location_name { nil }
+      in_attendance { false }
     end
 
     cohort do
@@ -107,14 +108,25 @@
 
     after(:create) do |patient, evaluator|
       if evaluator.session
-        patient.patient_sessions.find_or_create_by!(session: evaluator.session)
+        patient_session =
+          patient.patient_sessions.find_or_create_by!(
+            session: evaluator.session
+          )
+
+        if evaluator.in_attendance
+          create(:session_attendance, :present, patient_session:)
+        end
       end
 
       evaluator.parents.each do |parent|
         create(:parent_relationship, parent:, patient:)
       end
     end
 
+    trait :in_attendance do
+      in_attendance { true }
+    end
+
     trait :home_educated do
       school { nil }
       home_educated { true }

spec/features/e2e_journey_spec.rb

@@ -26,6 +26,10 @@
     when_i_register_verbal_consent_and_triage
     then_i_should_see_that_the_patient_is_ready_for_vaccination
 
+    # Attendance
+    when_i_click_on_the_register_attendance_section
+    and_i_record_the_patient_in_attendance
+
     # Vaccination
     when_i_click_on_the_vaccination_section
     and_i_record_the_successful_vaccination
@@ -207,9 +211,18 @@ def then_i_should_see_that_the_patient_is_ready_for_vaccination
     expect(page).to have_content "Safe to vaccinate"
   end
 
-  def when_i_click_on_the_vaccination_section
+  def when_i_click_on_the_register_attendance_section
     click_link "Back to consents page"
     click_link "Pilot School"
+    click_link "Register attendance"
+  end
+
+  def and_i_record_the_patient_in_attendance
+    click_on "Attending"
+  end
+
+  def when_i_click_on_the_vaccination_section
+    click_link "Back"
     click_link "Record vaccinations"
     click_link "Vaccinate ( 1 )"
   end

spec/features/hpv_vaccination_administered_spec.rb

@@ -77,7 +77,12 @@ def given_i_am_signed_in
 
     @session = create(:session, organisation:, programme:, location:)
     @patient =
-      create(:patient, :consent_given_triage_not_needed, session: @session)
+      create(
+        :patient,
+        :consent_given_triage_not_needed,
+        :in_attendance,
+        session: @session
+      )
 
     sign_in organisation.users.first
   end

spec/features/hpv_vaccination_already_had_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe "HPV Vaccination" do
-  scenario "Not administered" do
+  scenario "Already had" do
     given_i_am_signed_in
 
     when_i_go_to_a_patient_that_is_ready_to_vaccinate
@@ -33,7 +33,12 @@ def given_i_am_signed_in
     @batch = create(:batch, organisation:, vaccine: programme.vaccines.first)
     @session = create(:session, organisation:, programme:, location:)
     @patient =
-      create(:patient, :consent_given_triage_not_needed, session: @session)
+      create(
+        :patient,
+        :consent_given_triage_not_needed,
+        :in_attendance,
+        session: @session
+      )
 
     sign_in organisation.users.first
   end