From ad8c35fb6a49d8c0dd9e299cd799cf99c206ff83 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 16 Jun 2023 15:49:42 +0100 Subject: [PATCH] feat: rename display_label --- app/models/form/lettings/questions/address_line1.rb | 1 - app/models/form/question.rb | 4 ++-- app/models/form/sales/questions/address_line1.rb | 1 - app/services/bulk_upload/lettings/year2022/row_parser.rb | 4 ++-- app/services/bulk_upload/lettings/year2023/row_parser.rb | 4 ++-- app/services/bulk_upload/sales/year2022/row_parser.rb | 4 ++-- app/services/bulk_upload/sales/year2023/row_parser.rb | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/models/form/lettings/questions/address_line1.rb b/app/models/form/lettings/questions/address_line1.rb index fa2ac82da..95702b8de 100644 --- a/app/models/form/lettings/questions/address_line1.rb +++ b/app/models/form/lettings/questions/address_line1.rb @@ -2,7 +2,6 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question def initialize(id, hsh, page) super @id = "address_line1" - @check_answer_label = "Address" @header = "Address line 1" @error_label = "Address line 1" @type = "text" diff --git a/app/models/form/question.rb b/app/models/form/question.rb index cb012e22a..2d6b3aa58 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -196,7 +196,7 @@ class Form::Question type == "radio" && RADIO_REFUSED_VALUE[id.to_sym]&.include?(value) end - def display_label + def error_display_label error_label || check_answer_label || header || id.humanize end @@ -204,7 +204,7 @@ class Form::Question return I18n.t("validations.declaration.missing") if id == "declaration" return I18n.t("validations.privacynotice.missing") if id == "privacynotice" - I18n.t("validations.not_answered", question: display_label.downcase) + I18n.t("validations.not_answered", question: error_display_label.downcase) end def suffix_label(log) diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb index 5573d9e10..fcf31a082 100644 --- a/app/models/form/sales/questions/address_line1.rb +++ b/app/models/form/sales/questions/address_line1.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question def initialize(id, hsh, page) super @id = "address_line1" - @check_answer_label = "Address" @header = "Address line 1" @error_label = "Address line 1" @type = "text" diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 40cceac45..c6251c81f 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -774,13 +774,13 @@ private if setup_question?(question) fields.each do |field| if errors.select { |e| fields.include?(e.attribute) }.none? - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase), category: :setup) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase), category: :setup) end end else fields.each do |field| unless errors.any? { |e| fields.include?(e.attribute) } - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase)) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase)) end end end diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index b8c903d22..38e9d35c0 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -681,14 +681,14 @@ private if setup_question?(question) fields.each do |field| if errors.select { |e| fields.include?(e.attribute) }.none? - question_text = question.display_label.presence || "this question" + question_text = question.error_display_label.presence || "this question" errors.add(field, I18n.t("validations.not_answered", question: question_text.downcase), category: :setup) end end else fields.each do |field| unless errors.any? { |e| fields.include?(e.attribute) } - question_text = question.display_label.presence || "this question" + question_text = question.error_display_label.presence || "this question" errors.add(field, I18n.t("validations.not_answered", question: question_text.downcase)) end end diff --git a/app/services/bulk_upload/sales/year2022/row_parser.rb b/app/services/bulk_upload/sales/year2022/row_parser.rb index 09002905c..1ac6258fd 100644 --- a/app/services/bulk_upload/sales/year2022/row_parser.rb +++ b/app/services/bulk_upload/sales/year2022/row_parser.rb @@ -1057,9 +1057,9 @@ private fields.each do |field| unless errors.any? { |e| fields.include?(e.attribute) } if setup_question?(question) - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase), category: :setup) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase), category: :setup) else - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase)) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase)) end end end diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 80b1b6cf0..17ec939d4 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -1210,13 +1210,13 @@ private if setup_question?(question) fields.each do |field| unless errors.any? { |e| fields.include?(e.attribute) } - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase), category: :setup) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase), category: :setup) end end else fields.each do |field| unless errors.any? { |e| fields.include?(e.attribute) } - errors.add(field, I18n.t("validations.not_answered", question: question.display_label&.downcase)) + errors.add(field, I18n.t("validations.not_answered", question: question.error_display_label&.downcase)) end end end