Merge pull request #3731 from nhsuk/next

Version 2.2.6

Author: thomasleese

.github/workflows/continuous-deployment.yml

@@ -3,7 +3,7 @@ run-name: Continuous deployment of ${{ github.ref_name }} to QA and Test
 
 on:
   push:
-    branches: [main]
+    branches: [next]
 
 jobs:
   test:

.gitignore

@@ -1,3 +1,29 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Ignore Byebug command history file.
+.byebug_history
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
 *.log
 .DS_Store
 .bundle

.tool-versions

@@ -5,4 +5,4 @@ awscli      2.13.31
 terraform   1.11.4
 tflint      0.55.1
 pkl         0.28.1
-hk          1.0.0
+hk          1.1.2

app/components/app_backlink_component.html.erb

@@ -1,5 +1,5 @@
 <nav <%= tag.attributes @attributes %>>
-  <div class="nhsuk-back-link nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-0">
+  <div class="nhsuk-back-link">
     <%= link_to @href, class: "nhsuk-back-link__link" do %>
       <svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
         <path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>

app/components/app_consent_confirmation_component.rb

@@ -14,24 +14,22 @@ def initialize(consent_form)
   end
 
   def title
-    case response
-    when "given"
-      "Consent confirmed"
-    when "given_one"
-      chosen_programme = chosen_programmes.first.name
-      "Consent for the #{chosen_programme} vaccination confirmed"
-    when "refused"
-      "Consent refused"
+    if response_given?
+      if refused_programmes.empty?
+        "Consent confirmed"
+      else
+        "Consent for the #{given_vaccinations} confirmed"
+      end
     else
-      raise "unrecognised consent response: #{response}"
+      "Consent refused"
     end
   end
 
   private
 
-  delegate :chosen_programmes,
-           :not_chosen_programmes,
-           :response,
+  delegate :given_programmes,
+           :refused_programmes,
+           :response_given?,
            :parent_email,
            to: :@consent_form
 
@@ -40,33 +38,26 @@ def full_name
   end
 
   def panel_text
-    case response
-    when "given", "given_one"
+    if response_given?
       if @consent_form.needs_triage?
         <<-END_OF_TEXT
           As you answered ‘yes’ to some of the health questions, we need to check
-          the #{chosen_vaccinations_are} suitable for #{full_name}. We’ll review
+          the #{given_vaccinations_are} suitable for #{full_name}. We’ll review
           your answers and get in touch again soon.
         END_OF_TEXT
       else
-        "#{full_name} is due to get the #{chosen_vaccinations} at school" +
+        "#{full_name} is due to get the #{given_vaccinations} at school" +
           (session_dates.present? ? " on #{session_dates}" : "")
       end
-    when "refused"
-      "You’ve told us that you do not want #{full_name} to get the" \
-        " #{not_chosen_vaccinations} at school"
     else
-      raise "unrecognised consent response: #{response}"
+      "You’ve told us that you do not want #{full_name} to get the" \
+        " #{refused_vaccinations} at school"
     end
   end
 
-  def chosen_vaccinations
-    vaccinations_text(chosen_programmes)
-  end
+  def given_vaccinations = vaccinations_text(given_programmes)
 
-  def not_chosen_vaccinations
-    vaccinations_text(not_chosen_programmes)
-  end
+  def refused_vaccinations = vaccinations_text(refused_programmes)
 
   def vaccinations_text(programmes)
     programme_names =
@@ -79,8 +70,8 @@ def vaccinations_text(programmes)
     )
   end
 
-  def chosen_vaccinations_are
-    "#{chosen_vaccinations} #{chosen_programmes.one? ? "is" : "are"}"
+  def given_vaccinations_are
+    "#{given_vaccinations} #{given_programmes.one? ? "is" : "are"}"
   end
 
   def session_dates

app/components/app_patient_page_component.rb

@@ -56,21 +56,8 @@ def vaccination_records
   end
 
   def default_vaccinate_form
-    today_pre_screenings =
-      patient_session
-        .pre_screenings
-        .joins(:session_date)
-        .merge(SessionDate.today)
-        .order(created_at: :desc)
-
-    feeling_well = today_pre_screenings.any?(&:feeling_well) || nil
-    not_pregnant = today_pre_screenings.any?(&:not_pregnant) || nil
+    pre_screening_confirmed = patient.pre_screenings.today.exists?(programme:)
 
-    VaccinateForm.new(
-      patient_session:,
-      programme:,
-      feeling_well:,
-      not_pregnant:
-    )
+    VaccinateForm.new(patient_session:, programme:, pre_screening_confirmed:)
   end
 end

app/components/app_vaccinate_form_component.html.erb

@@ -8,69 +8,67 @@
   <% content_for(:before_content) { f.govuk_error_summary } %>
 
   <div class="nhsuk-card__content">
-    <h2 class="nhsuk-card__heading nhsuk-heading-m">
-      <%= patient.given_name %> has confirmed that they:
-    </h2>
+    <section>
+      <h2 class="nhsuk-card__heading nhsuk-heading-m">
+        Pre-screening checks
+      </h2>
 
-    <%= f.govuk_check_boxes_fieldset :feeling_well, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :feeling_well, true, multiple: false, link_errors: true %>
-    <% end %>
+      <p><%= patient.given_name %> has confirmed that they:</p>
 
-    <% if vaccinate_form.ask_not_pregnant? %>
-      <%= f.govuk_check_boxes_fieldset :not_pregnant, multiple: false, legend: nil do %>
-        <%= f.govuk_check_box :not_pregnant, true, multiple: false, link_errors: true %>
-      <% end %>
-    <% end %>
+      <ul class="nhsuk-list nhsuk-list--bullet">
+        <li>are not acutely unwell</li>
+        <% if vaccinate_form.ask_not_pregnant? %>
+          <li>are not pregnant</li>
+        <% end %>
+        <% if vaccinate_form.ask_not_taking_medication? %>
+          <li>are not taking any medication which prevents vaccination</li>
+        <% end %>
+        <li>have no allergies which would prevent vaccination</li>
+        <li>have not already had this vaccination</li>
+        <li>know what the vaccination is for, and are happy to have it</li>
+      </ul>
 
-    <% if vaccinate_form.ask_not_taking_medication? %>
-      <%= f.govuk_check_boxes_fieldset :not_taking_medication, multiple: false, legend: nil do %>
-        <%= f.govuk_check_box :not_taking_medication, true, multiple: false, link_errors: true %>
+      <%= f.govuk_check_boxes_fieldset :pre_screening_confirmed, multiple: false, legend: nil do %>
+        <%= f.govuk_check_box :pre_screening_confirmed, 1, 0, multiple: false, link_errors: true,
+                                                              label: { text: "#{patient.given_name} has confirmed the above statements are true" } %>
       <% end %>
-    <% end %>
-
-    <%= f.govuk_check_boxes_fieldset :no_allergies, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :no_allergies, true, multiple: false, link_errors: true %>
-    <% end %>
 
-    <%= f.govuk_check_boxes_fieldset :not_already_had, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :not_already_had, true, multiple: false, link_errors: true %>
-    <% end %>
-
-    <%= f.govuk_check_boxes_fieldset :knows_vaccination, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :knows_vaccination, true, multiple: false, link_errors: true %>
-    <% end %>
-
-    <%= f.govuk_text_area :pre_screening_notes, label: { text: "Pre-screening notes (optional)" } %>
+      <%= f.govuk_text_area :pre_screening_notes, label: { text: "Pre-screening notes (optional)" }, rows: 3 %>
+    </section>
 
     <hr class="nhsuk-section-break nhsuk-section-break--visible nhsuk-section-break--l">
 
-    <h2 class="nhsuk-card__heading nhsuk-heading-m">
-      Is <%= patient.given_name %> ready for their <%= programme.name %> vaccination?
-    </h2>
+    <section>
+      <h2 class="nhsuk-card__heading nhsuk-heading-m">
+        Is <%= patient.given_name %> ready for their <%= programme.name %> vaccination?
+      </h2>
+
+      <% hint = "Pre-screening checks must be completed for vaccination to go ahead" %>
 
-    <%= f.govuk_radio_buttons_fieldset :administered, legend: nil do %>
-      <% if common_delivery_sites_options.length > 1 %>
-        <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, link_errors: true do %>
-          <%= f.govuk_collection_radio_buttons :delivery_site,
-                                               common_delivery_sites_options,
-                                               :value,
-                                               :label,
-                                               legend: {
-                                                 text: "Where will the injection be given?",
-                                                 size: "s",
-                                               } %>
+      <%= f.govuk_radio_buttons_fieldset :administered, legend: nil do %>
+        <% if common_delivery_sites_options.length > 1 %>
+          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true do %>
+            <%= f.govuk_collection_radio_buttons :delivery_site,
+                                                 common_delivery_sites_options,
+                                                 :value,
+                                                 :label,
+                                                 legend: {
+                                                   text: "Where will the injection be given?",
+                                                   size: "s",
+                                                 } %>
+          <% end %>
+        <% else %>
+          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true %>
+          <%= f.hidden_field :delivery_site, value: common_delivery_sites_options.first.value %>
         <% end %>
-      <% else %>
-        <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, link_errors: true %>
-        <%= f.hidden_field :delivery_site, value: common_delivery_sites_options.first.value %>
+        <%= f.govuk_radio_button :administered, false, label: { text: "No" } %>
       <% end %>
-      <%= f.govuk_radio_button :administered, false, label: { text: "No" } %>
-    <% end %>
 
-    <%= f.hidden_field :delivery_method, value: delivery_method %>
-    <%= f.hidden_field :dose_sequence, value: dose_sequence %>
-    <%= f.hidden_field :programme_id, value: programme.id %>
+      <%= f.hidden_field :delivery_method, value: delivery_method %>
+      <%= f.hidden_field :dose_sequence, value: dose_sequence %>
+      <%= f.hidden_field :programme_id, value: programme.id %>
 
-    <%= f.govuk_submit "Continue" %>
+      <%= f.govuk_submit "Continue" %>
+    </section>
   </div>
 <% end %>

app/controllers/concerns/consent_form_mailer_concern.rb

@@ -4,11 +4,9 @@ module ConsentFormMailerConcern
   extend ActiveSupport::Concern
 
   def send_consent_form_confirmation(consent_form)
-    if consent_form.consent_refused?
-      send_consent_form_confirmation_refused(consent_form)
-    else
+    if consent_form.response_given?
       ProgrammeGrouper
-        .call(consent_form.chosen_programmes)
+        .call(consent_form.given_programmes)
         .each_value do |programmes|
           if consent_form.needs_triage?
             EmailDeliveryJob.perform_later(
@@ -41,10 +39,12 @@ def send_consent_form_confirmation(consent_form)
         end
 
       ProgrammeGrouper
-        .call(consent_form.not_chosen_programmes)
+        .call(consent_form.refused_programmes)
         .each_value do |programmes|
           send_consent_form_confirmation_refused(consent_form, programmes:)
         end
+    else
+      send_consent_form_confirmation_refused(consent_form)
     end
   end
 

app/controllers/parent_interface/consent_forms/edit_controller.rb

@@ -11,6 +11,8 @@ class ConsentForms::EditController < ConsentForms::BaseController
     HOME_EDUCATED_SCHOOL_ID = "home-educated"
 
     def show
+      set_response if current_step == :consent
+
       render_wizard
     end
 
@@ -47,6 +49,7 @@ def update
           jump_to("contact-method", skip_to_confirm: true)
         end
       elsif current_step == :consent
+        @consent_form.update_programme_responses
         @consent_form.seed_health_questions
       end
 
@@ -94,7 +97,7 @@ def update_params
           parent_contact_method_type
           parent_contact_method_other_details
         ],
-        consent: %i[response chosen_vaccine],
+        consent: %i[response chosen_programme],
         reason: %i[reason],
         reason_notes: %i[reason_notes],
         address: %i[address_line_1 address_line_2 address_town address_postcode]
@@ -122,6 +125,18 @@ def set_health_answer
       @health_answer = @consent_form.health_answers[@question_number]
     end
 
+    def set_response
+      if @consent_form.response_given? && @consent_form.response_refused?
+        @consent_form.response = "given_one"
+        @consent_form.chosen_programme =
+          @consent_form.given_programmes.first&.type
+      elsif @consent_form.response_given?
+        @consent_form.response = "given"
+      elsif @consent_form.response_refused?
+        @consent_form.response = "refused"
+      end
+    end
+
     def validate_params
       case current_step
       when :date_of_birth

app/controllers/patient_sessions/vaccinations_controller.rb

@@ -54,12 +54,7 @@ def vaccinate_form_params
         delivery_method
         delivery_site
         dose_sequence
-        feeling_well
-        knows_vaccination
-        no_allergies
-        not_already_had
-        not_pregnant
-        not_taking_medication
+        pre_screening_confirmed
         pre_screening_notes
         vaccine_id
       ]