Merge pull request #4206 from nhsuk/next

Version 2.15

Author: thomasleese

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     amazing_print (1.8.1)
-    annotaterb (4.17.0)
+    annotaterb (4.18.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
@@ -113,8 +113,8 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1141.0)
-    aws-sdk-accessanalyzer (1.75.0)
+    aws-partitions (1.1143.0)
+    aws-sdk-accessanalyzer (1.76.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-core (3.229.0)
@@ -125,7 +125,7 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.545.0)
+    aws-sdk-ec2 (1.546.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.108.0)
@@ -137,10 +137,10 @@ GEM
     aws-sdk-kms (1.110.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.286.0)
+    aws-sdk-rds (1.287.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.196.0)
+    aws-sdk-s3 (1.196.1)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -270,7 +270,7 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (4.11.1)
+    good_job (4.11.2)
       activejob (>= 6.1.0)
       activerecord (>= 6.1.0)
       concurrent-ruby (>= 1.3.1)
@@ -664,8 +664,8 @@ GEM
       syntax_tree (>= 2.0.1)
     temple (0.10.0)
     thor (1.4.0)
-    thruster (0.1.14-arm64-darwin)
-    thruster (0.1.14-x86_64-linux)
+    thruster (0.1.15-arm64-darwin)
+    thruster (0.1.15-x86_64-linux)
     tilt (2.6.0)
     timeout (0.4.3)
     turbo-rails (2.0.16)

app/assets/stylesheets/components/_status.scss

@@ -8,8 +8,11 @@
   gap: nhsuk-spacing(1);
 
   .nhsuk-icon {
+    flex-shrink: 0;
+    height: 1.5em;
     margin-left: nhsuk-spacing(-1);
     margin-top: nhsuk-spacing(-1);
+    width: 1.5em;
   }
 
   &--aqua-green {

app/components/app_activity_log_component.rb

@@ -14,7 +14,7 @@ class AppActivityLogComponent < ViewComponent::Base
     <% end %>
   ERB
 
-  def initialize(patient: nil, patient_session: nil)
+  def initialize(team:, patient: nil, patient_session: nil)
     super
 
     if patient.nil? && patient_session.nil?
@@ -63,14 +63,17 @@ def initialize(patient: nil, patient_session: nil)
       )
 
     @patient_specific_directions = @patient.patient_specific_directions
+
+    @archive_reasons = @patient.archive_reasons.where(team:)
   end
 
-  attr_reader :patient,
-              :patient_sessions,
+  attr_reader :archive_reasons,
               :consents,
               :gillick_assessments,
               :notes,
               :notify_log_entries,
+              :patient,
+              :patient_sessions,
               :pre_screenings,
               :session_attendances,
               :triages,
@@ -83,6 +86,7 @@ def events_by_day
 
   def all_events
     [
+      archive_events,
       attendance_events,
       consent_events,
       gillick_assessment_events,
@@ -96,6 +100,17 @@ def all_events
     ].flatten
   end
 
+  def archive_events
+    archive_reasons.flat_map do |archive_reason|
+      {
+        title: "Record archived: #{archive_reason.human_enum_name(:type)}",
+        body: archive_reason.other_details,
+        at: archive_reason.created_at,
+        by: archive_reason.created_by
+      }
+    end
+  end
+
   def consent_events
     consents.flat_map do |consent|
       events = []

app/components/app_child_summary_component.rb

@@ -1,11 +1,20 @@
 # frozen_string_literal: true
 
 class AppChildSummaryComponent < ViewComponent::Base
-  def initialize(child, show_parents: false, change_links: {}, remove_links: {})
+  def initialize(
+    child,
+    current_team: nil,
+    show_parents: false,
+    show_school_and_year_group: true,
+    change_links: {},
+    remove_links: {}
+  )
     super
 
     @child = child
+    @current_team = current_team
     @show_parents = show_parents
+    @show_school_and_year_group = show_school_and_year_group
     @change_links = change_links
     @remove_links = remove_links
   end
@@ -25,6 +34,14 @@ def call
           )
         end
       end
+
+      if archive_reason
+        summary_list.with_row do |row|
+          row.with_key { "Archive reason" }
+          row.with_value { format_archive_reason }
+        end
+      end
+
       summary_list.with_row do |row|
         row.with_key { "Full name" }
         row.with_value { format_full_name }
@@ -57,14 +74,16 @@ def call
           row.with_value { format_address }
         end
       end
-      summary_list.with_row do |row|
-        row.with_key { "School" }
-        row.with_value { format_school }
-      end
-      if @child.respond_to?(:year_group)
+      if @show_school_and_year_group
         summary_list.with_row do |row|
-          row.with_key { "Year group" }
-          row.with_value { format_year_group }
+          row.with_key { "School" }
+          row.with_value { format_school }
+        end
+        if @child.respond_to?(:year_group)
+          summary_list.with_row do |row|
+            row.with_key { "Year group" }
+            row.with_value { format_year_group }
+          end
         end
       end
       if (gp_practice = @child.try(:gp_practice))
@@ -112,10 +131,27 @@ def call
 
   def academic_year = AcademicYear.current
 
+  def archive_reason
+    @archive_reason ||=
+      if @current_team
+        ArchiveReason.find_by(team: @current_team, patient: @child)
+      end
+  end
+
   def format_nhs_number
     highlight_if(helpers.patient_nhs_number(@child), @child.nhs_number_changed?)
   end
 
+  def format_archive_reason
+    type_string = archive_reason.human_enum_name(:type)
+
+    if archive_reason.other?
+      "#{type_string}: #{archive_reason.other_details}"
+    else
+      type_string
+    end
+  end
+
   def format_full_name
     highlight_if(
       @child.full_name,

app/components/app_consent_summary_component.rb

@@ -54,6 +54,22 @@ def call
         end
       end
 
+      unless consent.notify_parents_on_vaccination.nil?
+        summary_list.with_row do |row|
+          row.with_key { "Confirmation of vaccination sent to parent?" }
+          row.with_value do
+            consent.notify_parents_on_vaccination ? "Yes" : "No"
+          end
+          if (href = change_links[:notify_parents_on_vaccination])
+            row.with_action(
+              text: "Change",
+              visually_hidden_text: "decision",
+              href:
+            )
+          end
+        end
+      end
+
       if consent.reason_for_refusal.present?
         summary_list.with_row do |row|
           row.with_key { "Reason for refusal" }
@@ -63,7 +79,7 @@ def call
 
       unless consent.notify_parent_on_refusal.nil?
         summary_list.with_row do |row|
-          row.with_key { "Confirmation of decision sent to parent" }
+          row.with_key { "Confirmation of decision sent to parent?" }
           row.with_value { consent.notify_parent_on_refusal ? "Yes" : "No" }
         end
       end

app/components/app_notices_table_component.rb

@@ -4,55 +4,39 @@ class AppNoticesTableComponent < ViewComponent::Base
   def initialize(
     deceased_patients:,
     invalidated_patients:,
-    restricted_patients:
+    restricted_patients:,
+    has_vaccination_records_dont_notify_parents_patients:
   )
     super
 
     @deceased_patients = deceased_patients
     @invalidated_patients = invalidated_patients
     @restricted_patients = restricted_patients
+    @has_vaccination_records_dont_notify_parents_patients =
+      has_vaccination_records_dont_notify_parents_patients
   end
 
   def render?
     @deceased_patients.present? || @invalidated_patients.present? ||
-      @restricted_patients.present?
+      @restricted_patients.present? ||
+      @has_vaccination_records_dont_notify_parents_patients.present?
   end
 
   private
 
   def notices
-    (deceased_notices + invalidated_notices + restricted_notices)
-      .sort_by { _1[:date] }
-      .reverse
-  end
-
-  def deceased_notices
-    @deceased_patients.map do |patient|
-      {
-        patient:,
-        date_time: patient.date_of_death_recorded_at,
-        message: "Record updated with child’s date of death"
-      }
-    end
-  end
-
-  def invalidated_notices
-    @invalidated_patients.map do |patient|
-      {
-        patient:,
-        date_time: patient.invalidated_at,
-        message: "Record flagged as invalid"
-      }
-    end
-  end
-
-  def restricted_notices
-    @restricted_patients.map do |patient|
-      {
-        patient:,
-        date_time: patient.restricted_at,
-        message: "Record flagged as sensitive"
-      }
-    end
+    all_patients =
+      (
+        @deceased_patients + @invalidated_patients + @restricted_patients +
+          @has_vaccination_records_dont_notify_parents_patients
+      ).uniq
+
+    notices =
+      all_patients.flat_map do |patient|
+        helpers
+          .patient_important_notices(patient)
+          .map { |notification| notification.merge(patient:) }
+      end
+    notices.sort_by { it[:date_time] }.reverse
   end
 end

app/components/app_patient_card_component.rb

@@ -4,41 +4,47 @@ class AppPatientCardComponent < ViewComponent::Base
   erb_template <<-ERB
     <%= render AppCardComponent.new(heading_level:, section: true) do |card| %>
       <% card.with_heading { "Child’s details" } %>
-
-      <% if patient.date_of_death.present? %>
-        <%= render AppStatusComponent.new(
-          text: "Record updated with child’s date of death"
-        ) %>
-      <% end %>
-
-      <% if patient.invalidated? %>
-        <%= render AppStatusComponent.new(
-          text: "Record flagged as invalid"
-        ) %>
+      
+      <% helpers.patient_important_notices(patient).each do |notification| %>
+        <%= render AppStatusComponent.new(text: notification[:message]) %>
       <% end %>
 
-      <% if patient.restricted? %>
-        <%= render AppStatusComponent.new(
-          text: "Record flagged as sensitive"
-        ) %>
-      <% end %>
-
-      <%= render AppChildSummaryComponent.new(patient, show_parents: true, change_links:, remove_links:) %>
+      <%= render AppChildSummaryComponent.new(
+        patient,
+        current_team:,
+        show_parents: true,
+        show_school_and_year_group:,
+        change_links:,
+        remove_links:
+      ) %>
 
       <%= content %>
     <% end %>
   ERB
 
-  def initialize(patient, change_links: {}, remove_links: {}, heading_level: 3)
+  def initialize(
+    patient,
+    current_team:,
+    change_links: {},
+    remove_links: {},
+    heading_level: 3
+  )
     super
 
     @patient = patient
+    @current_team = current_team
     @change_links = change_links
     @remove_links = remove_links
     @heading_level = heading_level
   end
 
   private
 
-  attr_reader :patient, :change_links, :remove_links, :heading_level
+  attr_reader :patient,
+              :current_team,
+              :change_links,
+              :remove_links,
+              :heading_level
+
+  def show_school_and_year_group = patient.show_year_group?(team: current_team)
 end