Merge pull request #5248 from nhsuk/next

Version 5.9.0

Author: misaka

Gemfile.lock

@@ -109,13 +109,13 @@ GEM
     array_enum (1.6.0)
       activemodel
     asciidoctor (2.0.26)
-    asciidoctor-diagram (3.0.1)
+    asciidoctor-diagram (3.1.0)
       asciidoctor (>= 1.5.7, < 3.x)
       rexml
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1182.0)
+    aws-partitions (1.1183.0)
     aws-sdk-accessanalyzer (1.81.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
@@ -127,7 +127,7 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.577.0)
+    aws-sdk-ec2 (1.578.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.113.0)
@@ -157,7 +157,7 @@ GEM
     bigdecimal (3.3.1)
     bindata (2.5.1)
     bindex (0.8.1)
-    bootsnap (1.18.6)
+    bootsnap (1.19.0)
       msgpack (~> 1.2)
     brakeman (7.1.1)
       racc

app/assets/stylesheets/components/_card.scss

@@ -66,6 +66,11 @@
   &--offset {
     background-color: rgba(nhsuk-colour("grey-5"), 0.5);
   }
+
+  &--disabled {
+    opacity: 0.5;
+    pointer-events: none;
+  }
 }
 
 .app-card--compact {

app/components/app_activity_log_component.rb

@@ -47,7 +47,7 @@ def initialize(team:, patient:, session: nil)
         .gillick_assessments
         .includes(:performed_by)
         .order(:created_at)
-        .then { |scope| session ? scope.where_session(session) : scope }
+        .then { |scope| session ? scope.for_session(session) : scope }
 
     @notes =
       @patient
@@ -83,7 +83,7 @@ def initialize(team:, patient:, session: nil)
       @patient
         .pre_screenings
         .includes(:performed_by)
-        .then { |scope| session ? scope.where_session(session) : scope }
+        .then { |scope| session ? scope.for_session(session) : scope }
 
     @triages =
       @patient

app/components/app_card_component.rb

@@ -45,7 +45,8 @@ def initialize(
     secondary: false,
     compact: false,
     filters: false,
-    section: false
+    section: false,
+    disabled: false
   )
     @link_to = link_to
     @colour = colour
@@ -54,6 +55,7 @@ def initialize(
     @compact = compact
     @filters = filters
     @section = section
+    @disabled = disabled
   end
 
   private
@@ -69,7 +71,8 @@ def card_classes
       "app-card",
       ("app-card--compact" if @compact),
       ("app-card--#{@colour}" if @colour.present?),
-      ("app-filters" if @filters)
+      ("app-filters" if @filters),
+      ("app-card--disabled" if @disabled)
     ].compact.join(" ")
   end
 

app/components/app_gillick_assessment_component.rb

@@ -18,7 +18,7 @@ def gillick_assessment
       patient
         .gillick_assessments
         .order(created_at: :desc)
-        .where_session(session)
+        .for_session(session)
         .find_by(programme:)
   end
 

app/components/app_patient_search_form_component.html.erb

@@ -30,7 +30,7 @@
       <% end %>
     <% end %>
 
-    <% if tallying_enabled? && (show_still_to_vaccinate || show_eligible_children) %>
+    <% if show_still_to_vaccinate || show_eligible_children %>
       <%= f.govuk_check_boxes_fieldset :show_only,
                                        multiple: true,
                                        legend: { text: "Show only", size: "s" },

app/components/app_patient_search_form_component.rb

@@ -54,7 +54,6 @@ def initialize(
   delegate :format_year_group,
            :govuk_button_link_to,
            :govuk_details,
-           :tallying_enabled?,
            to: :helpers
 
   def open_details?

app/components/app_patient_session_record_component.rb

@@ -45,12 +45,11 @@ def vaccination_record
 
   def default_vaccinate_form
     pre_screening_confirmed = patient.pre_screenings.today.exists?(programme:)
-    session_date = session.session_dates.today.first
 
     VaccinateForm.new(
       current_user:,
       patient:,
-      session_date:,
+      session:,
       programme:,
       pre_screening_confirmed:
     )