diff --git a/app/helpers/duplicate_logs_helper.rb b/app/helpers/duplicate_logs_helper.rb index 077845857..92490c10f 100644 --- a/app/helpers/duplicate_logs_helper.rb +++ b/app/helpers/duplicate_logs_helper.rb @@ -55,16 +55,18 @@ module DuplicateLogsHelper duplicate_sets_count > 1 ? "Review these #{duplicate_sets_count} sets of logs" : "Review this #{duplicate_sets_count} set of logs" end - def duplicate_log_question_label(question) - if question.id == "uprn" + def duplicate_log_question_label(question, log) + if question.id == "uprn" && !log.form.start_year_2026_or_later? "Postcode (from UPRN)" + elsif question.id == "address_line1" + "#{question.question_number_string} - Address line 1" else get_question_label(question) end end def duplicate_log_answer_label(question, log) - if question.id == "uprn" + if question.id == "uprn" && !log.form.start_year_2026_or_later? postcode_question = log.form.get_question("postcode_full", log) get_answer_label(postcode_question, log) else @@ -73,16 +75,26 @@ module DuplicateLogsHelper end def duplicate_log_extra_value(question, log) - if question.id == "uprn" + if log.form.start_year_2026_or_later? + case question.id + when "uprn" + value = [ + log.address_line1, + log.postcode_full, + ].select(&:present?) + + "\n\n#{value.join("\n")}" + else + question.get_extra_check_answer_value(log) + end + elsif question.id == "uprn" && !log.form.start_year_2026_or_later? postcode_question = log.form.get_question("postcode_full", log) postcode_question.get_extra_check_answer_value(log) - else - question.get_extra_check_answer_value(log) end end def duplicate_log_answer_label_present(question, log, current_user) - if question.id == "uprn" + if question.id == "uprn" && !log.form.start_year_2026_or_later? postcode_question = log.form.get_question("postcode_full", log) postcode_question.answer_label(log, current_user).present? else @@ -91,7 +103,7 @@ module DuplicateLogsHelper end def duplicate_log_inferred_answers(question, log) - if question.id == "uprn" + if question.id == "uprn" && !log.form.start_year_2026_or_later? postcode_question = log.form.get_question("postcode_full", log) postcode_question.get_inferred_answers(log) else diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index a8e494b5b..741bc6024 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -725,11 +725,13 @@ class LettingsLog < Log ["owning_organisation_id", "startdate", "tenancycode", - uprn.blank? ? "postcode_full" : "uprn", + form.start_year_2026_or_later? ? "address_line1" : nil, + "postcode_full", + "uprn", "scheme_id", - "location_id", + form.start_year_2026_or_later? ? nil : "location_id", "age1", - "sex1", + form.start_year_2026_or_later? ? "sexrab1" : "sex1", "ecstat1", household_charge == 1 ? "household_charge" : nil, "tcharge", diff --git a/app/views/duplicate_logs/_duplicate_log_check_answers.erb b/app/views/duplicate_logs/_duplicate_log_check_answers.erb index 91deb10c8..8dbe7056f 100644 --- a/app/views/duplicate_logs/_duplicate_log_check_answers.erb +++ b/app/views/duplicate_logs/_duplicate_log_check_answers.erb @@ -3,7 +3,7 @@ <%= govuk_summary_list do |summary_list| %> <% log.duplicate_check_questions(current_user).each do |question| %> <% summary_list.with_row do |row| %> - <% row.with_key { duplicate_log_question_label(question) } %> + <% row.with_key { duplicate_log_question_label(question, log) } %> <% row.with_value do %> <%= simple_format(