Merge pull request #4181 from nhsuk/next

Version 2.14

Author: thomasleese

Gemfile.lock

@@ -113,34 +113,34 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1140.0)
+    aws-partitions (1.1141.0)
     aws-sdk-accessanalyzer (1.75.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.228.0)
+    aws-sdk-core (3.229.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.544.0)
+    aws-sdk-ec2 (1.545.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.107.0)
+    aws-sdk-ecr (1.108.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.126.0)
+    aws-sdk-iam (1.127.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.109.0)
+    aws-sdk-kms (1.110.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.285.0)
+    aws-sdk-rds (1.286.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.195.0)
+    aws-sdk-s3 (1.196.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -429,8 +429,8 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pg (1.6.0-arm64-darwin)
-    pg (1.6.0-x86_64-linux)
+    pg (1.6.1-arm64-darwin)
+    pg (1.6.1-x86_64-linux)
     phonelib (0.10.11)
     pp (0.6.2)
       prettyprint

README.md

@@ -229,14 +229,14 @@ You can generate an example programme by seeding the database with `rails db:see
 
 #### Adding a test user
 
-You can add a new user to an environment using the `users:create` [rake task](docs/rake-tasks.md#userscreateemailpasswordgiven_namefamily_nameorganisation_ods_code):
+You can add a new user to an environment using the `users:create` [rake task](docs/rake-tasks.md#userscreateemailpasswordgiven_namefamily_nameteam_ods_code):
 
 ```shell
 
 # With no arguments, it will prompt you for all the information it needs:
 rails users:create
 
-# Or, create a user belonging to the organisation with ODS code 'R1L' (this is created in db/seeds.rb):
+# Or, create a user belonging to the team with ODS code 'R1L' (this is created in db/seeds.rb):
 rails users:create['user@example.com','password123','John', 'Doe','R1L']
 
 # Note that on some Mac machines, this syntax can throw an error saying something like 'zsh: bad pattern', in which case you may need to remove the single quotes and escape the square brackets:
@@ -279,7 +279,7 @@ because it's easier to work offline without it.
 
 GOV.UK Notify can store reply-to email addresses and use them when sending mail.
 Once you've added the reply-to email in GOV.UK Notify, get the UUID and add it to
-the organisation.
+the team.
 
 ### Care Identity Service (CIS2)
 
@@ -297,7 +297,7 @@ curl -s https://am.nhsint.auth-ptl.cis2.spineservices.nhs.uk/openam/oauth2/realm
 ```
 
 Clients in the INT environment can be configured via CIS2 Connection Manager,
-please contact other organisation members to get the details for that. Mavis can
+please contact other team members to get the details for that. Mavis can
 use either a client secret or a private key JWT when authenticating requests to
 CIS2, these are configured via the Connection Manager.
 
@@ -340,7 +340,7 @@ See the [releasing documentation](docs/releasing.md) for more information.
 - `access_log:for_patient[id]`
 - `access_log:for_user[id]`
 - `subteams:create[ods_code,name,email,phone]`
-- `users:create[email,password,given_name,family_name,organisation_ods_code]`
+- `users:create[email,password,given_name,family_name,team_ods_code]`
 - `vaccines:seed[type]`
 
 See the [Rake tasks documentation](docs/rake-tasks.md) for more information.

app/components/app_activity_log_component.rb

@@ -32,6 +32,7 @@ def initialize(patient: nil, patient_session: nil)
         :consent_form,
         :parent,
         :recorded_by,
+        :programme,
         patient: :parent_relationships
       )
 
@@ -60,6 +61,8 @@ def initialize(patient: nil, patient_session: nil)
         :performed_by_user,
         :vaccine
       )
+
+    @patient_specific_directions = @patient.patient_specific_directions
   end
 
   attr_reader :patient,
@@ -71,7 +74,8 @@ def initialize(patient: nil, patient_session: nil)
               :pre_screenings,
               :session_attendances,
               :triages,
-              :vaccination_records
+              :vaccination_records,
+              :patient_specific_directions
 
   def events_by_day
     all_events.sort_by { -_1[:at].to_i }.group_by { _1[:at].to_date }
@@ -87,7 +91,8 @@ def all_events
       pre_screening_events,
       session_events,
       triage_events,
-      vaccination_events
+      vaccination_events,
+      decision_expiration_events
     ].flatten
   end
 
@@ -294,4 +299,63 @@ def programmes_for(object)
   def programmes_by_id
     @programmes_by_id ||= Programme.all.index_by(&:id)
   end
+
+  def decision_expiration_events
+    all_programmes = Programme.all.to_a
+
+    AcademicYear.all.filter_map do |academic_year|
+      next if academic_year >= AcademicYear.current
+
+      vaccinated_programmes =
+        all_programmes.select do |programme|
+          patient.vaccination_status(programme:, academic_year:).vaccinated?
+        end
+
+      programmes_with_expired_consents =
+        consents
+          .select { it.academic_year == academic_year }
+          .flat_map { programmes_for(it) }
+          .reject { vaccinated_programmes.include?(it) }
+
+      programmes_with_expired_triages =
+        triages
+          .select { it.academic_year == academic_year }
+          .flat_map { programmes_for(it) }
+          .reject { vaccinated_programmes.include?(it) }
+
+      programmes_with_expired_psds =
+        patient_specific_directions
+          .select { it.academic_year == academic_year }
+          .flat_map { programmes_for(it) }
+          .reject { vaccinated_programmes.include?(it) }
+
+      expired_items = []
+      if programmes_with_expired_consents.any?
+        expired_items += ["consent", "health information"]
+      end
+      expired_items << "triage outcome" if programmes_with_expired_triages.any?
+      expired_items << "PSD status" if programmes_with_expired_psds.any?
+
+      next if expired_items.empty?
+
+      programmes_with_expired_items = [
+        programmes_with_expired_consents,
+        programmes_with_expired_triages,
+        programmes_with_expired_psds
+      ].flatten.uniq
+
+      expired_items_sentence =
+        expired_items.to_sentence(
+          words_connector: ", ",
+          last_word_connector: " and "
+        )
+
+      {
+        title: "#{expired_items_sentence.upcase_first} expired",
+        body: "#{@patient.full_name} was not vaccinated.",
+        at: academic_year.to_academic_year_date_range.end.end_of_day - 1.second,
+        programmes: programmes_with_expired_items
+      }
+    end
+  end
 end

app/components/app_consent_summary_component.rb

@@ -61,6 +61,13 @@ def call
         end
       end
 
+      unless consent.notify_parent_on_refusal.nil?
+        summary_list.with_row do |row|
+          row.with_key { "Confirmation of decision sent to parent" }
+          row.with_value { consent.notify_parent_on_refusal ? "Yes" : "No" }
+        end
+      end
+
       if consent.notes.present?
         summary_list.with_row do |row|
           row.with_key { "Notes" }

app/components/app_count_component.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
 class AppCountComponent < ViewComponent::Base
-  erb_template <<-ERB
-    <span class="app-count">
-      <span class="nhsuk-u-visually-hidden">(</span>
-      <%= @count %>
-      <span class="nhsuk-u-visually-hidden">)</span>
-    </span>
-  ERB
-
-  def initialize(count:)
+  def initialize(count)
     super
 
     @count = count
   end
+
+  def call
+    tag.span(class: "app-count") do
+      safe_join(
+        [
+          tag.span("(", class: "nhsuk-u-visually-hidden"),
+          @count.to_s,
+          tag.span(")", class: "nhsuk-u-visually-hidden")
+        ]
+      )
+    end
+  end
 end

app/components/app_header_navigation_item_component.rb

@@ -18,7 +18,7 @@ def call
         aria: {
           current: current? ? "true" : nil
         }
-      ) { safe_join([@title, count_tag], "") }
+      ) { safe_join([@title, count_tag].compact, " ") }
     end
   end
 
@@ -39,11 +39,6 @@ def show_count?
   end
 
   def count_tag
-    return "" unless show_count?
-
-    tag.span(class: "app-count") do
-      tag.span(" (", class: "nhsuk-u-visually-hidden") + @count.to_s +
-        tag.span(")", class: "nhsuk-u-visually-hidden")
-    end
+    render AppCountComponent.new(@count) if show_count?
   end
 end

app/components/app_import_format_details_component.rb

@@ -9,7 +9,7 @@ def initialize(import:)
 
   private
 
-  delegate :organisation, to: :@import
+  delegate :team, to: :@import
 
   def summary_text
     case @import
@@ -184,8 +184,7 @@ def parent_columns
   end
 
   def programme
-    programmes =
-      organisation.programmes.flat_map(&:import_names).map { tag.i(it) }
+    programmes = team.programmes.flat_map(&:import_names).map { tag.i(it) }
 
     programmes_sentence =
       programmes.to_sentence(
@@ -202,7 +201,7 @@ def programme
   end
 
   def vaccine_and_batch
-    vaccines = organisation.vaccines.pluck(:nivs_name).map { tag.i(it) }
+    vaccines = team.vaccines.pluck(:nivs_name).map { tag.i(it) }
 
     vaccines_sentence =
       vaccines.to_sentence(

app/components/app_imports_navigation_component.rb

@@ -36,24 +36,18 @@ def call
   attr_reader :active
 
   def issues_text
-    vaccination_records_with_issues =
-      helpers.policy_scope(VaccinationRecord).with_pending_changes.distinct
-
-    patients_with_issues = helpers.policy_scope(Patient).with_pending_changes
-
-    unique_import_issues =
-      (vaccination_records_with_issues + patients_with_issues).uniq do |record|
-        record.is_a?(VaccinationRecord) ? record.patient_id : record.id
-      end
-
-    count = unique_import_issues.count
-
-    safe_join(["Import issues", " ", render(AppCountComponent.new(count:))])
+    safe_join(
+      [
+        "Import issues",
+        " ",
+        render(AppCountComponent.new(helpers.import_issues_count))
+      ]
+    )
   end
 
   def notices_text
     count = helpers.policy_scope(Patient).with_notice.count
 
-    safe_join(["Important notices", " ", render(AppCountComponent.new(count:))])
+    safe_join(["Important notices", " ", render(AppCountComponent.new(count))])
   end
 end

app/components/app_imports_table_component.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class AppImportsTableComponent < ViewComponent::Base
-  def initialize(organisation:)
+  def initialize(team:)
     super
 
-    @organisation = organisation
+    @team = team
   end
 
   def render?
@@ -13,7 +13,7 @@ def render?
 
   private
 
-  attr_reader :organisation
+  attr_reader :team
 
   def imports
     @imports ||=
@@ -26,7 +26,7 @@ def imports
   def class_import_records
     ClassImport
       .select("class_imports.*", "COUNT(patients.id) AS record_count")
-      .where(organisation:)
+      .where(team:)
       .left_outer_joins(:patients)
       .includes(:location, :uploaded_by)
       .group("class_imports.id")
@@ -35,7 +35,7 @@ def class_import_records
   def cohort_import_records
     CohortImport
       .select("cohort_imports.*", "COUNT(patients.id) AS record_count")
-      .where(organisation:)
+      .where(team:)
       .left_outer_joins(:patients)
       .includes(:uploaded_by)
       .group("cohort_imports.id")
@@ -47,7 +47,7 @@ def immunisation_import_records
         "immunisation_imports.*",
         "COUNT(vaccination_records.id) AS record_count"
       )
-      .where(organisation:)
+      .where(team:)
       .left_outer_joins(:vaccination_records)
       .includes(:uploaded_by)
       .group("immunisation_imports.id")

app/components/app_patient_cohort_table_component.html.erb

@@ -1,4 +1,4 @@
-<% if organisation %>
+<% if team %>
   <%= govuk_table(html_attributes: {
                     class: "nhsuk-table-responsive",
                   }) do |table| %>
@@ -18,7 +18,7 @@
         <% row.with_cell do %>
           <span class="nhsuk-table-responsive__heading">Actions</span>
           <%= form_with model: @patient, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
-            <%= f.hidden_field :organisation_id, value: organisation.id %>
+            <%= f.hidden_field :team_id, value: team.id %>
             <%= f.govuk_submit "Remove from cohort", class: "app-button--secondary-warning app-button--small" %>
           <% end %>
         <% end %>