Merge pull request #3681 from nhsuk/full-dose-half-dose

Add full dose or half dose step

Author: thomasleese

app/components/app_vaccination_record_summary_component.rb

@@ -139,6 +139,14 @@ def call
           summary_list.with_row do |row|
             row.with_key { "Dose volume" }
             row.with_value { dose_volume_value }
+
+            if (href = @change_links[:dose_volume])
+              row.with_action(
+                text: "Change",
+                href:,
+                visually_hidden_text: "dose volume"
+              )
+            end
           end
         end
 

app/controllers/draft_vaccination_records_controller.rb

@@ -81,9 +81,8 @@ def handle_date_and_time
   end
 
   def handle_outcome
-    if @draft_vaccination_record.administered?
-      @draft_vaccination_record.full_dose = true
-    elsif @draft_vaccination_record.location_name.present?
+    if !@draft_vaccination_record.administered? &&
+         @draft_vaccination_record.location_name.present?
       # If not administered and location is set, we can skip to confirm.
       # Otherwise, we need to get the location information from the user.
       jump_to("confirm")
@@ -147,6 +146,7 @@ def update_params
       confirm: @draft_vaccination_record.editing? ? [] : %i[notes],
       date_and_time: %i[performed_at],
       delivery: %i[delivery_site delivery_method],
+      dose: %i[full_dose],
       location: %i[location_name],
       notes: %i[notes],
       outcome: %i[outcome]

app/forms/vaccinate_form.rb

@@ -60,7 +60,6 @@ def save(draft_vaccination_record:)
 
     draft_vaccination_record.batch_id = todays_batch&.id
     draft_vaccination_record.dose_sequence = dose_sequence
-    draft_vaccination_record.full_dose = true
     draft_vaccination_record.patient_id = patient_session.patient_id
     draft_vaccination_record.performed_at = Time.current
     draft_vaccination_record.performed_by_user = current_user

app/models/draft_vaccination_record.rb

@@ -41,6 +41,7 @@ def wizard_steps
       (:outcome if can_change_outcome?),
       (:delivery if administered?),
       (:batch if administered?),
+      (:dose if administered? && can_be_half_dose?),
       (:location if location&.generic_clinic?),
       :confirm
     ].compact
@@ -73,6 +74,10 @@ def wizard_steps
     validates :batch_id, presence: true
   end
 
+  on_wizard_step :dose, exact: true do
+    validates :full_dose, inclusion: [true, false]
+  end
+
   on_wizard_step :location, exact: true do
     validates :location_name, presence: true
   end
@@ -175,6 +180,7 @@ def vaccination_record=(value)
   end
 
   delegate :vaccine, to: :batch, allow_nil: true
+  delegate :can_be_half_dose?, to: :vaccine, allow_nil: true
 
   delegate :id, to: :vaccine, prefix: true, allow_nil: true
 
@@ -187,10 +193,13 @@ def writable_attribute_names
   end
 
   def reset_unused_fields
-    unless administered?
+    if administered?
+      self.full_dose = true unless can_be_half_dose?
+    else
       self.batch_id = nil
       self.delivery_method = nil
       self.delivery_site = nil
+      self.full_dose = nil
     end
   end
 

app/models/vaccine.rb

@@ -55,6 +55,8 @@ def active? = !discontinued
 
   def contains_gelatine? = programme.flu? && nasal?
 
+  def can_be_half_dose? = nasal?
+
   AVAILABLE_DELIVERY_SITES = {
     "injection" => %w[
       left_arm_upper_position

app/views/draft_vaccination_records/confirm.html.erb

@@ -18,6 +18,7 @@
      batch: wizard_path("batch"),
      delivery_method: wizard_path("delivery"),
      delivery_site: wizard_path("delivery"),
+     dose_volume: @draft_vaccination_record.wizard_steps.include?(:dose) ? wizard_path("dose") : nil,
      location: @draft_vaccination_record.wizard_steps.include?(:location) ? wizard_path("location") : nil,
      notes: wizard_path("notes"),
      outcome: @draft_vaccination_record.wizard_steps.include?(:outcome) ? wizard_path("outcome") : nil,

app/views/draft_vaccination_records/dose.html.erb

@@ -0,0 +1,18 @@
+<% content_for :before_main do %>
+  <%= render AppBacklinkComponent.new(@back_link_path) %>
+<% end %>
+
+<% legend = "Did they get the full dose?" %>
+<% content_for :page_title, legend %>
+
+<%= form_with model: @draft_vaccination_record, url: wizard_path, method: :put do |f| %>
+  <% content_for(:before_content) { f.govuk_error_summary } %>
+
+  <%= f.govuk_collection_radio_buttons :full_dose,
+                                       %i[true false],
+                                       :itself,
+                                       caption: { text: @patient.full_name, size: "l" },
+                                       legend: { text: legend, tag: "h1", size: "l" } %>
+
+  <%= f.govuk_submit %>
+<% end %>

config/locales/en.yml

@@ -72,6 +72,8 @@ en:
             delivery_site:
               blank: Choose a delivery site
               inclusion: Choose a delivery site
+            full_dose:
+              inclusion: Choose whether they got the full dose
             location_name:
               blank: Enter where the vaccination was given
             notes:
@@ -686,6 +688,7 @@ en:
     date_of_birth: date-of-birth
     dates: dates
     delivery: delivery
+    dose: dose
     education_setting: education-setting
     file_format: file-format
     gp: gp

config/locales/helpers.en.yml

@@ -12,6 +12,10 @@ en:
           keep_both: The new and existing records will both be kept.
 
     label:
+      draft_vaccination_record:
+        full_dose_options:
+          true: Yes, they got the full dose
+          false: No, they got half a dose
       import_duplicate_form:
         apply_changes_options:
           apply: Use duplicate record

spec/models/draft_vaccination_record_spec.rb

@@ -84,6 +84,16 @@
   describe "#reset_unused_fields" do
     subject(:save!) { draft_vaccination_record.save! }
 
+    context "when administered" do
+      let(:attributes) { valid_administered_attributes.except(:full_dose) }
+
+      it "sets full dose to true if half doses cannot be recorded" do
+        expect { save! }.to change(draft_vaccination_record, :full_dose).to(
+          true
+        )
+      end
+    end
+
     context "when not administered" do
       let(:attributes) do
         valid_not_administered_attributes.merge(