Merge pull request #3951 from nhsuk/dont-ask-full-or-half-dose

Don't ask full or half dose question by default

Author: thomasleese

app/controllers/draft_vaccination_records_controller.rb

@@ -49,6 +49,9 @@ def update
       jump_to("confirm")
     end
 
+    set_steps
+    setup_wizard_translated
+
     render_wizard @draft_vaccination_record
   end
 

app/controllers/patient_sessions/vaccinations_controller.rb

@@ -27,7 +27,8 @@ def create
       steps = draft_vaccination_record.wizard_steps
 
       steps.delete(:notes) # this is on the confirmation page
-      steps.delete(:identity) # this is on the confirmation page
+      steps.delete(:identity) # this can only be changed from confirmation page
+      steps.delete(:dose) # this can only be changed from confirmation page
 
       steps.delete(:date_and_time)
       steps.delete(:outcome) if draft_vaccination_record.administered?

app/forms/vaccinate_form.rb

@@ -59,6 +59,7 @@ 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.identity_check_confirmed_by_other_name =
       identity_check_confirmed_by_other_name
     draft_vaccination_record.identity_check_confirmed_by_other_relationship =

app/models/draft_vaccination_record.rb

@@ -40,13 +40,13 @@ def self.request_session_key
 
   def wizard_steps
     [
-      :notes,
       :identity,
+      :notes,
       :date_and_time,
       (:outcome if can_change_outcome?),
       (:delivery if administered?),
-      (:batch if administered?),
       (:dose if administered? && can_be_half_dose?),
+      (:batch if administered?),
       (:location if location&.generic_clinic?),
       :confirm
     ].compact
@@ -212,7 +212,6 @@ def delivery_method=(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
 
@@ -297,6 +296,10 @@ def reset_unused_fields
     end
   end
 
+  def can_be_half_dose?
+    delivery_method.in?(Vaccine::NASAL_DELIVERY_METHODS)
+  end
+
   def can_change_outcome?
     outcome != "already_had" || editing? || session.nil? || session.today?
   end

app/models/vaccine.rb

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

spec/features/flu_vaccination_administered_spec.rb

@@ -89,7 +89,13 @@ def and_there_is_a_flu_session_today_with_two_patients_ready_to_vaccinate
   end
 
   def and_there_are_nasal_and_injection_batches
-    @nasal_vaccine = create(:vaccine, programme: @programme, method: :nasal)
+    @nasal_vaccine =
+      create(
+        :vaccine,
+        programme: @programme,
+        method: :nasal,
+        dose_volume_ml: 0.2
+      )
     @nasal_batch =
       create(
         :batch,
@@ -150,6 +156,8 @@ def when_i_record_that_the_patient_has_been_vaccinated_with_nasal_spray
 
     choose @nasal_batch.name
     click_button "Continue"
+
+    expect(page).not_to have_content("Did they get the full dose?")
   end
 
   def when_i_record_that_the_patient_has_been_vaccinated_with_injection
@@ -173,6 +181,7 @@ def then_i_see_the_check_and_confirm_page_for_nasal_spray
     expect(page).to have_content(@nasal_batch.name)
     expect(page).to have_content("Nasal spray")
     expect(page).to have_content("Nose")
+    expect(page).to have_content("Dose volume0.2 ml")
     expect(page).to have_content(@location.name)
     expect(page).to have_content("Vaccinated")
   end

spec/models/vaccine_spec.rb

@@ -58,28 +58,6 @@
     end
   end
 
-  describe "#can_be_half_dose?" do
-    subject { vaccine.can_be_half_dose? }
-
-    context "with a nasal Flu vaccine" do
-      let(:vaccine) { build(:vaccine, :fluenz_tetra) }
-
-      it { should be(true) }
-    end
-
-    context "with an injected Flu vaccine" do
-      let(:vaccine) { build(:vaccine, :quadrivalent_influenza) }
-
-      it { should be(false) }
-    end
-
-    context "with an HPV vaccine" do
-      let(:vaccine) { build(:vaccine, :gardasil_9) }
-
-      it { should be(false) }
-    end
-  end
-
   describe "#available_delivery_methods" do
     subject { vaccine.available_delivery_methods }