nhsuk · misaka · Nov 29, 2024 · Nov 19, 2024 · Nov 20, 2024 · Nov 20, 2024
@@ -8,7 +8,6 @@
   gap: nhsuk-spacing(3) nhsuk-spacing(4);
 
   @include mq($from: tablet) {
-    align-items: baseline;
     flex-direction: row;
     flex-wrap: wrap;
   }

@@ -5,6 +5,7 @@ $app-cis2-button-shadow-color: #003087;
 $button-shadow-size: 4px;
 
 .nhsuk-button {
+  .button_to &,
   .nhsuk-table & {
     margin-bottom: 0;
   }

@@ -21,6 +21,22 @@
     @include govuk-media-query($from: desktop) {
       order: 2;
     }
+
+    .nhsuk-checkboxes__label {
+      padding-left: 0;
+
+      &::before {
+        border-width: 3px;
+        padding: 0;
+        transform: scale(0.6667);
+        transform-origin: center left;
+      }
+
+      &::after {
+        left: 3px;
+        transform: rotate(-45deg) scale(0.6667);
+      }
+    }
   }
 
   & &__table {

@@ -1,9 +1,8 @@
-.app-summary-list--no-bottom-border {
-  .nhsuk-summary-list__row:last-child {
-    .nhsuk-summary-list__key,
-    .nhsuk-summary-list__value,
-    .nhsuk-summary-list__actions {
-      border-bottom: none;
+// Ensure width of value cell not affected by presence of actions cell
+.nhsuk-summary-list:where(:not(:has(.nhsuk-summary-list__actions))) {
+  .nhsuk-summary-list__value {
+    @include mq($from: tablet) {
+      width: 70%;
     }
   }
 }
@@ -36,6 +35,7 @@
   }
 }
 
+// Full width summary list
 .app-summary-list--full-width {
   .nhsuk-summary-list__row {
     border-bottom: 1px solid $nhsuk-border-color;
@@ -59,6 +59,7 @@
 
   .nhsuk-summary-list__key {
     margin-bottom: 0;
+    padding: 0;
   }
 
   .nhsuk-summary-list__value {

@@ -1,3 +1,13 @@
+.app-table--csv {
+  i {
+    color: shade($color_nhsuk-red, 50%);
+    font-family: ui-monospace, monospace;
+    font-style: normal;
+    font-weight: 500;
+    padding: 2px;
+  }
+}
+
 .app-table--small {
   th,
   td {
@@ -12,53 +22,25 @@
   }
 }
 
-.app-table--patients {
-  margin: 0;
-
-  .nhsuk-table__cell {
-    padding-top: nhsuk-spacing(2);
-    padding-bottom: nhsuk-spacing(2);
+.app-table__cell-status {
+  &--aqua-green:first-of-type {
+    border-left: nhsuk-spacing(2) solid $color_nhsuk-aqua-green;
+    padding-left: nhsuk-spacing(3);
   }
-}
 
-.app-table--select-cohort {
-  .nhsuk-table__cell,
-  th {
-    padding-top: nhsuk-spacing(1);
-    padding-bottom: nhsuk-spacing(1);
-    vertical-align: middle;
-  }
+  &--grey {
+    background-color: $color_nhsuk-grey-5;
+    color: $nhsuk-secondary-text-color;
 
-  .nhsuk-checkboxes {
-    padding: 0;
-    transform-origin: center left;
-    transform: scale(0.75);
+    &:first-of-type {
+      border-left: nhsuk-spacing(2) solid $color_nhsuk-grey-3;
+      padding-left: nhsuk-spacing(3);
+    }
   }
 
-  .nhsuk-checkboxes__item {
-    padding: 0;
-  }
-}
-
-.app-table--csv {
-  th,
-  td {
-    @include nhsuk-typography-responsive(16);
-    @include nhsuk-responsive-padding(2, "bottom");
-    @include nhsuk-responsive-padding(3, "right");
-    @include nhsuk-responsive-padding(2, "top");
-  }
-
-  caption {
-    @include nhsuk-font($size: 19, $weight: bold);
-  }
-
-  i {
-    color: shade($color_nhsuk-red, 50%);
-    font-family: ui-monospace, monospace;
-    font-style: normal;
-    font-weight: 500;
-    padding: 2px;
+  &--red:first-of-type {
+    border-left: nhsuk-spacing(2) solid $color_nhsuk-red;
+    padding-left: nhsuk-spacing(3);
   }
 }
 

@@ -13,7 +13,9 @@ def initialize(patient: nil, patient_session: nil)
     @patient = patient || patient_session.patient
     @patient_sessions =
       patient_session ? [patient_session] : patient.patient_sessions
+
     @consents = (patient || patient_session).consents
+    @gillick_assessments = (patient || patient_session).gillick_assessments
     @triages = (patient || patient_session).triages
     @vaccination_records =
       (patient || patient_session).vaccination_records.with_discarded
@@ -22,6 +24,7 @@ def initialize(patient: nil, patient_session: nil)
   attr_reader :patient,
               :patient_sessions,
               :consents,
+              :gillick_assessments,
               :triages,
               :vaccination_records
 
@@ -32,6 +35,7 @@ def events_by_day
   def all_events
     [
       consent_events,
+      gillick_assessment_events,
       notify_events,
       session_events,
       triage_events,
@@ -81,6 +85,27 @@ def consent_events
     end
   end
 
+  def gillick_assessment_events
+    gillick_assessments.each_with_index.map do |gillick_assessment, index|
+      action = index.zero? ? "Completed" : "Updated"
+      outcome =
+        (
+          if gillick_assessment.gillick_competent?
+            "Gillick competent"
+          else
+            "not Gillick competent"
+          end
+        )
+
+      {
+        title: "#{action} Gillick assessment as #{outcome}",
+        notes: gillick_assessment.notes,
+        time: gillick_assessment.created_at,
+        by: gillick_assessment.performed_by.full_name
+      }
+    end
+  end
+
   def notify_events
     patient.notify_log_entries.map do
       {

@@ -28,23 +28,15 @@ def address_match?
   end
 
   def school_match?
-    if consent_form.education_setting_school?
-      (consent_form.school || consent_form.location) == patient.school
-    elsif consent_form.education_setting_home?
-      patient.home_educated
-    else
-      patient.school.nil? && !patient.home_educated
-    end
+    consent_form.home_educated == patient.home_educated &&
+      consent_form.school == patient.school
   end
 
   def consent_form_patient
-    if consent_form.education_setting_school?
-      Patient.new(school: consent_form.school || consent_form.location)
-    elsif consent_form.education_setting_home?
-      Patient.new(school: nil, home_educated: true)
-    else
-      Patient.new(school: nil, home_educated: false)
-    end
+    Patient.new(
+      school: consent_form.school,
+      home_educated: consent_form.home_educated
+    )
   end
 
   def consent_form_parent

@@ -29,13 +29,19 @@
     <%= table.with_body do |body| %>
       <% consents.each do |consent| %>
         <%= body.with_row do |row| %>
-          <%= row.with_cell do %>
+          <%= row.with_cell(classes: "app-table__cell-status--#{status_colour(consent)}") do %>
             <%= govuk_link_to consent&.parent&.full_name || consent.patient.full_name, session_patient_consent_path(session, patient, consent, section:, tab:) %>
             <br>
             <span class="nhsuk-u-font-size-16"><%= consent.who_responded %></span>
           <% end %>
-          <%= row.with_cell(text: consent.responded_at.to_fs(:long)) %>
-          <%= row.with_cell(text: helpers.consent_decision(consent)) %>
+          <%= row.with_cell(
+                classes: "app-table__cell-status--#{status_colour(consent)}",
+                text: consent.responded_at.to_fs(:long),
+              ) %>
+          <%= row.with_cell(
+                classes: "app-table__cell-status--#{status_colour(consent)}",
+                text: helpers.consent_decision(consent),
+              ) %>
         <% end %>
       <% end %>
     <% end %>

@@ -32,4 +32,16 @@ def can_send_consent_request?
     patient_session.no_consent? && patient.send_notifications? &&
       session.open_for_consent? && patient.parents.any?
   end
+
+  def status_colour(consent)
+    if consent.invalidated? || consent.withdrawn?
+      "grey"
+    elsif consent.response_given?
+      "aqua-green"
+    elsif consent.response_refused?
+      "red"
+    else
+      "grey"
+    end
+  end
 end
@@ -19,9 +19,7 @@ def initialize(
   end
 
   def call
-    govuk_summary_list(
-      classes: "app-summary-list--no-bottom-border"
-    ) do |summary_list|
+    govuk_summary_list do |summary_list|
       summary_list.with_row do |row|
         row.with_key { "Name" }
         row.with_value { name }

@@ -8,9 +8,7 @@ def initialize(consent)
   end
 
   def call
-    govuk_summary_list(
-      classes: "app-summary-list--no-bottom-border nhsuk-u-margin-bottom-0"
-    ) do |summary_list|
+    govuk_summary_list do |summary_list|
       summary_list.with_row do |row|
         row.with_key { "Full name" }
         row.with_value { patient.full_name }

@@ -3,11 +3,11 @@
 class AppConsentStatusComponent < ViewComponent::Base
   def call
     if @patient_session.consent_given?
-      icon_tick "Given", "blue"
+      icon_tick "Consent given", "aqua-green"
     elsif @patient_session.consent_refused?
-      icon_cross "Refused", "red"
+      icon_cross "Consent refused", "red"
     elsif @patient_session.consent_conflicts?
-      icon_cross "Conflicts", "dark-orange"
+      icon_cross "Conflicting consent", "dark-orange"
     end
   end
 

@@ -9,10 +9,7 @@ def initialize(consent, change_links: {})
   end
 
   def call
-    govuk_summary_list(
-      actions: @change_links.present?,
-      classes: "app-summary-list--no-bottom-border nhsuk-u-margin-bottom-0"
-    ) do |summary_list|
+    govuk_summary_list(actions: @change_links.present?) do |summary_list|
       if @consent.responded_at.present?
         summary_list.with_row do |row|
           row.with_key { "Response date" }

@@ -2,7 +2,7 @@
 
 class AppHealthQuestionsComponent < ViewComponent::Base
   erb_template <<-ERB
-    <dl class="nhsuk-summary-list app-summary-list--full-width nhsuk-u-margin-bottom-0">
+    <dl class="nhsuk-summary-list app-summary-list--full-width">
       <% health_answers.each do |question, answers| %>
         <div class="nhsuk-summary-list__row">
           <dt class="nhsuk-summary-list__key">

@@ -1,7 +1,7 @@
 <%= govuk_details(summary_text:) do %>
   <p class="nhsuk-body">Make sure the CSV you upload uses the following columns:</p>
 
-  <%= govuk_table(classes: "app-table--csv") do |table|
+  <%= govuk_table(classes: "app-table--csv app-table--small") do |table|
         table.with_head do |head|
           head.with_row do |row|
             row.with_cell(text: "Column name")

@@ -1,4 +1,4 @@
-<%= govuk_summary_list classes: "app-summary-list--no-bottom-border" do |summary_list|
+<%= govuk_summary_list do |summary_list|
      summary_list.with_row do |row|
        row.with_key { "Child" }
        row.with_value { child_full_name }

@@ -13,7 +13,7 @@ def initialize(patient_session:, current_user: nil)
   def call
     render AppCardComponent.new(colour:) do |c|
       c.with_heading { heading }
-      govuk_summary_list(classes: "app-summary-list--no-bottom-border", rows:)
+      govuk_summary_list(rows:)
     end
   end
 

@@ -18,7 +18,7 @@
 <% if display_gillick_assessment_card? %>
   <%= render AppCardComponent.new do |c| %>
     <% c.with_heading { "Gillick assessment" } %>
-    <% if (gillick_assessment = patient_session.gillick_assessment) %>
+    <% if (gillick_assessment = patient_session.latest_gillick_assessment) %>
       <% if gillick_assessment.gillick_competent? %>
         <p class="app-status app-status--aqua-green">
           <svg class="nhsuk-icon nhsuk-icon__tick" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
@@ -53,7 +53,7 @@
     <% elsif gillick_assessment_can_be_recorded? %>
       <p class="nhsuk-body">
         <%= govuk_button_link_to "Assess Gillick competence",
-                                 new_session_patient_gillick_assessment_path(
+                                 edit_session_patient_gillick_assessment_path(
                                    session,
                                    patient,
                                    section: @section,
@@ -110,9 +110,11 @@
 
       <% if Flipper.enabled?(:release_1b) %>
         <div class="app-button-group">
-          <%= govuk_button_to "Edit vaccination record",
-                              programme_vaccination_record_path(vaccination_record.programme, vaccination_record),
-                              method: :put, class: "app-button--secondary" %>
+          <% if helpers.policy(vaccination_record).edit? %>
+            <%= govuk_button_to "Edit vaccination record",
+                                programme_vaccination_record_path(vaccination_record.programme, vaccination_record),
+                                method: :put, class: "app-button--secondary" %>
+          <% end %>
 
           <% if helpers.policy(vaccination_record).destroy? %>
             <%= govuk_link_to "Delete vaccination record", destroy_vaccination_record_session_patient_vaccinations_path(patient_id: patient.id, vaccination_record_id: vaccination_record.id) %>

@@ -40,6 +40,6 @@ def gillick_assessment_can_be_recorded?
   end
 
   def gillick_assessment_recorded?
-    patient_session.gillick_assessment.present?
+    patient_session.latest_gillick_assessment.present?
   end
 end