From 4b58c739a365b3bf017d2b1f5024deb3f6d06464 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 24 Apr 2023 15:14:01 +0100 Subject: [PATCH] Only display routed to affected questions --- .../_interruption_screen_question.html.erb | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/app/views/form/_interruption_screen_question.html.erb b/app/views/form/_interruption_screen_question.html.erb index 7daef4553..a2e7b9b0f 100644 --- a/app/views/form/_interruption_screen_question.html.erb +++ b/app/views/form/_interruption_screen_question.html.erb @@ -14,33 +14,35 @@ <%= govuk_summary_list do |summary_list| %> <% soft_validation_affected_questions(question, @log).each do |affected_question| %> - <% summary_list.row do |row| %> - <% row.key { get_question_label(affected_question) } %> - <% row.value do %> - <%= simple_format( - get_answer_label(affected_question, @log), - wrapper_tag: "span", - class: "govuk-!-margin-right-4", - ) %> - <% extra_value = affected_question.get_extra_check_answer_value(@log) %> - <% if extra_value && affected_question.answer_label(@log, current_user).present? %> - <%= simple_format( - extra_value, - wrapper_tag: "span", - class: "govuk-!-font-weight-regular app-!-colour-muted", - ) %> + <% if affected_question.page.routed_to?(@log, current_user) %> + <% summary_list.row do |row| %> + <% row.key { get_question_label(affected_question) } %> + <% row.value do %> + <%= simple_format( + get_answer_label(affected_question, @log), + wrapper_tag: "span", + class: "govuk-!-margin-right-4", + ) %> + <% extra_value = affected_question.get_extra_check_answer_value(@log) %> + <% if extra_value && affected_question.answer_label(@log, current_user).present? %> + <%= simple_format( + extra_value, + wrapper_tag: "span", + class: "govuk-!-font-weight-regular app-!-colour-muted", + ) %> + <% end %> + <% affected_question.get_inferred_answers(@log).each do |inferred_answer| %> + <%= inferred_answer %> + <% end %> <% end %> - <% affected_question.get_inferred_answers(@log).each do |inferred_answer| %> - <%= inferred_answer %> + <% if @log.collection_period_open? %> + <% row.action( + text: affected_question.action_text(@log), + href: affected_question.interruption_action_href(@log, affected_question.page.id, question.page.id), + visually_hidden_text: affected_question.check_answer_label.to_s.downcase, + ) %> <% end %> <% end %> - <% if @log.collection_period_open? %> - <% row.action( - text: affected_question.action_text(@log), - href: affected_question.interruption_action_href(@log, affected_question.page.id, question.page.id), - visually_hidden_text: affected_question.check_answer_label.to_s.downcase, - ) %> - <% end %> <% end %> <% end %> <% end %>