v2.2.2 (work in progress)

Gemfile.lock

@@ -110,11 +110,11 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1090.0)
+    aws-partitions (1.1103.0)
     aws-sdk-accessanalyzer (1.70.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.223.0)
+    aws-sdk-core (3.224.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -130,13 +130,13 @@ GEM
     aws-sdk-iam (1.120.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.100.0)
+    aws-sdk-kms (1.101.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-rds (1.269.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.185.0)
+    aws-sdk-s3 (1.186.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -187,7 +187,7 @@ GEM
     crass (1.0.6)
     cssbundling-rails (1.4.1)
       railties (>= 6.0.0)
-    csv (3.3.2)
+    csv (3.3.4)
     cuprite (0.15.1)
       capybara (~> 3.0)
       ferrum (~> 0.15.0)
@@ -202,7 +202,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.6.1)
+    diff-lcs (1.6.2)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     docile (1.4.0)
@@ -329,7 +329,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -416,7 +416,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
-    phonelib (0.10.4)
+    phonelib (0.10.8)
     pp (0.6.2)
       prettyprint
     prettier_print (1.2.1)
@@ -432,7 +432,7 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
     public_suffix (6.0.1)
@@ -520,24 +520,24 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (8.0.0)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.2)
+    rspec-support (3.13.3)
     rubocop (1.75.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -595,7 +595,7 @@ GEM
     sentry-ruby (5.23.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     simplecov (0.22.0)
       docile (~> 1.1)

app/assets/stylesheets/_grid.scss

@@ -1,5 +1,5 @@
 // Search filters and results
-.app-grid-column-filters > .nhsuk-card--feature,
+.app-grid-column-filters .nhsuk-card--feature.app-filters,
 .app-grid-column-results > .nhsuk-card--feature,
 .app-grid-column-results > .nhsuk-warning-callout {
   margin-top: nhsuk-spacing(3);

app/components/app_programme_stats_component.html.erb

@@ -0,0 +1,22 @@
+<div class="nhsuk-grid-row nhsuk-card-group">
+  <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
+    <%= render AppCardComponent.new(link_to: programme_cohorts_path(@programme), colour: "reversed", data: true) do |card| %>
+      <% card.with_heading { "Children" } %>
+      <% card.with_description { patients_count.to_s } %>
+    <% end %>
+  </div>
+
+  <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
+    <%= render AppCardComponent.new(link_to: programme_vaccination_records_path(@programme), colour: "reversed", data: true) do |card| %>
+      <% card.with_heading { "Vaccinations" } %>
+      <% card.with_description { vaccinations_count.to_s } %>
+    <% end %>
+  </div>
+
+  <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
+    <%= render AppCardComponent.new(data: true, colour: "reversed") do |card| %>
+      <% card.with_heading { "Consent requests and reminders sent" } %>
+      <% card.with_description { consent_notifications_count.to_s } %>
+    <% end %>
+  </div>
+</div>

app/components/app_programme_stats_component.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AppProgrammeStatsComponent < ViewComponent::Base
+  def initialize(programme:)
+    super
+    @programme = programme
+  end
+
+  def patients_count
+    helpers.policy_scope(Patient).in_programmes([@programme]).count
+  end
+
+  def vaccinations_count
+    helpers.policy_scope(VaccinationRecord).where(programme: @programme).count
+  end
+
+  def consent_notifications_count
+    helpers.policy_scope(ConsentNotification).has_programme(@programme).count
+  end
+end

app/controllers/cohorts_controller.rb

@@ -15,6 +15,9 @@ def index
         .where(birth_academic_year: birth_academic_years)
         .group(:birth_academic_year)
         .count
+        .sort
+        .reverse
+        .to_h
 
     birth_academic_years.each do |birth_academic_year|
       @patient_count_by_birth_academic_year[birth_academic_year] ||= 0

app/controllers/concerns/authentication_concern.rb

@@ -19,10 +19,12 @@ def authenticate_user!
           redirect_to start_path
         end
       elsif cis2_session?
-        if !selected_cis2_org_is_registered?
-          redirect_to users_organisation_not_found_path
+        if !selected_cis2_workgroup_is_valid?
+          redirect_to users_workgroup_not_found_path
         elsif !selected_cis2_role_is_valid?
           redirect_to users_role_not_found_path
+        elsif !selected_cis2_org_is_registered?
+          redirect_to users_organisation_not_found_path
         end
       end
     end
@@ -38,8 +40,8 @@ def selected_cis2_org_is_registered?
     end
 
     def selected_cis2_workgroup_is_valid?
-      selected_cis2_nrbac_role.key?("workgroups") &&
-        CIS2_WORKGROUP.in?(selected_cis2_nrbac_role["workgroups"])
+      workgroups = session.dig("cis2_info", "selected_role", "workgroups")
+      workgroups.present? && CIS2_WORKGROUP.in?(workgroups)
     end
 
     def valid_cis2_roles

app/controllers/parent_interface/consent_forms/base_controller.rb

@@ -5,6 +5,10 @@ class ConsentForms::BaseController < ApplicationController
     skip_before_action :authenticate_user!
     skip_after_action :verify_policy_scoped
 
+    prepend_before_action :set_team
+    prepend_before_action :set_programmes
+    prepend_before_action :set_organisation
+    prepend_before_action :set_session
     prepend_before_action :set_consent_form
     before_action :authenticate_consent_form_user!
     before_action :set_privacy_policy_url
@@ -16,10 +20,41 @@ def set_consent_form
         ConsentForm.includes(:programmes, :vaccines).find(
           params[:consent_form_id] || params[:id]
         )
-      @organisation = @consent_form.organisation
-      @programmes = @consent_form.programmes
-      @session = @consent_form.original_session
-      @team = @consent_form.team
+    end
+
+    def set_session
+      if params[:session_slug]
+        @session = Session.find_by!(slug: params[:session_slug])
+      elsif @consent_form.present?
+        @session = @consent_form.original_session
+      end
+    end
+
+    def set_organisation
+      @organisation =
+        if @consent_form.present?
+          @consent_form.organisation
+        elsif @session.present?
+          @session.organisation
+        end
+    end
+
+    def set_programmes
+      @programmes =
+        if @consent_form.present?
+          @consent_form.programmes
+        elsif @session.present? && params[:programme_types].present?
+          @session.programmes.where(type: params[:programme_types].split("-"))
+        end
+    end
+
+    def set_team
+      @team =
+        if @consent_form.present?
+          @consent_form.team
+        elsif @session.present?
+          @session.team
+        end
     end
 
     def authenticate_consent_form_user!

app/controllers/parent_interface/consent_forms_controller.rb

@@ -4,8 +4,6 @@ module ParentInterface
   class ConsentFormsController < ConsentForms::BaseController
     include ConsentFormMailerConcern
 
-    prepend_before_action :set_session_and_programmes,
-                          only: %i[start create deadline_passed]
     skip_before_action :set_consent_form, only: %i[start create deadline_passed]
     skip_before_action :authenticate_consent_form_user!,
                        only: %i[start create deadline_passed]
@@ -63,21 +61,15 @@ def record
 
     private
 
-    def set_session_and_programmes
-      @session = Session.find_by!(slug: params[:session_slug])
-      @organisation = @session.organisation
-      @programmes =
-        @session.programmes.where(type: params[:programme_types].split("-"))
-      @team = @session.team
-    end
-
     def clear_session_edit_variables
       session.delete(:follow_up_changes_start_page)
     end
 
     def check_if_past_deadline
       return if @session.open_for_consent?
-      redirect_to action: :deadline_passed
+      redirect_to action: :deadline_passed,
+                  programme_types: @programmes.map(&:type).join("-"),
+                  session_slug: @session.slug
     end
   end
 end

app/controllers/patients_controller.rb

@@ -9,10 +9,7 @@ class PatientsController < ApplicationController
   before_action :record_access_log_entry, only: %i[show log]
 
   def index
-    patients =
-      @form.apply(
-        policy_scope(Patient).includes(:school).not_deceased.order_by_name
-      )
+    patients = @form.apply(policy_scope(Patient).includes(:school).not_deceased)
 
     @pagy, @patients = pagy(patients)
 

app/controllers/programmes_controller.rb

@@ -17,12 +17,6 @@ def index
 
   def show
     patients = policy_scope(Patient).in_programmes([@programme])
-
-    @patients_count = patients.count
-    @vaccinations_count =
-      policy_scope(VaccinationRecord).where(programme: @programme).count
-    @consent_notifications_count =
-      @programme.consent_notifications.has_programme(@programme).count
     @consents =
       policy_scope(Consent).where(patient: patients, programme: @programme)
   end

app/controllers/sessions/triage_controller.rb

@@ -10,7 +10,7 @@ class Sessions::TriageController < ApplicationController
   layout "full"
 
   def show
-    @statuses = Patient::TriageStatus.statuses.keys - [:not_required]
+    @statuses = Patient::TriageStatus.statuses.keys - %w[not_required]
     @programmes = @session.programmes
 
     scope =

app/controllers/users/omniauth_callbacks_controller.rb

@@ -14,12 +14,12 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def cis2
     set_cis2_session_info
 
-    if !selected_cis2_role_is_valid?
+    if !selected_cis2_workgroup_is_valid?
+      redirect_to users_workgroup_not_found_path
+    elsif !selected_cis2_role_is_valid?
       redirect_to users_role_not_found_path
     elsif !selected_cis2_org_is_registered?
       redirect_to users_organisation_not_found_path
-    elsif !selected_cis2_workgroup_is_valid?
-      redirect_to users_workgroup_not_found_path
     else
       @user = User.find_or_create_from_cis2_oidc(user_cis2_info)
 

app/forms/batch_form.rb

@@ -9,7 +9,15 @@ class BatchForm
   attribute :name, :string
   attribute :expiry, :date
 
-  validates :name, presence: true, format: { with: /\A[A-Za-z0-9]+\z/ }
+  validates :name,
+            presence: true,
+            format: {
+              with: /\A[A-Za-z0-9]+\z/
+            },
+            length: {
+              minimum: 2,
+              maximum: 100
+            }
 
   validates :expiry,
             comparison: {

app/helpers/phone_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module PhoneHelper
+  def format_phone_with_instructions(entity)
+    return entity.phone if entity.phone_instructions.blank?
+
+    "#{entity.phone} (#{entity.phone_instructions})"
+  end
+end