Merge pull request #6030 from nhsuk/next

v6.19.0

Author: misaka

app/components/app_import_review_school_moves_summary_component.html.erb

@@ -37,10 +37,11 @@
             <%= destination_school_name(changeset) %>
           </span>
           <% if school_move_across_teams?(changeset) %>
+            <% source_team = changeset.patient.teams_via_patient_locations.first %>
             <div class="nhsuk-u-margin-top-1">
               <%= render(
                     AppStatusComponent.new(
-                      text: "This child is moving in from #{changeset.patient.school.teams.first.name}'s area",
+                      text: "This child is moving in from #{source_team.name}'s area",
                       small: true,
                       classes: "nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-0",
                     )

app/components/app_import_review_school_moves_summary_component.rb

@@ -30,10 +30,13 @@ def destination_school(changeset)
   end
 
   def school_move_across_teams?(changeset)
-    patient = changeset.patient
     dest_school = destination_school(changeset)
 
-    dest_school && patient.school && patient.school.teams.any? &&
-      (dest_school.teams & patient.school.teams).empty?
+    current_teams = changeset.patient.teams_via_patient_locations
+    return false if current_teams.empty?
+
+    new_teams = dest_school&.teams || [changeset.import.team]
+
+    (new_teams & current_teams).empty?
   end
 end

app/components/app_import_statistics_component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AppImportStatisticsComponent < ViewComponent::Base
+  erb_template <<-ERB
+    <p><strong>Out of <%= pluralize(@import.records_count, "record") %> found in the file:</strong></p>
+    <ul>
+      <li><%= pluralize(@import.new_record_count, "new record") %> imported</li>
+      <li><%= pluralize(@import.exact_duplicate_record_count, "duplicate") %> not imported</li>
+      <li><%= pluralize(@import.ignored_record_count, "'not vaccinated' record") %> not imported</li>
+    </ul>
+  ERB
+
+  def initialize(import:)
+    @import = import
+  end
+end

app/components/app_import_summary_component.html.erb

@@ -48,11 +48,18 @@
       <% end %>
     <% end %>
 
-    <% if import.records_count && import.records_count.positive? %>
+    <% if import.records_count && import.status == "processed" %>
+      <% if import.is_a?(ImmunisationImport) && import.type == "national_reporting" %>
         <%= summary_list.with_row do |row| %>
-            <%= row.with_key { "Records" } %>
-            <%= row.with_value { import.records_count.to_s } %>
+          <%= row.with_key { "Import summary" } %>
+          <%= row.with_value { render AppImportStatisticsComponent.new(import: import) } %>
         <% end %>
+      <% elsif import.records_count.positive? %>
+        <%= summary_list.with_row do |row| %>
+          <%= row.with_key { "Records" } %>
+          <%= row.with_value { import.records_count.to_s } %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
 

app/components/app_imports_table_component.html.erb

@@ -9,7 +9,9 @@
     <% table.with_head do |head| %>
       <% head.with_row do |row| %>
         <% row.with_cell(text: "Imported on") %>
-        <% row.with_cell(text: "Type") %>
+        <% unless @team.has_national_reporting_access? %>
+          <% row.with_cell(text: "Type") %>
+        <% end %>
         <% row.with_cell(text: "Status") %>
         <% row.with_cell(text: "Records", numeric: true) unless @uploaded_files %>
       <% end %>
@@ -26,14 +28,16 @@
               <%= import.csv_filename %>
             </span>
           <% end %>
-          <% row.with_cell do %>
-            <span class="nhsuk-table-responsive__heading">Type</span>
-            <%= record_type(import) %>
-            <% if import.is_a?(ClassImport) %>
-              <br />
-              <span class="nhsuk-u-secondary-text-colour nhsuk-u-font-size-16">
-                <%= import.location.name %>
-              </span>
+          <% unless @team.has_national_reporting_access? %>
+            <% row.with_cell do %>
+              <span class="nhsuk-table-responsive__heading">Type</span>
+              <%= record_type(import) %>
+              <% if import.is_a?(ClassImport) %>
+                <br />
+                <span class="nhsuk-u-secondary-text-colour nhsuk-u-font-size-16">
+                  <%= import.location.name %>
+                </span>
+              <% end %>
             <% end %>
           <% end %>
           <% row.with_cell do %>

app/components/app_patient_card_component.rb

@@ -92,15 +92,13 @@ def gillick_no_notify_notices
   end
 
   def team_changed_notices
-    return unless patient.school
-
     valid_notices =
       patient
         .important_notices
         .team_changed
         .includes(:school_move_log_entry)
         .where(team: current_team)
-        .where.not(team: patient.school.teams)
+        .where.not(team: patient.teams_via_patient_locations)
 
     valid_notices.map(&:message)
   end

app/components/app_vaccination_record_summary_component.rb

@@ -234,7 +234,8 @@ def call
         end
       end
 
-      if @vaccination_record.performed_by.present?
+      if @vaccination_record.performed_by.present? ||
+           Flipper.enabled?(:already_vaccinated)
         summary_list.with_row do |row|
           row.with_key { "Vaccinator" }
           row.with_value { vaccinator_value }
@@ -293,12 +294,29 @@ def call
         end
       end
 
+      if Flipper.enabled?(:already_vaccinated) &&
+           @vaccination_record.reported_by.present?
+        summary_list.with_row do |row|
+          row.with_key { "Reported by" }
+          row.with_value { @vaccination_record.reported_by&.full_name }
+        end
+      end
+
+      if Flipper.enabled?(:already_vaccinated) &&
+           @vaccination_record.reported_at.present?
+        summary_list.with_row do |row|
+          row.with_key { "Reported on" }
+          row.with_value { @vaccination_record.reported_at.to_fs(:long) }
+        end
+      end
+
       correct_feature_flags_enabled =
-        Programme.all.any? { Flipper.enabled?(:imms_api_sync_job, it) } &&
-          Flipper.enabled?(:imms_api_integration)
+        Programme.all_as_variants.any? do
+          Flipper.enabled?(:imms_api_sync_job, it)
+        end && Flipper.enabled?(:imms_api_integration)
       if @vaccination_record.respond_to?(:sync_status) &&
            correct_feature_flags_enabled &&
-           @vaccination_record&.correct_source_for_nhs_immunisations_api?
+           @vaccination_record.correct_source_for_nhs_immunisations_api?
         summary_list.with_row do |row|
           row.with_key { "Synced with NHS England?" }
           row.with_value do
@@ -327,10 +345,16 @@ def source_value
   end
 
   def outcome_value
-    highlight_if(
-      VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome),
-      @vaccination_record.outcome_changed?
-    )
+    outcome =
+      VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome)
+
+    if Flipper.enabled?(:already_vaccinated) &&
+         @vaccination_record.already_had? &&
+         @vaccination_record.reported_as_already_vaccinated?
+      outcome = VaccinationRecord.human_enum_name(:outcome, "administered")
+    end
+
+    highlight_if(outcome, @vaccination_record.outcome_changed?)
   end
 
   def programme_value
@@ -418,8 +442,10 @@ def vaccinator_value
     value =
       if @vaccination_record.performed_by == @current_user
         "You (#{@current_user.full_name})"
-      else
+      elsif @vaccination_record.performed_by
         @vaccination_record.performed_by&.full_name
+      else
+        "Unknown"
       end
 
     highlight_if(

app/controllers/api/reporting/totals_controller.rb

@@ -28,8 +28,13 @@ class API::Reporting::TotalsController < API::Reporting::BaseController
 
   METRIC_HEADERS = {
     cohort: "Cohort",
-    vaccinated: "Vaccinated",
-    not_vaccinated: "Not Vaccinated"
+    no_consent: "No Consent",
+    consent_no_response: "Consent No Response",
+    consent_refused: "Consent Refused",
+    consent_conflicts: "Consent Conflicts",
+    consent_given: "Consent Given",
+    not_vaccinated: "Not Vaccinated",
+    vaccinated: "Vaccinated"
   }.freeze
 
   FLU_SPECIFIC_METRIC_HEADERS = {}.freeze
@@ -139,7 +144,12 @@ def grouped_record_json(record, groups)
       .merge(
         cohort: record.cohort,
         vaccinated: record.vaccinated,
-        not_vaccinated: record.not_vaccinated
+        not_vaccinated: record.not_vaccinated,
+        consent_given: record.consent_given,
+        no_consent: record.no_consent,
+        consent_no_response: record.consent_no_response,
+        consent_refused: record.consent_refused,
+        consent_conflicts: record.consent_conflicts
       )
   end
 
@@ -151,15 +161,17 @@ def render_totals_json
       cohort:,
       vaccinated:,
       not_vaccinated: cohort - vaccinated,
+      consent_given: @totals_scope.consent_given_count,
+      no_consent: @totals_scope.no_consent_count,
+      consent_no_response: @totals_scope.consent_no_response_count,
+      consent_refused: @totals_scope.consent_refused_count,
+      consent_conflicts: @totals_scope.consent_conflicts_count,
       vaccinated_by_sais: @scope.vaccinated_by_sais_count,
       vaccinated_elsewhere_declared: @scope.vaccinated_elsewhere_declared_count,
       vaccinated_elsewhere_recorded: @scope.vaccinated_elsewhere_recorded_count,
       vaccinated_previously: @scope.vaccinated_previously_count,
       vaccinations_given: @base_scope.vaccinations_given_count,
       monthly_vaccinations_given: @base_scope.monthly_vaccinations_given,
-      consent_given: @scope.consent_given_count,
-      consent_no_response: @scope.consent_no_response_count,
-      consent_conflicts: @scope.consent_conflicts_count,
       parent_refused_consent: @scope.parent_refused_consent_count,
       child_refused_vaccination: @scope.child_refused_vaccination_count,
       refusal_reasons: consent_refusal_reasons,

app/controllers/draft_vaccination_records_controller.rb

@@ -70,6 +70,11 @@ def update
 
   def validate_params
     if current_step == :date_and_time
+      TimeParamsNormalizer.call!(
+        params: params[:draft_vaccination_record],
+        field_name: :performed_at_time
+      )
+
       date_validator =
         DateParamsValidator.new(
           field_name: :performed_at_date,
@@ -142,7 +147,8 @@ def handle_mmr_or_mmrv
   end
 
   def handle_location
-    if @draft_vaccination_record.national_reporting_user_and_record?
+    if @session&.generic_clinic? ||
+         @draft_vaccination_record.national_reporting_user_and_record?
       location_id = update_params[:location_id]
 
       if location_id == "unknown"

app/controllers/patient_sessions/programmes_controller.rb

@@ -18,21 +18,36 @@ def record_already_vaccinated
       DraftVaccinationRecord.new(request_session: session, current_user:)
 
     draft_vaccination_record.clear_attributes
+
+    first_active_wizard_step =
+      if Flipper.enabled?(:already_vaccinated)
+        eligible_for_mmr_or_mmrv? ? :mmr_or_mmrv : :date_and_time
+      else
+        :confirm
+      end
+
     draft_vaccination_record.update!(
-      first_active_wizard_step: :confirm,
+      dose_sequence: (dose_sequence if Flipper.enabled?(:already_vaccinated)),
+      first_active_wizard_step:,
       location_id: nil,
       location_name: "Unknown",
       outcome: :already_had,
       patient: @patient,
-      performed_at: Time.current,
-      performed_by_user_id: current_user.id,
+      performed_at: (Time.current unless Flipper.enabled?(:already_vaccinated)),
+      performed_by_user_id:
+        (current_user.id unless Flipper.enabled?(:already_vaccinated)),
       performed_ods_code: current_team.organisation.ods_code,
       programme: @programme,
+      reported_by_id:
+        (current_user.id if Flipper.enabled?(:already_vaccinated)),
+      reported_at: (Time.current if Flipper.enabled?(:already_vaccinated)),
       session: @session,
       source: "service"
     )
 
-    redirect_to draft_vaccination_record_path("confirm")
+    redirect_to draft_vaccination_record_path(
+                  first_active_wizard_step.to_s.dasherize
+                )
   end
 
   private