Merge pull request #3714 from nhsuk/health-questions-followup-no-response

Don't ask to give details for start of follow up questions

Author: thomasleese

app/helpers/consent_forms_helper.rb

@@ -3,7 +3,7 @@
 module ConsentFormsHelper
   def health_answer_response(health_answer)
     if health_answer.response == "yes"
-      "Yes – #{health_answer.notes}"
+      ["Yes", health_answer.notes].join(" – ")
     else
       "No"
     end

app/models/health_answer.rb

@@ -11,10 +11,12 @@ class HealthAnswer
                 :next_question,
                 :follow_up_question
 
-  validates :notes, length: { maximum: 1000 }
-
   validates :response, inclusion: { in: %w[yes no] }
-  validates :notes, presence: true, if: -> { response == "yes" }
+
+  validates :notes,
+            presence: true,
+            if: -> { requires_notes? && response == "yes" }
+  validates :notes, length: { maximum: 1000 }
 
   def attributes
     %i[
@@ -41,6 +43,8 @@ def assign_attributes(attrs)
     super(attrs)
   end
 
+  def requires_notes? = follow_up_question.nil?
+
   def self.from_health_questions(health_questions)
     hq_id_map = Hash[health_questions.map.with_index { |hq, i| [hq.id, i] }]
 

app/views/parent_interface/consent_forms/edit/health_question.html.erb

@@ -12,17 +12,18 @@
 
   <%= hidden_field_tag "question_number", @question_number %>
 
-  <%= f.govuk_radio_buttons_fieldset(:response,
+  <%= f.govuk_radio_buttons_fieldset :response,
                                      legend: { size: "l", text: title, tag: "h1" },
-                                     hint: { text: @health_answer.hint }) do %>
-    <%= f.govuk_radio_button :response, "yes",
-                             label: { text: "Yes" },
-                             link_errors: true do %>
-      <%= f.govuk_text_area :notes,
-                            label: { text: "Give details" } %>
+                                     hint: { text: @health_answer.hint } do %>
+    <% if @health_answer.requires_notes? %>
+      <%= f.govuk_radio_button :response, "yes", label: { text: "Yes" }, link_errors: true do %>
+        <%= f.govuk_text_area :notes, label: { text: "Give details" } %>
+      <% end %>
+    <% else %>
+      <%= f.govuk_radio_button :response, "yes", label: { text: "Yes" }, link_errors: true %>
     <% end %>
-    <%= f.govuk_radio_button :response, "no",
-                             label: { text: "No" } %>
+
+    <%= f.govuk_radio_button :response, "no", label: { text: "No" } %>
   <% end %>
 
   <%= f.govuk_submit "Continue" %>

spec/features/parental_consent_change_answers_spec.rb

@@ -163,7 +163,6 @@ def then_i_see_the_health_question
 
   def when_i_change_my_answer_to_yes_for_the_asthma_question
     choose "Yes"
-    fill_in "Give details", with: "He has had asthma since he was 2"
     click_button "Continue"
   end
 
@@ -192,8 +191,6 @@ def then_i_see_the_second_follow_up_question
   end
 
   def and_i_see_the_answer_i_changed_is_yes
-    expect(page).to have_content("Yes – He has had asthma since he was 2")
-
     expect(page).to have_content("Yes – Follow up details")
     expect(page).to have_content("Yes – Even more follow up details")
   end

spec/features/parental_consent_flu_spec.rb

@@ -91,7 +91,6 @@ def when_i_change_my_answer_to_the_first_health_question
     click_link "Change your answer to health question 1"
 
     choose "Yes"
-    fill_in "Give details", with: "They have asthma"
     click_button "Continue"
   end