baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLDC-4184: Update question numbers to match paper form

pull/3221/head
samyou-softwire 2 months ago
parent
54d11b1d11
commit
618f489b1e
106 changed files with 144 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/models/form/sales/pages/buyer1_gender_same_as_sex.rb
  2. 2
      app/models/form/sales/pages/buyer2_gender_same_as_sex.rb
  3. 2
      app/models/form/sales/questions/age1.rb
  4. 2
      app/models/form/sales/questions/age2.rb
  5. 2
      app/models/form/sales/questions/armed_forces.rb
  6. 2
      app/models/form/sales/questions/armed_forces_spouse.rb
  7. 2
      app/models/form/sales/questions/buyer1_age_known.rb
  8. 2
      app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
  9. 2
      app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
  10. 2
      app/models/form/sales/questions/buyer1_ethnic_background_black.rb
  11. 2
      app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
  12. 2
      app/models/form/sales/questions/buyer1_ethnic_background_white.rb
  13. 2
      app/models/form/sales/questions/buyer1_ethnic_group.rb
  14. 2
      app/models/form/sales/questions/buyer1_income.rb
  15. 2
      app/models/form/sales/questions/buyer1_income_known.rb
  16. 2
      app/models/form/sales/questions/buyer1_live_in_property.rb
  17. 2
      app/models/form/sales/questions/buyer1_mortgage.rb
  18. 2
      app/models/form/sales/questions/buyer1_nationality.rb
  19. 2
      app/models/form/sales/questions/buyer1_previous_tenure.rb
  20. 2
      app/models/form/sales/questions/buyer1_working_situation.rb
  21. 2
      app/models/form/sales/questions/buyer2_age_known.rb
  22. 2
      app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
  23. 2
      app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
  24. 2
      app/models/form/sales/questions/buyer2_ethnic_background_black.rb
  25. 2
      app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
  26. 2
      app/models/form/sales/questions/buyer2_ethnic_background_white.rb
  27. 2
      app/models/form/sales/questions/buyer2_ethnic_group.rb
  28. 2
      app/models/form/sales/questions/buyer2_income.rb
  29. 2
      app/models/form/sales/questions/buyer2_income_known.rb
  30. 2
      app/models/form/sales/questions/buyer2_live_in_property.rb
  31. 2
      app/models/form/sales/questions/buyer2_living_in.rb
  32. 2
      app/models/form/sales/questions/buyer2_mortgage.rb
  33. 2
      app/models/form/sales/questions/buyer2_nationality.rb
  34. 2
      app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
  35. 2
      app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb
  36. 2
      app/models/form/sales/questions/buyer2_working_situation.rb
  37. 2
      app/models/form/sales/questions/buyer_still_serving.rb
  38. 2
      app/models/form/sales/questions/deposit_amount.rb
  39. 2
      app/models/form/sales/questions/deposit_discount.rb
  40. 2
      app/models/form/sales/questions/discount.rb
  41. 2
      app/models/form/sales/questions/equity.rb
  42. 2
      app/models/form/sales/questions/extra_borrowing.rb
  43. 2
      app/models/form/sales/questions/fromprop.rb
  44. 17
      app/models/form/sales/questions/gender_description.rb
  45. 2
      app/models/form/sales/questions/gender_identity1.rb
  46. 2
      app/models/form/sales/questions/gender_identity2.rb
  47. 14
      app/models/form/sales/questions/gender_same_as_sex.rb
  48. 2
      app/models/form/sales/questions/grant.rb
  49. 2
      app/models/form/sales/questions/handover_date.rb
  50. 2
      app/models/form/sales/questions/has_leasehold_charges.rb
  51. 2
      app/models/form/sales/questions/has_management_fee.rb
  52. 4
      app/models/form/sales/questions/has_service_charge.rb
  53. 2
      app/models/form/sales/questions/has_service_charges_changed.rb
  54. 2
      app/models/form/sales/questions/household_disability.rb
  55. 2
      app/models/form/sales/questions/household_wheelchair.rb
  56. 2
      app/models/form/sales/questions/housing_benefits.rb
  57. 2
      app/models/form/sales/questions/la_nominations.rb
  58. 2
      app/models/form/sales/questions/leasehold_charges.rb
  59. 2
      app/models/form/sales/questions/living_before_purchase.rb
  60. 2
      app/models/form/sales/questions/living_before_purchase_years.rb
  61. 2
      app/models/form/sales/questions/management_fee.rb
  62. 2
      app/models/form/sales/questions/monthly_rent.rb
  63. 2
      app/models/form/sales/questions/monthly_rent_after_staircasing.rb
  64. 2
      app/models/form/sales/questions/monthly_rent_before_staircasing.rb
  65. 2
      app/models/form/sales/questions/mortgage_amount.rb
  66. 2
      app/models/form/sales/questions/mortgage_length.rb
  67. 2
      app/models/form/sales/questions/mortgage_length_known.rb
  68. 2
      app/models/form/sales/questions/mortgageused.rb
  69. 2
      app/models/form/sales/questions/nationality_all.rb
  70. 2
      app/models/form/sales/questions/nationality_all_group.rb
  71. 2
      app/models/form/sales/questions/new_service_charges.rb
  72. 2
      app/models/form/sales/questions/number_of_others_in_property.rb
  73. 4
      app/models/form/sales/questions/person_age.rb
  74. 4
      app/models/form/sales/questions/person_age_known.rb
  75. 4
      app/models/form/sales/questions/person_gender_identity.rb
  76. 2
      app/models/form/sales/questions/person_relationship_to_buyer_1.rb
  77. 4
      app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb
  78. 10
      app/models/form/sales/questions/person_sex_registered_at_birth.rb
  79. 4
      app/models/form/sales/questions/person_working_situation.rb
  80. 2
      app/models/form/sales/questions/previous_bedrooms.rb
  81. 2
      app/models/form/sales/questions/previous_la_known.rb
  82. 2
      app/models/form/sales/questions/previous_postcode.rb
  83. 2
      app/models/form/sales/questions/previous_postcode_known.rb
  84. 2
      app/models/form/sales/questions/previous_tenure.rb
  85. 2
      app/models/form/sales/questions/previous_tenure_buyer2.rb
  86. 2
      app/models/form/sales/questions/prevloc.rb
  87. 2
      app/models/form/sales/questions/prevown.rb
  88. 2
      app/models/form/sales/questions/prevshared.rb
  89. 2
      app/models/form/sales/questions/property_building_type.rb
  90. 2
      app/models/form/sales/questions/property_number_of_bedrooms.rb
  91. 2
      app/models/form/sales/questions/property_wheelchair_accessible.rb
  92. 2
      app/models/form/sales/questions/purchase_price.rb
  93. 2
      app/models/form/sales/questions/resale.rb
  94. 2
      app/models/form/sales/questions/savings.rb
  95. 2
      app/models/form/sales/questions/savings_nk.rb
  96. 4
      app/models/form/sales/questions/service_charge.rb
  97. 2
      app/models/form/sales/questions/sex_registered_at_birth1.rb
  98. 2
      app/models/form/sales/questions/sex_registered_at_birth2.rb
  99. 2
      app/models/form/sales/questions/staircase_bought.rb
  100. 2
      app/models/form/sales/questions/staircase_count.rb
  101. Some files were not shown because too many files have changed in this diff Show More

2
app/models/form/sales/pages/buyer1_gender_same_as_sex.rb
Unescape View File

@ -15,7 +15,7 @@ class Form::Sales::Pages::Buyer1GenderSameAsSex < ::Form::Page
def questions
@questions ||= [
Form::Sales::Questions::GenderSameAsSex.new(nil, nil, self, person_index: 1, buyer: true),
Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 1),
Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 1, buyer: true),
]
end
end

2
app/models/form/sales/pages/buyer2_gender_same_as_sex.rb
Unescape View File

@ -17,7 +17,7 @@ class Form::Sales::Pages::Buyer2GenderSameAsSex < ::Form::Page
def questions
@questions ||= [
Form::Sales::Questions::GenderSameAsSex.new(nil, nil, self, person_index: 2, buyer: true),
Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 2),
Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 2, buyer: true),
]
end
end

2
app/models/form/sales/questions/age1.rb
Unescape View File

@ -22,5 +22,5 @@ class Form::Sales::Questions::Age1 < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 20 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 21 }.freeze
end

2
app/models/form/sales/questions/age2.rb
Unescape View File

@ -16,5 +16,5 @@ class Form::Sales::Questions::Age2 < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28, 2026 => 28 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28, 2026 => 30 }.freeze
end

2
app/models/form/sales/questions/armed_forces.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
"8" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 62, 2024 => 64, 2025 => 61, 2026 => 61 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 62, 2024 => 64, 2025 => 61, 2026 => 69 }.freeze
end

2
app/models/form/sales/questions/armed_forces_spouse.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
"7" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63, 2026 => 63 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63, 2026 => 71 }.freeze
end

2
app/models/form/sales/questions/buyer1_age_known.rb
Unescape View File

@ -31,5 +31,5 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question
"2" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 20 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 21 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
"16" => { "value" => "Other ethnic group" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 23 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 25 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
Unescape View File

@ -17,5 +17,5 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
"11" => { "value" => "Any other Asian or Asian British background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 23 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 25 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_background_black.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
"14" => { "value" => "Any other Black, African, Caribbean or Black British background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 23 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 25 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
Unescape View File

@ -16,5 +16,5 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
"7" => { "value" => "Any other Mixed or Multiple ethnic background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 23 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 25 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_background_white.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 23 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23, 2026 => 25 }.freeze
end

2
app/models/form/sales/questions/buyer1_ethnic_group.rb
Unescape View File

@ -18,5 +18,5 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
"17" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 24, 2025 => 22, 2026 => 22 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 24, 2025 => 22, 2026 => 24 }.freeze
end

2
app/models/form/sales/questions/buyer1_income.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Buyer1Income < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66, 2026 => 66 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66, 2026 => 74 }.freeze
end

2
app/models/form/sales/questions/buyer1_income_known.rb
Unescape View File

@ -24,5 +24,5 @@ class Form::Sales::Questions::Buyer1IncomeKnown < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66, 2026 => 66 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66, 2026 => 74 }.freeze
end

2
app/models/form/sales/questions/buyer1_live_in_property.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question
"2" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 28, 2025 => 26, 2026 => 26 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 28, 2025 => 26, 2026 => 28 }.freeze
end

2
app/models/form/sales/questions/buyer1_mortgage.rb
Unescape View File

@ -21,5 +21,5 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question
}
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 70, 2025 => 67, 2026 => 67 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 70, 2025 => 67, 2026 => 75 }.freeze
end

2
app/models/form/sales/questions/buyer1_nationality.rb
Unescape View File

@ -22,5 +22,5 @@ class Form::Sales::Questions::Buyer1Nationality < ::Form::Question
"13" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 26, 2025 => 24, 2026 => 24 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 26, 2025 => 24, 2026 => 26 }.freeze
end

2
app/models/form/sales/questions/buyer1_previous_tenure.rb
Unescape View File

@ -22,5 +22,5 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
}
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 56, 2024 => 58, 2025 => 56, 2026 => 56 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 56, 2024 => 58, 2025 => 56, 2026 => 64 }.freeze
end

2
app/models/form/sales/questions/buyer1_working_situation.rb
Unescape View File

@ -44,5 +44,5 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 27, 2025 => 25, 2026 => 25 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 27, 2025 => 25, 2026 => 27 }.freeze
end

2
app/models/form/sales/questions/buyer2_age_known.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28, 2026 => 28 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28, 2026 => 30 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundArab < ::Form::Question
"16" => { "value" => "Other ethnic group" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 35 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
Unescape View File

@ -17,5 +17,5 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundAsian < ::Form::Question
"11" => { "value" => "Any other Asian or Asian British background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 35 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_background_black.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundBlack < ::Form::Question
"14" => { "value" => "Any other Black, African, Caribbean or Black British background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 35 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
Unescape View File

@ -16,5 +16,5 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundMixed < ::Form::Question
"7" => { "value" => "Any other Mixed or Multiple ethnic background" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 35 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_background_white.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundWhite < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 35 }.freeze
end

2
app/models/form/sales/questions/buyer2_ethnic_group.rb
Unescape View File

@ -18,5 +18,5 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
"17" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 32, 2025 => 30, 2026 => 30 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 32, 2025 => 30, 2026 => 33 }.freeze
end

2
app/models/form/sales/questions/buyer2_income.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Buyer2Income < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68, 2026 => 68 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68, 2026 => 76 }.freeze
end

2
app/models/form/sales/questions/buyer2_income_known.rb
Unescape View File

@ -24,5 +24,5 @@ class Form::Sales::Questions::Buyer2IncomeKnown < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68, 2026 => 68 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68, 2026 => 76 }.freeze
end

2
app/models/form/sales/questions/buyer2_live_in_property.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
"2" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 36, 2025 => 34, 2026 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 36, 2025 => 34, 2026 => 37 }.freeze
end

2
app/models/form/sales/questions/buyer2_living_in.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Buyer2LivingIn < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62, 2025 => 59, 2026 => 59 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62, 2025 => 59, 2026 => 67 }.freeze
end

2
app/models/form/sales/questions/buyer2_mortgage.rb
Unescape View File

@ -21,5 +21,5 @@ class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question
}
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 72, 2025 => 69, 2026 => 69 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 72, 2025 => 69, 2026 => 77 }.freeze
end

2
app/models/form/sales/questions/buyer2_nationality.rb
Unescape View File

@ -22,5 +22,5 @@ class Form::Sales::Questions::Buyer2Nationality < ::Form::Question
"13" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 34, 2025 => 32, 2026 => 32 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 34, 2025 => 32 }.freeze
end

2
app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
Unescape View File

@ -33,5 +33,5 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 29, 2025 => 27, 2026 => 27 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 29, 2025 => 27, 2026 => 29 }.freeze
end

2
app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb
Unescape View File

@ -19,5 +19,5 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1YesNo < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 27, 2026 => 27 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 27, 2026 => 29 }.freeze
end

2
app/models/form/sales/questions/buyer2_working_situation.rb
Unescape View File

@ -51,5 +51,5 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 35, 2025 => 33, 2026 => 33 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 35, 2025 => 33, 2026 => 36 }.freeze
end

2
app/models/form/sales/questions/buyer_still_serving.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
"7" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 63, 2024 => 65, 2025 => 62, 2026 => 62 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 63, 2024 => 65, 2025 => 62, 2026 => 70 }.freeze
end

2
app/models/form/sales/questions/deposit_amount.rb
Unescape View File

@ -24,7 +24,7 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
2023 => { 1 => 95, 2 => 108, 3 => 116 },
2024 => { 1 => 96, 2 => 109, 3 => 116 },
2025 => { 1 => 85, 2 => 110 },
2026 => { "shared_ownership_initial_purchase" => 85, "discounted_ownership_scheme" => 110 },
2026 => { "shared_ownership_initial_purchase" => 93, "discounted_ownership_scheme" => 120 },
}.freeze
def top_guidance_partial

2
app/models/form/sales/questions/deposit_discount.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 97, 2025 => 86, 2026 => 86 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 97, 2025 => 86, 2026 => 94 }.freeze
end

2
app/models/form/sales/questions/discount.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::Discount < ::Form::Question
@top_guidance_partial = "financial_calculations_discounted_ownership"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 102, 2024 => 103, 2025 => 105, 2026 => 105 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 102, 2024 => 103, 2025 => 105, 2026 => 115 }.freeze
end

2
app/models/form/sales/questions/equity.rb
Unescape View File

@ -17,6 +17,6 @@ class Form::Sales::Questions::Equity < ::Form::Question
2023 => 89,
2024 => 90,
2025 => { "shared_ownership_initial_purchase" => 81, "shared_ownership_staircasing_transaction" => 98 },
2026 => { "shared_ownership_initial_purchase" => 81, "shared_ownership_staircasing_transaction" => 98 },
2026 => { "shared_ownership_initial_purchase" => 89, "shared_ownership_staircasing_transaction" => 106 },
}.freeze
end

2
app/models/form/sales/questions/extra_borrowing.rb
Unescape View File

@ -20,6 +20,6 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
2023 => { 1 => 94, 2 => 107, 3 => 115 },
2024 => { 1 => 95, 2 => 108, 3 => 115 },
2025 => { 2 => 109 },
2026 => { "discounted_ownership_scheme" => 109 },
2026 => { "discounted_ownership_scheme" => 119 },
}.freeze
end

2
app/models/form/sales/questions/fromprop.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::Fromprop < ::Form::Question
}
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 87, 2025 => 78, 2026 => 78 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 87, 2025 => 78, 2026 => 86 }.freeze
end

17
app/models/form/sales/questions/gender_description.rb
Unescape View File

@ -1,14 +1,25 @@
class Form::Sales::Questions::GenderDescription < ::Form::Question
def initialize(id, hsh, page, person_index:)
def initialize(id, hsh, page, person_index:, buyer: false)
super(id, hsh, page)
@id = "gender_description#{person_index}"
@type = "text"
@check_answers_card_number = person_index
@buyer = buyer
@person_index = person_index
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@question_number = question_number
end
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
BASE_QUESTION_NUMBERS = { 2026 => 32 }.freeze
BUYER_OVERRIDE_QUESTION_NUMBERS = { 2026 => { 1 => 23, 2 => 32 } }.freeze
def question_number
buyer_override_question_number = BUYER_OVERRIDE_QUESTION_NUMBERS.dig(form.start_date.year,@person_index)
return buyer_override_question_number if buyer_override_question_number.present? && @buyer
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (form.person_question_count * @person_index)
end
def derived?(log)
log.public_send("gender_same_as_sex#{@person_index}") != 2

2
app/models/form/sales/questions/gender_identity1.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
"R" => { "value" => "Prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 21, 2024 => 23, 2025 => 21, 2026 => 21 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 21, 2024 => 23, 2025 => 21, 2026 => 22 }.freeze
end

2
app/models/form/sales/questions/gender_identity2.rb
Unescape View File

@ -22,5 +22,5 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
"R" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 29 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 31 }.freeze
end

14
app/models/form/sales/questions/gender_same_as_sex.rb
Unescape View File

@ -9,10 +9,20 @@ class Form::Sales::Questions::GenderSameAsSex < ::Form::Question
@person_index = person_index
@buyer = buyer
@copy_key = "sales.household_characteristics.gender_same_as_sex#{person_index}.#{buyer ? 'buyer' : 'person'}" if person_index == 2
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@question_number = question_number
end
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
BASE_QUESTION_NUMBERS = { 2026 => 32 }.freeze
BUYER_OVERRIDE_QUESTION_NUMBERS = { 2026 => { 1 => 23, 2 => 32 } }.freeze
def question_number
buyer_override_question_number = BUYER_OVERRIDE_QUESTION_NUMBERS.dig(form.start_date.year,@person_index)
return buyer_override_question_number if buyer_override_question_number.present? && @buyer
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (form.person_question_count * @person_index)
end
def answer_options
{

2
app/models/form/sales/questions/grant.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::Grant < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 102, 2025 => 104, 2026 => 104 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 102, 2025 => 104, 2026 => 114 }.freeze
end

2
app/models/form/sales/questions/handover_date.rb
Unescape View File

@ -7,5 +7,5 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 84, 2025 => 76, 2026 => 76 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 84, 2025 => 76, 2026 => 84 }.freeze
end

2
app/models/form/sales/questions/has_leasehold_charges.rb
Unescape View File

@ -27,6 +27,6 @@ class Form::Sales::Questions::HasLeaseholdCharges < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_SECTION = {
2024 => { 1 => 99, 2 => 110, 3 => 117 },
2025 => { 2 => 111 },
2026 => 111,
2026 => 121,
}.freeze
end

2
app/models/form/sales/questions/has_management_fee.rb
Unescape View File

@ -23,5 +23,5 @@ class Form::Sales::Questions::HasManagementFee < ::Form::Question
"0" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 89, 2026 => 89 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 89, 2026 => 97 }.freeze
end

4
app/models/form/sales/questions/has_service_charge.rb
Unescape View File

@ -26,6 +26,6 @@ class Form::Sales::Questions::HasServiceCharge < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_SECTION = {
2025 => 88,
2026 => { "shared_ownership_initial_purchase" => 88, "shared_ownership_staircasing_transaction" => 88 },
}
2026 => { "shared_ownership_initial_purchase" => 96, "shared_ownership_staircasing_transaction" => 110 },
}.freeze
end

2
app/models/form/sales/questions/has_service_charges_changed.rb
Unescape View File

@ -23,5 +23,5 @@ class Form::Sales::Questions::HasServiceChargesChanged < ::Form::Question
"2" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 113 }.freeze
end

2
app/models/form/sales/questions/household_disability.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 65, 2024 => 67, 2025 => 64, 2026 => 64 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 65, 2024 => 67, 2025 => 64, 2026 => 72 }.freeze
end

2
app/models/form/sales/questions/household_wheelchair.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 68, 2025 => 65, 2026 => 65 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 68, 2025 => 65, 2026 => 73 }.freeze
end

2
app/models/form/sales/questions/housing_benefits.rb
Unescape View File

@ -17,5 +17,5 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
"4" => { "value" => "Don’t know " },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 73, 2025 => 70, 2026 => 70 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 73, 2025 => 70, 2026 => 78 }.freeze
end

2
app/models/form/sales/questions/la_nominations.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 85, 2025 => 85, 2026 => 85 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 85, 2025 => 85, 2026 => 93 }.freeze
end

2
app/models/form/sales/questions/leasehold_charges.rb
Unescape View File

@ -17,6 +17,6 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
2023 => { 1 => 98, 2 => 109, 3 => 117 },
2024 => { 1 => 99, 2 => 110, 3 => 117 },
2025 => { 2 => 111 },
2026 => { "discounted_ownership_scheme" => 111 },
2026 => { "discounted_ownership_scheme" => 121 },
}.freeze
end

2
app/models/form/sales/questions/living_before_purchase.rb
Unescape View File

@ -28,6 +28,6 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question
2023 => { 1 => 75, 2 => 99 },
2024 => { 1 => 77, 2 => 100 },
2025 => { 1 => 75, 2 => 102 },
2026 => { "shared_ownership_initial_purchase" => 75, "discounted_ownership_scheme" => 102 },
2026 => { "shared_ownership_initial_purchase" => 83, "discounted_ownership_scheme" => 114 },
}.freeze
end

2
app/models/form/sales/questions/living_before_purchase_years.rb
Unescape View File

@ -20,6 +20,6 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question
2023 => { 1 => 75, 2 => 99 },
2024 => { 1 => 77, 2 => 100 },
2025 => { 1 => 75, 2 => 102 },
2026 => { "shared_ownership_initial_purchase" => 75, "discounted_ownership_scheme" => 102 },
2026 => { "shared_ownership_initial_purchase" => 83, "discounted_ownership_scheme" => 114 },
}.freeze
end

2
app/models/form/sales/questions/management_fee.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::ManagementFee < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 89, 2026 => 89 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 89, 2026 => 97 }.freeze
end

2
app/models/form/sales/questions/monthly_rent.rb
Unescape View File

@ -11,5 +11,5 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 98, 2025 => 87, 2026 => 87 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 98, 2025 => 87, 2026 => 95 }.freeze
end

2
app/models/form/sales/questions/monthly_rent_after_staircasing.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::MonthlyRentAfterStaircasing < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 101, 2026 => 101 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 101, 2026 => 109 }.freeze
end

2
app/models/form/sales/questions/monthly_rent_before_staircasing.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::MonthlyRentBeforeStaircasing < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 100, 2026 => 100 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 100, 2026 => 108 }.freeze
end

2
app/models/form/sales/questions/mortgage_amount.rb
Unescape View File

@ -17,7 +17,7 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question
2023 => { 1 => 91, 2 => 104, 3 => 112 },
2024 => { 1 => 92, 2 => 105, 3 => 113 },
2025 => { 1 => 83, 2 => 107 },
2026 => { "shared_ownership_initial_purchase" => 83, "discounted_ownership_scheme" => 107 },
2026 => { "shared_ownership_initial_purchase" => 91, "discounted_ownership_scheme" => 117 },
}.freeze
def derived?(log)

2
app/models/form/sales/questions/mortgage_length.rb
Unescape View File

@ -19,6 +19,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
2023 => { 1 => 93, 2 => 106, 3 => 114 },
2024 => { 1 => 94, 2 => 107, 3 => 114 },
2025 => { 1 => 84, 2 => 108 },
2026 => { "shared_ownership_initial_purchase" => 84, "discounted_ownership_scheme" => 108 },
2026 => { "shared_ownership_initial_purchase" => 92, "discounted_ownership_scheme" => 118 },
}.freeze
end

2
app/models/form/sales/questions/mortgage_length_known.rb
Unescape View File

@ -16,6 +16,6 @@ class Form::Sales::Questions::MortgageLengthKnown < ::Form::Question
ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR_AND_SECTION = {
2026 => { "shared_ownership_initial_purchase" => 84, "discounted_ownership_scheme" => 108 },
2026 => { "shared_ownership_initial_purchase" => 92, "discounted_ownership_scheme" => 118 },
}.freeze
end

2
app/models/form/sales/questions/mortgageused.rb
Unescape View File

@ -34,7 +34,7 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
2023 => { 1 => 90, 2 => 103, 3 => 111 },
2024 => { 1 => 91, 2 => 104, 3 => 112 },
2025 => { "shared_ownership_initial_purchase" => 82, "shared_ownership_staircasing_transaction" => 99, "discounted_ownership_scheme" => 106 },
2026 => { "shared_ownership_initial_purchase" => 82, "shared_ownership_staircasing_transaction" => 99, "discounted_ownership_scheme" => 106 },
2026 => { "shared_ownership_initial_purchase" => 90, "shared_ownership_staircasing_transaction" => 107, "discounted_ownership_scheme" => 116 },
}.freeze
def top_guidance_partial

2
app/models/form/sales/questions/nationality_all.rb
Unescape View File

@ -20,7 +20,7 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
2023 => { 1 => 24, 2 => 32 },
2024 => { 1 => 26, 2 => 34 },
2025 => { 1 => 24, 2 => 32 },
2026 => { 1 => 24, 2 => 32 },
2026 => { 1 => 26, 2 => 35 },
}.freeze
def label_from_value(value)

2
app/models/form/sales/questions/nationality_all_group.rb
Unescape View File

@ -20,6 +20,6 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
2023 => { 1 => 24, 2 => 32 },
2024 => { 1 => 26, 2 => 34 },
2025 => { 1 => 24, 2 => 32 },
2026 => { 1 => 24, 2 => 32 },
2026 => { 1 => 26, 2 => 35 },
}.freeze
end

2
app/models/form/sales/questions/new_service_charges.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::NewServiceCharges < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 113 }.freeze
end

2
app/models/form/sales/questions/number_of_others_in_property.rb
Unescape View File

@ -11,5 +11,5 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 37, 2025 => 35, 2026 => 35 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 37, 2025 => 35, 2026 => 38 }.freeze
end

4
app/models/form/sales/questions/person_age.rb
Unescape View File

@ -16,10 +16,10 @@ class Form::Sales::Questions::PersonAge < ::Form::Question
@question_number = question_number
end
BASE_QUESTION_NUMBERS = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 29 }.freeze
BASE_QUESTION_NUMBERS = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 30 }.freeze
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
end

4
app/models/form/sales/questions/person_age_known.rb
Unescape View File

@ -27,10 +27,10 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
"1" => { "value" => "No" },
}.freeze
BASE_QUESTION_NUMBERS = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 29 }.freeze
BASE_QUESTION_NUMBERS = { 2023 => 29, 2024 => 31, 2025 => 29, 2026 => 30 }.freeze
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
end

4
app/models/form/sales/questions/person_gender_identity.rb
Unescape View File

@ -22,10 +22,10 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
"R" => { "value" => "Person prefers not to say" },
}.freeze
BASE_QUESTION_NUMBERS = { 2023 => 30, 2024 => 32, 2025 => 30, 2026 => 30 }.freeze
BASE_QUESTION_NUMBERS = { 2023 => 30, 2024 => 32, 2025 => 30 }.freeze
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
end

2
app/models/form/sales/questions/person_relationship_to_buyer_1.rb
Unescape View File

@ -41,6 +41,6 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question
30
end
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
end

4
app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb
Unescape View File

@ -22,8 +22,8 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1YesNo < ::Form::Question
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
BASE_QUESTION_NUMBERS = { 2025 => 28, 2026 => 28 }.freeze
BASE_QUESTION_NUMBERS = { 2025 => 28, 2026 => 29 }.freeze
end

10
app/models/form/sales/questions/person_sex_registered_at_birth.rb
Unescape View File

@ -5,7 +5,8 @@ class Form::Sales::Questions::PersonSexRegisteredAtBirth < ::Form::Question
@copy_key = "sales.household_characteristics.sexrab2.person" if person_index == 2
@check_answers_card_number = person_index
@answer_options = ANSWER_OPTIONS
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@person_index = person_index
@question_number = question_number
end
ANSWER_OPTIONS = {
@ -15,7 +16,12 @@ class Form::Sales::Questions::PersonSexRegisteredAtBirth < ::Form::Question
"R" => { "value" => "Person prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
BASE_QUESTION_NUMBERS = { 2023 => 30, 2024 => 32, 2025 => 31 }.freeze
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (form.person_question_count * @person_index)
end
def label_from_value(value, _log = nil, _user = nil)
return unless value

4
app/models/form/sales/questions/person_working_situation.rb
Unescape View File

@ -63,10 +63,10 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
end
end
BASE_QUESTION_NUMBERS = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 31 }.freeze
BASE_QUESTION_NUMBERS = { 2023 => 31, 2024 => 33, 2025 => 31, 2026 => 33 }.freeze
def question_number
base_question_number = BASE_QUESTION_NUMBERS[form.start_date.year] || BASE_QUESTION_NUMBERS[BASE_QUESTION_NUMBERS.keys.max]
base_question_number + (4 * @person_index)
base_question_number + (form.person_question_count * @person_index)
end
end

2
app/models/form/sales/questions/previous_bedrooms.rb
Unescape View File

@ -10,5 +10,5 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 86, 2025 => 77, 2026 => 77 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 86, 2025 => 77, 2026 => 85 }.freeze
end

2
app/models/form/sales/questions/previous_la_known.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::PreviousLaKnown < ::Form::Question
"0" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58, 2026 => 58 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58, 2026 => 66 }.freeze
end

2
app/models/form/sales/questions/previous_postcode.rb
Unescape View File

@ -20,5 +20,5 @@ class Form::Sales::Questions::PreviousPostcode < ::Form::Question
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57, 2026 => 57 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57, 2026 => 65 }.freeze
end

2
app/models/form/sales/questions/previous_postcode_known.rb
Unescape View File

@ -27,5 +27,5 @@ class Form::Sales::Questions::PreviousPostcodeKnown < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57, 2026 => 57 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57, 2026 => 65 }.freeze
end

2
app/models/form/sales/questions/previous_tenure.rb
Unescape View File

@ -17,5 +17,5 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
"10" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 88, 2025 => 79, 2026 => 79 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 88, 2025 => 79, 2026 => 87 }.freeze
end

2
app/models/form/sales/questions/previous_tenure_buyer2.rb
Unescape View File

@ -20,5 +20,5 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
"0" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63, 2025 => 60, 2026 => 60 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63, 2025 => 60, 2026 => 68 }.freeze
end

2
app/models/form/sales/questions/prevloc.rb
Unescape View File

@ -18,5 +18,5 @@ class Form::Sales::Questions::Prevloc < ::Form::Question
{ "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).map { |la| [la.code, la.name] }.to_h)
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58, 2026 => 58 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58, 2026 => 66 }.freeze
end

2
app/models/form/sales/questions/prevown.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::Prevown < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 75, 2025 => 72, 2026 => 72 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 75, 2025 => 72, 2026 => 80 }.freeze
end

2
app/models/form/sales/questions/prevshared.rb
Unescape View File

@ -14,5 +14,5 @@ class Form::Sales::Questions::Prevshared < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 76, 2025 => 73, 2026 => 73 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 76, 2025 => 73, 2026 => 81 }.freeze
end

2
app/models/form/sales/questions/property_building_type.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question
"2" => { "value" => "Converted from previous residential or non-residential property" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 20, 2025 => 18, 2026 => 18 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 20, 2025 => 18, 2026 => 19 }.freeze
end

2
app/models/form/sales/questions/property_number_of_bedrooms.rb
Unescape View File

@ -11,5 +11,5 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 18, 2025 => 17, 2026 => 17 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 18, 2025 => 17, 2026 => 18 }.freeze
end

2
app/models/form/sales/questions/property_wheelchair_accessible.rb
Unescape View File

@ -15,5 +15,5 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 21, 2025 => 19, 2026 => 19 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 21, 2025 => 19, 2026 => 20 }.freeze
end

2
app/models/form/sales/questions/purchase_price.rb
Unescape View File

@ -17,7 +17,7 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question
2023 => { 2 => 100, 3 => 110 },
2024 => { 2 => 101, 3 => 111 },
2025 => { 2 => 103 },
2026 => { "discounted_ownership_scheme" => 103 },
2026 => { "discounted_ownership_scheme" => 113 },
}.freeze
def copy_key

2
app/models/form/sales/questions/resale.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::Resale < ::Form::Question
"2" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 82, 2025 => 74, 2026 => 74 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 82, 2025 => 74, 2026 => 82 }.freeze
end

2
app/models/form/sales/questions/savings.rb
Unescape View File

@ -12,5 +12,5 @@ class Form::Sales::Questions::Savings < ::Form::Question
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71, 2026 => 71 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71, 2026 => 79 }.freeze
end

2
app/models/form/sales/questions/savings_nk.rb
Unescape View File

@ -23,5 +23,5 @@ class Form::Sales::Questions::SavingsNk < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71, 2026 => 71 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71, 2026 => 79 }.freeze
end

4
app/models/form/sales/questions/service_charge.rb
Unescape View File

@ -16,6 +16,6 @@ class Form::Sales::Questions::ServiceCharge < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_SECTION = {
2025 => 88,
2026 => { "shared_ownership_initial_purchase" => 88, "shared_ownership_staircasing_transaction" => 88 },
}
2026 => { "shared_ownership_initial_purchase" => 96, "shared_ownership_staircasing_transaction" => 110 },
}.freeze
end

2
app/models/form/sales/questions/sex_registered_at_birth1.rb
Unescape View File

@ -15,7 +15,7 @@ class Form::Sales::Questions::SexRegisteredAtBirth1 < ::Form::Question
"R" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 22 }.freeze
def label_from_value(value, _log = nil, _user = nil)
return unless value

2
app/models/form/sales/questions/sex_registered_at_birth2.rb
Unescape View File

@ -16,7 +16,7 @@ class Form::Sales::Questions::SexRegisteredAtBirth2 < ::Form::Question
"R" => { "value" => "Buyer prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 0 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2026 => 31 }.freeze
def label_from_value(value, _log = nil, _user = nil)
return unless value

2
app/models/form/sales/questions/staircase_bought.rb
Unescape View File

@ -13,5 +13,5 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question
@top_guidance_partial = "financial_calculations_shared_ownership"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 79, 2025 => 90, 2026 => 90 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 79, 2025 => 90, 2026 => 98 }.freeze
end

2
app/models/form/sales/questions/staircase_count.rb
Unescape View File

@ -11,5 +11,5 @@ class Form::Sales::Questions::StaircaseCount < ::Form::Question
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 94, 2026 => 94 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 94, 2026 => 102 }.freeze
end

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save