diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb index 7e73c5109..98f8e5aa3 100644 --- a/app/helpers/check_answers_helper.rb +++ b/app/helpers/check_answers_helper.rb @@ -12,6 +12,16 @@ module CheckAnswersHelper end end + def get_answer_label(question, case_log) + answer = ActionController::Base.helpers.number_to_currency(question.answer_label(case_log), delimiter: ",", format: "%n") + + if answer.present? + [question.prefix, answer, question.suffix].join("") + else + "You didn’t answer this question".html_safe + end + end + private def create_next_missing_question_link(subsection, case_log) diff --git a/app/models/form/question.rb b/app/models/form/question.rb index deac97973..edbf96178 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -33,12 +33,6 @@ class Form::Question delegate :subsection, to: :page delegate :form, to: :subsection - def get_answer_label(case_log) - answer = ActionController::Base.helpers.number_to_currency(answer_label(case_log), delimiter: ",", format: "%n") - - answer.present? ? [prefix, answer, suffix].join("") : "" - end - def answer_label(case_log) return checkbox_answer_label(case_log) if type == "checkbox" return case_log[id].strftime("%d %b %Y") if type == "date" diff --git a/app/views/form/_check_answers_table.html.erb b/app/views/form/_check_answers_table.html.erb index 79a723ef8..8d58e35c0 100644 --- a/app/views/form/_check_answers_table.html.erb +++ b/app/views/form/_check_answers_table.html.erb @@ -3,7 +3,7 @@ <%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
- <%= question.get_answer_label(@case_log) %>
+ <%= get_answer_label(question, @case_log) %>
<% question.get_inferred_answers(@case_log).each do |inferred_answer| %> <%= inferred_answer %>
<% end %> diff --git a/spec/requests/case_log_controller_spec.rb b/spec/requests/case_log_controller_spec.rb index bf954a9ce..05b414614 100644 --- a/spec/requests/case_log_controller_spec.rb +++ b/spec/requests/case_log_controller_spec.rb @@ -278,6 +278,11 @@ RSpec.describe CaseLogsController, type: :request do get "/logs/#{id}/property-information/check-answers" expect(CGI.unescape_html(response.body)).to include("Not known") end + + it "shows `you haven't answered this question` if the question wasn't answered" do + get "/logs/#{id}/income-and-benefits/check-answers" + expect(CGI.unescape_html(response.body)).to include("You didn’t answer this question") + end end end