From bd57dee8774aac7b7987bb4784efaedb30aac5fd Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Fri, 27 Mar 2026 13:36:33 +0000 Subject: [PATCH] CLDC-4320: initial file finding --- app/models/form/lettings/questions/armedforces.rb | 8 ++++++++ app/models/form/lettings/questions/ethnic_group.rb | 8 ++++++++ .../form/lettings/questions/gender_identity1.rb | 8 ++++++++ .../form/lettings/questions/gender_same_as_sex.rb | 2 +- app/models/form/lettings/questions/hb.rb | 8 ++++++++ app/models/form/lettings/questions/illness.rb | 9 +++++++++ app/models/form/lettings/questions/nationality.rb | 9 +++++++++ .../form/lettings/questions/nationality_all.rb | 4 ++-- .../lettings/questions/nationality_all_group.rb | 8 ++++++++ .../form/lettings/questions/net_income_known.rb | 8 ++++++++ .../lettings/questions/person_gender_identity.rb | 8 ++++++++ .../form/lettings/questions/person_partner.rb | 8 ++++++++ .../form/lettings/questions/person_relationship.rb | 8 ++++++++ .../lettings/questions/person_working_situation.rb | 8 ++++++++ app/models/form/lettings/questions/preg_occ.rb | 8 ++++++++ app/models/form/lettings/questions/reason.rb | 8 ++++++++ .../form/lettings/questions/reason_renewal.rb | 8 ++++++++ app/models/form/lettings/questions/reservist.rb | 8 ++++++++ .../form/lettings/questions/working_situation1.rb | 8 ++++++++ app/models/form/sales/questions/age1.rb | 1 + app/models/form/sales/questions/armed_forces.rb | 8 ++++++++ .../form/sales/questions/armed_forces_spouse.rb | 8 ++++++++ .../form/sales/questions/buyer1_age_known.rb | 8 ++++++++ .../form/sales/questions/buyer1_ethnic_group.rb | 8 ++++++++ .../form/sales/questions/buyer1_nationality.rb | 14 ++++++++------ .../sales/questions/buyer1_working_situation.rb | 13 +++++++------ .../form/sales/questions/buyer2_ethnic_group.rb | 8 ++++++++ .../form/sales/questions/buyer2_nationality.rb | 14 ++++++++------ .../questions/buyer2_relationship_to_buyer1.rb | 14 ++++++++------ .../buyer2_relationship_to_buyer1_yes_no.rb | 14 ++++++++------ .../sales/questions/buyer2_working_situation.rb | 14 ++++++++------ .../form/sales/questions/buyer_still_serving.rb | 8 ++++++++ .../form/sales/questions/gender_identity2.rb | 14 ++++++++------ app/models/form/sales/questions/nationality_all.rb | 4 ++-- .../form/sales/questions/nationality_all_group.rb | 8 ++++++++ .../form/sales/questions/person_gender_identity.rb | 14 ++++++++------ .../questions/person_relationship_to_buyer_1.rb | 14 ++++++++------ .../person_relationship_to_buyer_1_yes_no.rb | 14 ++++++++------ .../sales/questions/person_working_situation.rb | 8 ++++++++ 39 files changed, 287 insertions(+), 65 deletions(-) diff --git a/app/models/form/lettings/questions/armedforces.rb b/app/models/form/lettings/questions/armedforces.rb index 32aac69ca..7a883f195 100644 --- a/app/models/form/lettings/questions/armedforces.rb +++ b/app/models/form/lettings/questions/armedforces.rb @@ -19,4 +19,12 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 65, 2025 => 65, 2026 => 72 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "3" + + super + end end diff --git a/app/models/form/lettings/questions/ethnic_group.rb b/app/models/form/lettings/questions/ethnic_group.rb index c1c0be096..64399bc83 100644 --- a/app/models/form/lettings/questions/ethnic_group.rb +++ b/app/models/form/lettings/questions/ethnic_group.rb @@ -19,4 +19,12 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33, 2025 => 33, 2026 => 33 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "17" + + super + end end diff --git a/app/models/form/lettings/questions/gender_identity1.rb b/app/models/form/lettings/questions/gender_identity1.rb index f3d86fde0..4599b3043 100644 --- a/app/models/form/lettings/questions/gender_identity1.rb +++ b/app/models/form/lettings/questions/gender_identity1.rb @@ -17,4 +17,12 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32, 2025 => 32 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/lettings/questions/gender_same_as_sex.rb b/app/models/form/lettings/questions/gender_same_as_sex.rb index 0b0fd55b5..2e28d0fcd 100644 --- a/app/models/form/lettings/questions/gender_same_as_sex.rb +++ b/app/models/form/lettings/questions/gender_same_as_sex.rb @@ -7,7 +7,7 @@ class Form::Lettings::Questions::GenderSameAsSex < ::Form::Question @conditional_for = { "gender_description#{person_index}" => [2] } @person_index = person_index @question_number = question_number - @inferred_check_answers_value = [{ "condition" => { "gender_same_as_sex#{person_index}" => 2 }, "value" => "No" }] + @inferred_check_answers_value = [{ "condition" => { "gender_same_as_sex#{person_index}" => 2 }, "value" => "No" }] #??? end def answer_options diff --git a/app/models/form/lettings/questions/hb.rb b/app/models/form/lettings/questions/hb.rb index f9204e65a..6719b3669 100644 --- a/app/models/form/lettings/questions/hb.rb +++ b/app/models/form/lettings/questions/hb.rb @@ -18,4 +18,12 @@ class Form::Lettings::Questions::Hb < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88, 2025 => 88, 2026 => 96 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + + super + end end diff --git a/app/models/form/lettings/questions/illness.rb b/app/models/form/lettings/questions/illness.rb index 4bc3667fb..7bd56723d 100644 --- a/app/models/form/lettings/questions/illness.rb +++ b/app/models/form/lettings/questions/illness.rb @@ -16,4 +16,13 @@ class Form::Lettings::Questions::Illness < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 72, 2025 => 72, 2026 => 79 }.freeze + + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "3" + + super + end end diff --git a/app/models/form/lettings/questions/nationality.rb b/app/models/form/lettings/questions/nationality.rb index a966f68f7..4aef6f7ee 100644 --- a/app/models/form/lettings/questions/nationality.rb +++ b/app/models/form/lettings/questions/nationality.rb @@ -20,4 +20,13 @@ class Form::Lettings::Questions::Nationality < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 34 }.freeze + + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "13" + #do these combined qs work the same?? + super + end end diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb index 368c0ffb5..85a329700 100644 --- a/app/models/form/lettings/questions/nationality_all.rb +++ b/app/models/form/lettings/questions/nationality_all.rb @@ -21,8 +21,8 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question def label_from_value(value) return unless value - return "Tenant prefers not to say" if value.to_i.zero? - + return "Prefers not to say" if value.to_i.zero? + #?? answer_options[value.to_s]["name"] end end diff --git a/app/models/form/lettings/questions/nationality_all_group.rb b/app/models/form/lettings/questions/nationality_all_group.rb index 0c4ed5d90..34340739a 100644 --- a/app/models/form/lettings/questions/nationality_all_group.rb +++ b/app/models/form/lettings/questions/nationality_all_group.rb @@ -18,4 +18,12 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "0" + + super + end end diff --git a/app/models/form/lettings/questions/net_income_known.rb b/app/models/form/lettings/questions/net_income_known.rb index 4bcbe7fd1..fe9b4c7de 100644 --- a/app/models/form/lettings/questions/net_income_known.rb +++ b/app/models/form/lettings/questions/net_income_known.rb @@ -17,4 +17,12 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 85, 2025 => 85, 2026 => 93 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "2" + + super + end end diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb index 0d76d23e3..409a0a3ab 100644 --- a/app/models/form/lettings/questions/person_gender_identity.rb +++ b/app/models/form/lettings/questions/person_gender_identity.rb @@ -27,4 +27,12 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question base_question_number + (4 * @person_index) end + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/lettings/questions/person_partner.rb b/app/models/form/lettings/questions/person_partner.rb index d70ed7123..0731580e7 100644 --- a/app/models/form/lettings/questions/person_partner.rb +++ b/app/models/form/lettings/questions/person_partner.rb @@ -41,4 +41,12 @@ class Form::Lettings::Questions::PersonPartner < ::Form::Question def skip_question_in_form_flow?(log) form.start_year_2026_or_later? && log.is_any_person_partner? end + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/lettings/questions/person_relationship.rb b/app/models/form/lettings/questions/person_relationship.rb index d39cb49ff..f36ef53d7 100644 --- a/app/models/form/lettings/questions/person_relationship.rb +++ b/app/models/form/lettings/questions/person_relationship.rb @@ -42,4 +42,12 @@ class Form::Lettings::Questions::PersonRelationship < ::Form::Question base_question_number + (4 * @person_index) end + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb index 0089416fb..b8d2b1d0b 100644 --- a/app/models/form/lettings/questions/person_working_situation.rb +++ b/app/models/form/lettings/questions/person_working_situation.rb @@ -69,4 +69,12 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question base_question_number + (form.person_question_count * @person_index) end + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + + super + end end diff --git a/app/models/form/lettings/questions/preg_occ.rb b/app/models/form/lettings/questions/preg_occ.rb index 03bae1c04..8faed10e5 100644 --- a/app/models/form/lettings/questions/preg_occ.rb +++ b/app/models/form/lettings/questions/preg_occ.rb @@ -16,4 +16,12 @@ class Form::Lettings::Questions::PregOcc < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 68, 2025 => 68, 2026 => 75 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "3" + + super + end end diff --git a/app/models/form/lettings/questions/reason.rb b/app/models/form/lettings/questions/reason.rb index a40d9d134..49494b4fb 100644 --- a/app/models/form/lettings/questions/reason.rb +++ b/app/models/form/lettings/questions/reason.rb @@ -133,4 +133,12 @@ class Form::Lettings::Questions::Reason < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2024 => 76, 2025 => 76, 2026 => 83 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "47" + + super + end end diff --git a/app/models/form/lettings/questions/reason_renewal.rb b/app/models/form/lettings/questions/reason_renewal.rb index d5fccca67..c8f522783 100644 --- a/app/models/form/lettings/questions/reason_renewal.rb +++ b/app/models/form/lettings/questions/reason_renewal.rb @@ -38,4 +38,12 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76, 2025 => 76, 2026 => 83 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "47" + + super + end end diff --git a/app/models/form/lettings/questions/reservist.rb b/app/models/form/lettings/questions/reservist.rb index f6e97c3d8..dac0f0a74 100644 --- a/app/models/form/lettings/questions/reservist.rb +++ b/app/models/form/lettings/questions/reservist.rb @@ -16,4 +16,12 @@ class Form::Lettings::Questions::Reservist < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 67, 2025 => 67, 2026 => 74 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "3" + + super + end end diff --git a/app/models/form/lettings/questions/working_situation1.rb b/app/models/form/lettings/questions/working_situation1.rb index 0a0221579..b3d295e73 100644 --- a/app/models/form/lettings/questions/working_situation1.rb +++ b/app/models/form/lettings/questions/working_situation1.rb @@ -41,4 +41,12 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 37, 2024 => 36, 2025 => 36, 2026 => 36 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + + super + end end diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb index 01872c04a..d065b51be 100644 --- a/app/models/form/sales/questions/age1.rb +++ b/app/models/form/sales/questions/age1.rb @@ -14,6 +14,7 @@ class Form::Sales::Questions::Age1 < ::Form::Question "condition" => { "age1_known" => 2 }, "value" => "Prefers not to say", }, + #??? ] @check_answers_card_number = 1 @min = 16 diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb index 9b55f2de8..779036c53 100644 --- a/app/models/form/sales/questions/armed_forces.rb +++ b/app/models/form/sales/questions/armed_forces.rb @@ -16,4 +16,12 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 62, 2024 => 64, 2025 => 61, 2026 => 69 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "3" + + super + end end diff --git a/app/models/form/sales/questions/armed_forces_spouse.rb b/app/models/form/sales/questions/armed_forces_spouse.rb index 44201aabc..eb03f3755 100644 --- a/app/models/form/sales/questions/armed_forces_spouse.rb +++ b/app/models/form/sales/questions/armed_forces_spouse.rb @@ -16,4 +16,12 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63, 2026 => 71 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "6" + + super + end end diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb index fd87e9c8d..acb9d1437 100644 --- a/app/models/form/sales/questions/buyer1_age_known.rb +++ b/app/models/form/sales/questions/buyer1_age_known.rb @@ -32,4 +32,12 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 21 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "2" + + super + end end diff --git a/app/models/form/sales/questions/buyer1_ethnic_group.rb b/app/models/form/sales/questions/buyer1_ethnic_group.rb index 5afd80b48..041efe619 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_group.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_group.rb @@ -19,4 +19,12 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 24, 2025 => 22, 2026 => 24 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "17" + + super + end end diff --git a/app/models/form/sales/questions/buyer1_nationality.rb b/app/models/form/sales/questions/buyer1_nationality.rb index 1cdccfecc..ce829a904 100644 --- a/app/models/form/sales/questions/buyer1_nationality.rb +++ b/app/models/form/sales/questions/buyer1_nationality.rb @@ -5,12 +5,6 @@ class Form::Sales::Questions::Buyer1Nationality < ::Form::Question @type = "radio" @answer_options = ANSWER_OPTIONS @check_answers_card_number = 1 - @inferred_check_answers_value = [{ - "condition" => { - "national" => 13, - }, - "value" => "Prefers not to say", - }] @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end @@ -23,4 +17,12 @@ class Form::Sales::Questions::Buyer1Nationality < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 26, 2025 => 24, 2026 => 26 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "13" + + super + end end diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb index 1e9faa916..53a1245a2 100644 --- a/app/models/form/sales/questions/buyer1_working_situation.rb +++ b/app/models/form/sales/questions/buyer1_working_situation.rb @@ -5,12 +5,6 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question @type = "radio" @answer_options = answer_options @check_answers_card_number = 1 - @inferred_check_answers_value = [{ - "condition" => { - "ecstat1" => 10, - }, - "value" => "Prefers not to say", - }] @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end @@ -45,4 +39,11 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 27, 2025 => 25, 2026 => 27 }.freeze + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + + super + end end diff --git a/app/models/form/sales/questions/buyer2_ethnic_group.rb b/app/models/form/sales/questions/buyer2_ethnic_group.rb index cfae8ea43..e97320297 100644 --- a/app/models/form/sales/questions/buyer2_ethnic_group.rb +++ b/app/models/form/sales/questions/buyer2_ethnic_group.rb @@ -19,4 +19,12 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 32, 2025 => 30, 2026 => 33 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "17" + + super + end end diff --git a/app/models/form/sales/questions/buyer2_nationality.rb b/app/models/form/sales/questions/buyer2_nationality.rb index 377729788..1bc0e0d62 100644 --- a/app/models/form/sales/questions/buyer2_nationality.rb +++ b/app/models/form/sales/questions/buyer2_nationality.rb @@ -6,12 +6,6 @@ class Form::Sales::Questions::Buyer2Nationality < ::Form::Question @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) - @inferred_check_answers_value = [{ - "condition" => { - "national" => 13, - }, - "value" => "Prefers not to say", - }] end ANSWER_OPTIONS = { @@ -23,4 +17,12 @@ class Form::Sales::Questions::Buyer2Nationality < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 34, 2025 => 32 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "13" + + super + end end diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb index 8084415e3..bca1d11da 100644 --- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb +++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb @@ -6,12 +6,6 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question @type = "radio" @answer_options = answer_options @check_answers_card_number = 2 - @inferred_check_answers_value = [{ - "condition" => { - "relat2" => "R", - }, - "value" => "Prefers not to say", - }] @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end @@ -34,4 +28,12 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 29, 2025 => 27, 2026 => 29 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb index 72b0f196e..aa3d001c8 100644 --- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb +++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb @@ -9,15 +9,17 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1YesNo < ::Form::Question "X" => { "value" => "No" }, "R" => { "value" => "Buyer prefers not to say" }, } - @inferred_check_answers_value = [{ - "condition" => { - "relat2" => "R", - }, - "value" => "Prefers not to say", - }] @check_answers_card_number = 2 @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end QUESTION_NUMBER_FROM_YEAR = { 2025 => 27, 2026 => 29 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + #check for when ans opt is already prefers not to say + super + end end diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb index 2165c7023..9cca75f77 100644 --- a/app/models/form/sales/questions/buyer2_working_situation.rb +++ b/app/models/form/sales/questions/buyer2_working_situation.rb @@ -6,12 +6,6 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question @type = "radio" @answer_options = answer_options @check_answers_card_number = 2 - @inferred_check_answers_value = [{ - "condition" => { - "ecstat2" => 10, - }, - "value" => "Prefers not to say", - }] @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end @@ -52,4 +46,12 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 35, 2025 => 33, 2026 => 36 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + #check for inferred cya opts @ + super + end end diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb index 876cc91af..d6bb2a839 100644 --- a/app/models/form/sales/questions/buyer_still_serving.rb +++ b/app/models/form/sales/questions/buyer_still_serving.rb @@ -26,4 +26,12 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question end QUESTION_NUMBER_FROM_YEAR = { 2023 => 63, 2024 => 65, 2025 => 62, 2026 => 70 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "6" + #change string nums to nums + super + end end diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb index e81abfd75..50bc6d1ee 100644 --- a/app/models/form/sales/questions/gender_identity2.rb +++ b/app/models/form/sales/questions/gender_identity2.rb @@ -6,12 +6,6 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question @copy_key = "sales.household_characteristics.sex2.buyer" @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 - @inferred_check_answers_value = [{ - "condition" => { - "sex2" => "R", - }, - "value" => "Prefers not to say", - }] @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) end @@ -23,4 +17,12 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 31 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb index 088e09f69..25d36018b 100644 --- a/app/models/form/sales/questions/nationality_all.rb +++ b/app/models/form/sales/questions/nationality_all.rb @@ -25,8 +25,8 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question def label_from_value(value) return unless value - return "Buyer prefers not to say" if value.to_i.zero? - + return "Prefers not to say" if value.to_i.zero? + #?? answer_options[value.to_s]["name"] end end diff --git a/app/models/form/sales/questions/nationality_all_group.rb b/app/models/form/sales/questions/nationality_all_group.rb index 86ff68596..46ba43e56 100644 --- a/app/models/form/sales/questions/nationality_all_group.rb +++ b/app/models/form/sales/questions/nationality_all_group.rb @@ -22,4 +22,12 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question 2025 => { 1 => 24, 2 => 32 }, 2026 => { 1 => 26, 2 => 35 }, }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "0" + + super + end end diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb index ce4c4e0ef..1c4782c1d 100644 --- a/app/models/form/sales/questions/person_gender_identity.rb +++ b/app/models/form/sales/questions/person_gender_identity.rb @@ -5,12 +5,6 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question @copy_key = "sales.household_characteristics.sex2.person" if person_index == 2 @answer_options = ANSWER_OPTIONS @check_answers_card_number = person_index - @inferred_check_answers_value = [{ - "condition" => { - id => "R", - }, - "value" => "Prefers not to say", - }] @person_index = person_index @question_number = get_person_question_number(BASE_QUESTION_NUMBERS) end @@ -23,4 +17,12 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question }.freeze BASE_QUESTION_NUMBERS = { 2023 => 30, 2024 => 32, 2025 => 30 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb index be8f0974c..b4ac1f336 100644 --- a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb +++ b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb @@ -5,12 +5,6 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question @copy_key = "sales.household_characteristics.relat2.person" if person_index == 2 @answer_options = answer_options @check_answers_card_number = person_index - @inferred_check_answers_value = [{ - "condition" => { - id => "R", - }, - "value" => "Prefers not to say", - }] @person_index = person_index @question_number = question_number end @@ -43,4 +37,12 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question base_question_number + (form.person_question_count * @person_index) end + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb b/app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb index 480b4a31e..f4abd30d9 100644 --- a/app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb +++ b/app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb @@ -8,16 +8,18 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1YesNo < ::Form::Question "X" => { "value" => "No" }, "R" => { "value" => "Person prefers not to say" }, } - @inferred_check_answers_value = [{ - "condition" => { - id => "R", - }, - "value" => "Prefers not to say", - }] @check_answers_card_number = person_index @person_index = person_index @question_number = get_person_question_number(BASE_QUESTION_NUMBERS) end BASE_QUESTION_NUMBERS = { 2025 => 28, 2026 => 29 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "R" + + super + end end diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb index dd4743811..e2f4f8e0e 100644 --- a/app/models/form/sales/questions/person_working_situation.rb +++ b/app/models/form/sales/questions/person_working_situation.rb @@ -64,4 +64,12 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question end BASE_QUESTION_NUMBERS = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 33 }.freeze + + def label_from_value(value, _log = nil, _user = nil) + return unless value + + return "Prefers not to say" if value == "10" + + super + end end