Browse Source

Reuse check_answers_summary_list for interruption screen

pull/1584/head
Kat 3 years ago
parent
commit
3153dd2cac
  1. 2
      app/views/form/_check_answers_summary_list.html.erb
  2. 40
      app/views/form/_interruption_screen_question.html.erb
  3. 3
      app/views/form/check_answers.html.erb
  4. 2
      app/views/form/review.html.erb

2
app/views/form/_check_answers_summary_list.html.erb

@ -23,7 +23,7 @@
<% if @log.collection_period_open? %> <% if @log.collection_period_open? %>
<% row.action( <% row.action(
text: question.action_text(@log), text: question.action_text(@log),
href: action_href(@log, question.page.id), href: action_href(@log, question.page.id, referrer),
visually_hidden_text: question.check_answer_label.to_s.downcase, visually_hidden_text: question.check_answer_label.to_s.downcase,
) %> ) %>
<% end %> <% end %>

40
app/views/form/_interruption_screen_question.html.erb

@ -5,40 +5,12 @@
</h1> </h1>
<div class="x-govuk-summary-card govuk-!-margin-bottom-6"> <div class="x-govuk-summary-card govuk-!-margin-bottom-6">
<div class="x-govuk-summary-card__body"> <div class="x-govuk-summary-card__body">
<%= govuk_summary_list do |summary_list| %>
<% soft_validation_affected_questions(question, @log).each do |affected_question| %> <%= render partial: "form/check_answers_summary_list", locals: {
<% if affected_question.page.routed_to?(@log, current_user) %> lettings_log:,
<% summary_list.row do |row| %> questions: soft_validation_affected_questions(question, @log).filter { |q| q.page.routed_to?(@log, current_user) },
<% row.key { get_question_label(affected_question) } %> referrer: "interruption_screen",
<% 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| %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% end %>
<% end %>
<% if @log.collection_period_open? %>
<% row.action(
text: affected_question.action_text(@log),
href: action_href(@log, affected_question.page.id, "interruption_screen"),
visually_hidden_text: affected_question.check_answer_label.to_s.downcase,
) %>
<% end %>
<% end %>
<% end %>
<% end %>
<% end %>
</div> </div>
</div> </div>

3
app/views/form/check_answers.html.erb

@ -25,7 +25,8 @@
<%= render partial: "form/check_answers_summary_list", locals: { <%= render partial: "form/check_answers_summary_list", locals: {
subsection:, subsection:,
lettings_log: @log, lettings_log: @log,
questions: total_applicable_questions(subsection, @log, current_user) questions: total_applicable_questions(subsection, @log, current_user),
referrer: "check_answers",
} %> } %>
<% end %> <% end %>

2
app/views/form/review.html.erb

@ -23,7 +23,7 @@
<h3 class="x-govuk-summary-card__title"><%= subsection.label %></h3> <h3 class="x-govuk-summary-card__title"><%= subsection.label %></h3>
</div> </div>
<div class="x-govuk-summary-card__body"> <div class="x-govuk-summary-card__body">
<%= render partial: "form/check_answers_summary_list", locals: { subsection:, questions: total_applicable_questions(subsection, @log, current_user), } %> <%= render partial: "form/check_answers_summary_list", locals: { subsection:, questions: total_applicable_questions(subsection, @log, current_user), referrer: "check_answers" } %>
</div> </div>
</div> </div>
<% end %> <% end %>

Loading…
Cancel
Save