From 7af8291e5a4929b25bd8d18a32dd9546db7c8296 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 5 Jan 2022 11:29:52 +0000 Subject: [PATCH] Display inferred check answers value if the value is not set --- app/models/form/question.rb | 7 +++++-- app/models/form/subsection.rb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/form/question.rb b/app/models/form/question.rb index aca00f8dd..31db5745e 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -32,7 +32,9 @@ class Form::Question return checkbox_answer_label(case_log) if type == "checkbox" return case_log[id].strftime("%d %b %Y") if type == "date" - case_log[id].to_s + return case_log[id].to_s if case_log[id].present? + + inferred_check_answers_value.present? ? inferred_check_answers_value["value"] : "" end def get_inferred_answers(case_log) @@ -56,7 +58,8 @@ class Form::Question end def has_inferred_check_answers_value?(case_log) - return inferred_check_answers_value["condition"].values[0] == case_log[inferred_check_answers_value["condition"].keys[0]] if inferred_check_answers_value.present? + return inferred_check_answers_value["condition"].values[0] == case_log[inferred_check_answers_value["condition"].keys[0]] if inferred_check_answers_value.present? + false end diff --git a/app/models/form/subsection.rb b/app/models/form/subsection.rb index 0a41e69ae..f979235b4 100644 --- a/app/models/form/subsection.rb +++ b/app/models/form/subsection.rb @@ -63,7 +63,7 @@ class Form::Subsection applicable_questions(case_log) - answered_questions(case_log) end - def displayed_to_user?(case_log, q) - q.page.routed_to?(case_log) && q.enabled?(case_log) && !q.hidden_in_check_answers? + def displayed_to_user?(case_log, question) + question.page.routed_to?(case_log) && question.enabled?(case_log) && !question.hidden_in_check_answers? end end