Merge pull request #6574 from NHSDigital/design-review-april

thomasleese · web-flow · commit 2a3839ae2ab9 · 2026-04-16T16:55:45.000+01:00
April design review
diff --git a/app/assets/stylesheets/components/_filters.scss b/app/assets/stylesheets/components/_filters.scss
@@ -14,6 +14,8 @@
       padding-left: nhsuk-spacing(3);
       background-color: nhsuk-colour("grey-1");
 
+      @include nhsuk-font-size(22);
+
       // stylelint-disable-next-line max-nesting-depth
       @include nhsuk-media-query($from: tablet) {
         margin-left: #{nhsuk-spacing(-4) - 1px};
diff --git a/app/assets/stylesheets/vendor/nhsuk-frontend/overrides/_index.scss b/app/assets/stylesheets/vendor/nhsuk-frontend/overrides/_index.scss
@@ -1,3 +1,2 @@
 @forward "details";
 @forward "summary-list";
-@forward "tables";
diff --git a/app/assets/stylesheets/vendor/nhsuk-frontend/overrides/_tables.scss b/app/assets/stylesheets/vendor/nhsuk-frontend/overrides/_tables.scss
diff --git a/app/components/app_location_card_component.rb b/app/components/app_location_card_component.rb
@@ -10,7 +10,7 @@ def initialize(location, patient_count:, next_session_date:, heading_level: 4)
 
   def call
     render AppCardComponent.new(link_to:, compact: true) do |card|
-      card.with_heading(level: @heading_level) { heading }
+      card.with_heading(level: @heading_level, size: "s") { heading }
       govuk_summary_list(rows:)
     end
   end
diff --git a/app/components/app_patient_search_result_card_component.rb b/app/components/app_patient_search_result_card_component.rb
@@ -38,7 +38,7 @@ def initialize(
 
   def call
     render AppCardComponent.new(link_to:, compact: true) do |card|
-      card.with_heading(level: @heading_level) do
+      card.with_heading(level: @heading_level, size: "s") do
         patient.full_name_with_known_as
       end
       govuk_summary_list(rows:)
diff --git a/app/components/app_patient_session_search_result_card_component.rb b/app/components/app_patient_session_search_result_card_component.rb
@@ -36,7 +36,7 @@ def initialize(
 
   def call
     render AppCardComponent.new(link_to: card_link, compact: true) do |card|
-      card.with_heading(level: @heading_level) { heading }
+      card.with_heading(level: @heading_level, size: "s") { heading }
       safe_join([summary_list, registration_buttons].compact)
     end
   end
diff --git a/app/components/app_session_actions_component.rb b/app/components/app_session_actions_component.rb
@@ -6,8 +6,12 @@ class AppSessionActionsComponent < ViewComponent::Base
       <% card.with_heading(level: 3) { "Action required" } %>
       <% if rows.any? %>
         <%= govuk_summary_list(rows:) %>
-      <% else %>
-        <p>No action required</p>
+      <% end %>
+      <% if policy(session).invite_to_clinic? %>
+        <%= render AppActionLinkComponent.new(
+                    href: edit_session_invite_to_clinic_path(@session),
+                    text: "Send clinic invitations",
+                  ) %>
       <% end %>
     <% end %>
   ERB
diff --git a/app/components/app_session_buttons_component.rb b/app/components/app_session_buttons_component.rb
diff --git a/app/components/app_session_card_component.rb b/app/components/app_session_card_component.rb
@@ -23,7 +23,7 @@ def initialize(
 
   def call
     render AppCardComponent.new(link_to:, compact: true) do |card|
-      card.with_heading(level: @heading_level) { heading }
+      card.with_heading(level: @heading_level, size: "s") { heading }
       safe_join([summary_list, button_group].compact)
     end
   end
diff --git a/app/components/app_session_details_component.rb b/app/components/app_session_details_component.rb
@@ -3,7 +3,7 @@
 class AppSessionDetailsComponent < ViewComponent::Base
   erb_template <<-ERB
     <%= render AppCardComponent.new do |card| %>
-      <% card.with_heading(level: 3) { "Session details" } %>
+      <% card.with_heading(level: 3, actions:) { "Session details" } %>
       <%= render AppSessionSummaryComponent.new(
           session,
           patient_count: session.patients.count,
@@ -13,6 +13,11 @@ class AppSessionDetailsComponent < ViewComponent::Base
           show_status: true,
           show_consent_style: true
         ) %>
+      <% if helpers.policy(session).edit? %>
+        <%= govuk_button_link_to "Download offline spreadsheet",
+                                 session_path(session, format: :xlsx),
+                                 secondary: true %>
+      <% end %>
     <% end %>
   ERB
 
@@ -25,4 +30,10 @@ def initialize(session)
   attr_reader :session
 
   delegate :govuk_button_link_to, to: :helpers
+
+  def actions
+    return [] unless helpers.policy(session).edit?
+
+    [{ text: "Edit session", href: helpers.edit_session_path(session) }]
+  end
 end
diff --git a/app/components/app_session_overview_component.rb b/app/components/app_session_overview_component.rb
@@ -4,21 +4,11 @@ class AppSessionOverviewComponent < ViewComponent::Base
   erb_template <<-ERB
     <%= render AppSessionStatsComponent.new(session) %>
 
-    <section>
-      <%= render AppSessionVaccinationsComponent.new(session) %>
-    </section>
+    <%= render AppSessionVaccinationsComponent.new(session) %>
 
-    <section>
-      <%= render AppSessionActionsComponent.new(session) %>
-    </section>
+    <%= render AppSessionActionsComponent.new(session) %>
 
-    <section>
-      <%= render AppSessionDetailsComponent.new(session) %>
-    </section>
-
-    <section>
-      <%= render AppSessionButtonsComponent.new(session) %>
-    </section>
+    <%= render AppSessionDetailsComponent.new(session) %>
   ERB
 
   def initialize(session)
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
@@ -39,9 +39,9 @@ def session_dates(session)
         end
 
       if dates.length == 2
-        "#{min_date_str} – #{max_date_str}"
+        "#{min_date_str} to #{max_date_str}"
       else
-        "#{min_date_str} – #{max_date_str} (#{dates.length} dates)"
+        "#{min_date_str} to #{max_date_str} (#{dates.length} dates)"
       end
     end
   end
@@ -58,18 +58,24 @@ def session_status(session)
 
   def session_title(session)
     programmes = session.programmes.map(&:name).to_sentence
-    dates = ("on #{session_dates(session)}" if session.dates.present?)
 
     items =
       if session.generic_clinic?
-        [programmes, "community clinic", dates].compact
+        [programmes, "community clinic"].compact
       else
-        [programmes, "session at", session.location.name, dates].compact
+        [programmes, "session at", session.location.name].compact
       end
 
     items.join(" ")
   end
 
+  def session_caption(session)
+    dates = session_dates(session) if session.dates.present?
+    year_groups = format_year_groups(session.year_groups)
+
+    [dates, year_groups].compact.join(" – ")
+  end
+
   def session_consent_style(session)
     session.outbreak ? "Outbreak request" : "Standard request"
   end
diff --git a/app/views/consent_forms/search.html.erb b/app/views/consent_forms/search.html.erb
@@ -39,7 +39,10 @@
         <%= link_to "View full consent response", consent_form_path(@consent_form) %>
       </p>
 
-      <%= govuk_button_link_to "Create new record", patient_consent_form_path(@consent_form), secondary: true unless @nhs_number_taken %>
+      <%= render AppActionLinkComponent.new(
+            href: patient_consent_form_path(@consent_form),
+            text: "Create new record",
+          ) unless @nhs_number_taken %>
     <% end %>
   </div>
 
diff --git a/app/views/schools/patients/index.html.erb b/app/views/schools/patients/index.html.erb
@@ -9,17 +9,16 @@
 <%= render "schools/header" %>
 
 <% if @location.gias_school? %>
-  <%= govuk_button_link_to "Import class lists", new_school_import_path(@location), secondary: true %>
+  <%= render AppActionLinkComponent.new(
+        href: new_school_import_path(@location),
+        text: "Import class lists",
+      ) %>
 <% elsif @location.generic_school? %>
-  <div class="nhsuk-button-group">
-    <%= govuk_button_link_to "Send clinic invitations",
-                             edit_school_invite_to_clinic_path(@location),
-                             secondary: true %>
-
-    <%= govuk_button_link_to "Download offline spreadsheet",
-                             url_for(path_params: request.path_parameters, params: request.query_parameters, format: :xlsx),
-                             secondary: true %>
-  </div>
+  <%= render AppActionLinkComponent.new(
+        href: edit_school_invite_to_clinic_path(@location),
+        text: "Send clinic invitations",
+        class: "nhsuk-u-margin-right-4",
+      ) %>
 <% end %>
 
 <div class="nhsuk-grid-row">
@@ -37,6 +36,10 @@
 
   <div class="app-grid-column-results">
     <%= render AppSearchResultsComponent.new(@pagy, label: "children") do %>
+      <%= govuk_button_link_to "Download offline spreadsheet",
+                               url_for(path_params: request.path_parameters, params: request.query_parameters, format: :xlsx),
+                               secondary: true %>
+
       <% @patients.each do |patient| %>
         <%= render AppPatientSearchResultCardComponent.new(
               patient,
diff --git a/app/views/schools/sessions/index.html.erb b/app/views/schools/sessions/index.html.erb
@@ -9,7 +9,10 @@
 <% content_for :page_title, "#{t("schools.sessions.title")} – #{@location.name}" %>
 <%= render "schools/header" %>
 
-<%= govuk_button_link_to "Add a new session", new_session_path(school_id: @location.id), secondary: true %>
+<%= render AppActionLinkComponent.new(
+      href: new_session_path(school_id: @location.id),
+      text: "Add a new session",
+    ) %>
 
 <% if @scheduled_sessions.present? %>
   <h2 class="nhsuk-heading-m">Scheduled sessions</h2>
diff --git a/app/views/sessions/_header.html.erb b/app/views/sessions/_header.html.erb
@@ -4,7 +4,7 @@
       <%= h1 session_title(@session), class: "nhsuk-u-margin-bottom-2" %>
 
       <p class="nhsuk-caption-l nhsuk-u-margin-bottom-0">
-        <%= format_year_groups(@session.year_groups) %>
+        <%= session_caption(@session) %>
       </p>
     </div>
 
diff --git a/app/views/sessions/record/show.html.erb b/app/views/sessions/record/show.html.erb
@@ -34,5 +34,7 @@
     </div>
   </div>
 <% else %>
+  <h3 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">Record vaccinations</h3>
+
   <p>You can record vaccinations when a session is in progress.</p>
 <% end %>
diff --git a/spec/components/app_session_actions_component_spec.rb b/spec/components/app_session_actions_component_spec.rb
@@ -14,7 +14,7 @@
     create(:patient, nhs_number: nil, year_group:)
   end
 
-  let(:allowed_managed_consent_reminders) { true }
+  let(:allowed) { true }
 
   before do
     create(
@@ -57,9 +57,9 @@
     create(:consent_form, :recorded, session:)
 
     stub_authorization(
-      allowed: allowed_managed_consent_reminders,
+      allowed:,
       klass: SessionPolicy,
-      methods: %i[manage_consent_reminders?]
+      methods: %i[invite_to_clinic? manage_consent_reminders?]
     )
   end
 
@@ -82,11 +82,13 @@
   it { should have_link("1 child for HPV") }
 
   it { should have_link("Send reminders") }
+  it { should have_link("Send clinic invitations") }
 
-  context "when not allowed to manage consent reminders" do
-    let(:allowed_managed_consent_reminders) { false }
+  context "when not allowed to send reminders or clinic invitations" do
+    let(:allowed) { false }
 
     it { should_not have_link("Send reminders") }
+    it { should_not have_link("Send clinic invitations") }
   end
 
   context "session requires no registration" do
@@ -104,13 +106,4 @@
     it { should_not have_text("Register attendance") }
     it { should_not have_text("Ready for vaccinator") }
   end
-
-  context "when there are no action required" do
-    before do
-      PatientLocation.destroy_all
-      ConsentForm.destroy_all
-    end
-
-    it { should have_text("No action required") }
-  end
 end
diff --git a/spec/features/sessions_clinic_spec.rb b/spec/features/sessions_clinic_spec.rb
@@ -103,7 +103,7 @@ def and_i_record_a_new_vaccination
 
   def then_i_see_the_community_clinic_session
     click_on "Back"
-    expect(page).to have_content("HPV community clinic on 18 February 2024")
+    expect(page).to have_content("HPV community clinic")
     expect(page).to have_content("18 February 2024")
   end
 
diff --git a/spec/features/sessions_school_spec.rb b/spec/features/sessions_school_spec.rb
@@ -406,7 +406,7 @@ def when_i_save_the_session
 
   def then_i_should_see_the_session_details
     expect(page).to have_content(@location.name.to_s)
-    expect(page).to have_content("10 – 11 March 2024")
+    expect(page).to have_content("10 to 11 March 2024")
   end
 
   def when_the_parent_visits_the_consent_form
diff --git a/spec/helpers/sessions_helper_spec.rb b/spec/helpers/sessions_helper_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`@forward "details";`
`2`	`2`	`@forward "summary-list";`
`3`		`-@forward "tables";`