Merge pull request #5447 from nhsuk/next

Author: thomasleese

Gemfile.lock

@@ -115,7 +115,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1188.0)
+    aws-partitions (1.1190.0)
     aws-sdk-accessanalyzer (1.82.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
@@ -139,10 +139,10 @@ GEM
     aws-sdk-kms (1.118.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.300.0)
+    aws-sdk-rds (1.301.0)
       aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
+    aws-sdk-s3 (1.206.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -174,7 +174,7 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    caxlsx (4.4.0)
+    caxlsx (4.4.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -237,7 +237,7 @@ GEM
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.5.2)
+    faker (3.5.3)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
@@ -301,7 +301,7 @@ GEM
       railties (>= 7.0.0)
     html-attributes-utils (1.0.2)
       activesupport (>= 6.1.4.4)
-    htmlentities (4.3.4)
+    htmlentities (4.4.2)
     http-cookie (1.1.0)
       domain_name (~> 0.5)
     i18n (1.14.7)

app/assets/stylesheets/components/_card.scss

@@ -108,7 +108,6 @@
 
   .nhsuk-card__content {
     @include nhsuk-responsive-padding(4);
-    @include nhsuk-responsive-padding(3, "bottom");
   }
 }
 

app/components/app_consent_confirmation_component.rb

@@ -25,22 +25,23 @@ def title
 
   private
 
+  attr_reader :consent_form
+
   delegate :given_consent_form_programmes,
            :refused_consent_form_programmes,
            :response_given?,
            :parent_email,
-           to: :@consent_form
+           to: :consent_form
+
   delegate :govuk_panel, to: :helpers
 
-  def full_name
-    @consent_form.full_name(context: :parents)
-  end
+  def full_name = consent_form.full_name(context: :parents)
 
   def panel_text
-    location = (@consent_form.education_setting_school? ? " at school" : "")
+    location = (consent_form.education_setting_school? ? " at school" : "")
 
     if response_given?
-      if @consent_form.health_answers_require_triage?
+      if consent_form.health_answers_require_triage?
         <<-END_OF_TEXT
           As you answered ‘yes’ to some of the health questions, we need to check
           the #{given_vaccinations_are} suitable for #{full_name}. We’ll review
@@ -85,10 +86,12 @@ def given_vaccinations_are
   end
 
   def dates
-    @consent_form
-      .session
-      .today_or_future_dates
-      .map { it.to_fs(:short_day_of_week) }
-      .to_sentence(two_words_connector: " or ", last_word_connector: " or ")
+    if consent_form.session_dates_are_accurate?
+      consent_form
+        .session
+        .today_or_future_dates
+        .map { it.to_fs(:short_day_of_week) }
+        .to_sentence(two_words_connector: " or ", last_word_connector: " or ")
+    end
   end
 end

app/components/app_consent_summary_component.rb

@@ -139,14 +139,22 @@ def chosen_vaccine_row
       if consent.vaccine_method_nasal_only?
         "Nasal spray only"
       elsif consent.without_gelatine
-        "Gelatine-free injected vaccine only"
+        gelatine_free_vaccine_text
       else
         "No preference"
       end
 
     { key: { text: "Chosen vaccine" }, value: { text: value } }
   end
 
+  def gelatine_free_vaccine_text
+    if programme.flu?
+      "Injected vaccine only"
+    else
+      "Gelatine-free injected vaccine only"
+    end
+  end
+
   def reason_for_refusal_row
     return if consent.reason_for_refusal.nil?
 

app/components/app_import_review_school_moves_summary_component.rb

@@ -20,7 +20,7 @@ def call
 
       table.with_body do |body|
         @changesets.each do |changeset|
-          patient = Patient.find(changeset.patient_id)
+          patient = changeset.patient
 
           body.with_row do |row|
             row.with_cell do

app/components/app_location_card_component.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+class AppLocationCardComponent < ViewComponent::Base
+  def initialize(location, patient_count:, next_session_date:)
+    @location = location
+    @patient_count = patient_count
+    @next_session_date = next_session_date
+  end
+
+  def call
+    render AppCardComponent.new(link_to:, compact: true) do |card|
+      card.with_heading(level: 4) { heading }
+      govuk_summary_list(rows:)
+    end
+  end
+
+  private
+
+  attr_reader :location, :patient_count, :next_session_date
+
+  delegate :govuk_summary_list, to: :helpers
+
+  def link_to
+    school_patients_path(
+      location.generic_clinic? ? Location::URN_UNKNOWN : location
+    )
+  end
+
+  def heading = location.school_name
+
+  def rows
+    [
+      patient_count_row,
+      urn_row,
+      phase_row,
+      address_row,
+      next_session_date_row
+    ].compact
+  end
+
+  def patient_count_row
+    {
+      key: {
+        text: "Children"
+      },
+      value: {
+        text: I18n.t("children", count: patient_count)
+      }
+    }
+  end
+
+  def urn_row
+    return if location.urn_and_site.blank?
+
+    {
+      key: {
+        text: "URN"
+      },
+      value: {
+        text: tag.span(location.urn_and_site, class: "app-u-monospace")
+      }
+    }
+  end
+
+  def phase_row
+    return if location.phase.blank?
+
+    {
+      key: {
+        text: "Phase"
+      },
+      value: {
+        text: location.human_enum_name(:phase)
+      }
+    }
+  end
+
+  def address_row
+    return unless location.has_address?
+
+    {
+      key: {
+        text: "Address"
+      },
+      value: {
+        text: helpers.format_address_multi_line(location)
+      }
+    }
+  end
+
+  def next_session_date_row
+    return if next_session_date.nil?
+
+    {
+      key: {
+        text: "Next session"
+      },
+      value: {
+        text: next_session_date.to_fs(:long)
+      }
+    }
+  end
+end

app/components/app_location_search_form_component.html.erb

@@ -0,0 +1,27 @@
+<%= form_with url:, method: :get, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+  <%= render AppCardComponent.new(filters: true) do |card| %>
+    <% card.with_heading(level: 2) { "Find school" } %>
+
+    <%= render AppSearchInputComponent.new(name: :q, value: form.q, label: { hidden: true }) %>
+
+    <%= f.govuk_radio_buttons_fieldset :phase,
+                                       legend: { text: "Phase", size: "s" },
+                                       small: true do %>
+      <%= f.govuk_radio_button :phase, "",
+                               checked: form.phase.blank?,
+                               label: { text: "Any" } %>
+
+      <% PHASES.each do |value| %>
+        <%= f.govuk_radio_button :phase,
+                                 value,
+                                 checked: form.phase == value,
+                                 label: { text: value.humanize } %>
+      <% end %>
+    <% end %>
+
+    <div class="nhsuk-button-group">
+      <%= f.govuk_submit "Update results", secondary: true, class: "nhsuk-button--small" %>
+      <%= govuk_button_link_to "Clear filters", clear_filters_path, secondary: true, class: "nhsuk-button--small" %>
+    </div>
+  <% end %>
+<% end %>

app/components/app_location_search_form_component.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AppLocationSearchFormComponent < ViewComponent::Base
+  def initialize(form, url:)
+    @form = form
+    @url = url
+  end
+
+  private
+
+  PHASES = %w[nursery primary secondary other].freeze
+
+  attr_reader :form, :url
+
+  delegate :govuk_button_link_to, to: :helpers
+
+  def clear_filters_path = "#{@url}?_clear=true"
+end

app/components/app_notices_table_component.html.erb

@@ -11,6 +11,7 @@
         <% row.with_cell(text: "Date") %>
         <% row.with_cell(text: "Child") %>
         <% row.with_cell(text: "Notice") %>
+        <%= row.with_cell(text: "Actions") %>
       <% end %>
     <% end %>
 
@@ -29,6 +30,12 @@
             <span class="nhsuk-table-responsive__heading">Notice</span>
             <%= notice.message %>
           <% end %>
+            <% row.with_cell do %>
+              <span class="nhsuk-table-responsive__heading">Actions</span>
+              <% if notice.can_dismiss? %>
+                <%= link_to "Dismiss", dismiss_imports_notice_path(notice) %>
+              <% end %>
+            <% end %>
         <% end %>
       <% end %>
     <% end %>

app/components/app_patient_search_form_component.html.erb

@@ -16,7 +16,7 @@
           <%= f.govuk_check_box :programme_types,
                                 programme.type,
                                 checked: form.programme_types&.include?(programme.type),
-                                label: { text: programme.name } %>
+                                label: { text: programme.filter_name } %>
         <% end %>
       <% end %>
     <% end %>