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-3806 Update question numbers for sales (#2936) 

* Update question numbers

* Update tests

* Update constant name

* Fix proplen number for 2024
update-status-methods
kosiakkatrina 1 week ago committed by GitHub
parent
a57d79fd1d
commit
ac1d2ce8d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
116 changed files with 156 additions and 160 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/address.rb
  2. 2
      app/models/form/sales/questions/address_line1.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_interview.rb
  38. 2
      app/models/form/sales/questions/buyer_still_serving.rb
  39. 2
      app/models/form/sales/questions/county.rb
  40. 1
      app/models/form/sales/questions/deposit_amount.rb
  41. 2
      app/models/form/sales/questions/deposit_discount.rb
  42. 2
      app/models/form/sales/questions/discount.rb
  43. 2
      app/models/form/sales/questions/discounted_ownership_type.rb
  44. 6
      app/models/form/sales/questions/equity.rb
  45. 1
      app/models/form/sales/questions/extra_borrowing.rb
  46. 2
      app/models/form/sales/questions/fromprop.rb
  47. 2
      app/models/form/sales/questions/gender_identity1.rb
  48. 2
      app/models/form/sales/questions/gender_identity2.rb
  49. 2
      app/models/form/sales/questions/grant.rb
  50. 2
      app/models/form/sales/questions/handover_date.rb
  51. 16
      app/models/form/sales/questions/has_leasehold_charges.rb
  52. 3
      app/models/form/sales/questions/has_management_fee.rb
  53. 2
      app/models/form/sales/questions/household_disability.rb
  54. 2
      app/models/form/sales/questions/household_wheelchair.rb
  55. 2
      app/models/form/sales/questions/housing_benefits.rb
  56. 2
      app/models/form/sales/questions/joint_purchase.rb
  57. 1
      app/models/form/sales/questions/leasehold_charges.rb
  58. 1
      app/models/form/sales/questions/living_before_purchase.rb
  59. 3
      app/models/form/sales/questions/living_before_purchase_years.rb
  60. 3
      app/models/form/sales/questions/management_fee.rb
  61. 2
      app/models/form/sales/questions/managing_organisation.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. 1
      app/models/form/sales/questions/mortgage_amount.rb
  66. 1
      app/models/form/sales/questions/mortgage_length.rb
  67. 13
      app/models/form/sales/questions/mortgageused.rb
  68. 14
      app/models/form/sales/questions/nationality_all.rb
  69. 14
      app/models/form/sales/questions/nationality_all_group.rb
  70. 2
      app/models/form/sales/questions/number_joint_buyers.rb
  71. 2
      app/models/form/sales/questions/number_of_others_in_property.rb
  72. 2
      app/models/form/sales/questions/owning_organisation_id.rb
  73. 8
      app/models/form/sales/questions/person_age.rb
  74. 8
      app/models/form/sales/questions/person_age_known.rb
  75. 8
      app/models/form/sales/questions/person_gender_identity.rb
  76. 4
      app/models/form/sales/questions/person_relationship_to_buyer_1_yes_no.rb
  77. 8
      app/models/form/sales/questions/person_working_situation.rb
  78. 2
      app/models/form/sales/questions/postcode_for_full_address.rb
  79. 2
      app/models/form/sales/questions/previous_bedrooms.rb
  80. 2
      app/models/form/sales/questions/previous_la_known.rb
  81. 2
      app/models/form/sales/questions/previous_postcode.rb
  82. 2
      app/models/form/sales/questions/previous_postcode_known.rb
  83. 2
      app/models/form/sales/questions/previous_tenure.rb
  84. 2
      app/models/form/sales/questions/previous_tenure_buyer2.rb
  85. 2
      app/models/form/sales/questions/prevloc.rb
  86. 2
      app/models/form/sales/questions/prevown.rb
  87. 2
      app/models/form/sales/questions/prevshared.rb
  88. 2
      app/models/form/sales/questions/privacy_notice.rb
  89. 2
      app/models/form/sales/questions/property_building_type.rb
  90. 2
      app/models/form/sales/questions/property_local_authority.rb
  91. 2
      app/models/form/sales/questions/property_number_of_bedrooms.rb
  92. 2
      app/models/form/sales/questions/property_unit_type.rb
  93. 2
      app/models/form/sales/questions/property_wheelchair_accessible.rb
  94. 1
      app/models/form/sales/questions/purchase_price.rb
  95. 2
      app/models/form/sales/questions/resale.rb
  96. 2
      app/models/form/sales/questions/sale_date.rb
  97. 2
      app/models/form/sales/questions/savings.rb
  98. 2
      app/models/form/sales/questions/savings_nk.rb
  99. 2
      app/models/form/sales/questions/staircase.rb
  100. 2
      app/models/form/sales/questions/staircase_bought.rb
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -20,5 +20,5 @@ class Form::Sales::Pages::Address < ::Form::Page
]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 14 }.freeze
end

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

@ -18,5 +18,5 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question
].select(&:present?).join("\n")
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 14 }.freeze
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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28 }.freeze
end

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

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

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

@ -14,5 +14,5 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
"7" => { "value" => "Don't know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 25, 2025 => 23 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 24, 2025 => 22 }.freeze
end

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

@ -13,5 +13,5 @@ class Form::Sales::Questions::Buyer1Income < ::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 => 67, 2024 => 69 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 69, 2025 => 66 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 28, 2025 => 26 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 70, 2025 => 67 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 26, 2025 => 24 }.freeze
end

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

@ -21,5 +21,5 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
}
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 56, 2024 => 58 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 56, 2024 => 58, 2025 => 56 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 27, 2025 => 25 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 33, 2025 => 31 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 32, 2025 => 30 }.freeze
end

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

@ -13,5 +13,5 @@ class Form::Sales::Questions::Buyer2Income < ::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 => 69, 2024 => 71 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 71, 2025 => 68 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 36, 2025 => 34 }.freeze
end

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

@ -13,5 +13,5 @@ class Form::Sales::Questions::Buyer2LivingIn < ::Form::Question
"3" => { "value" => "Don't know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62, 2025 => 59 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 72, 2025 => 69 }.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 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 29, 2025 => 27 }.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 => 29 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 27 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 35, 2025 => 33 }.freeze
end

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

@ -13,5 +13,5 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 18, 2024 => 13 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 18, 2024 => 13, 2025 => 11 }.freeze
end

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

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

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

@ -10,5 +10,5 @@ class Form::Sales::Questions::County < ::Form::Question
@hide_question_number_on_page = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 14 }.freeze
end

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

@ -21,6 +21,7 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 95, 2 => 108, 3 => 116 },
2024 => { 1 => 96, 2 => 109, 3 => 116 },
2025 => { 1 => 85, 2 => 110 },
}.freeze
def top_guidance_partial

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

@ -12,5 +12,5 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
@top_guidance_partial = "financial_calculations_shared_ownership"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 97 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 97, 2025 => 86 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 102, 2024 => 103, 2025 => 105 }.freeze
end

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

@ -23,5 +23,5 @@ class Form::Sales::Questions::DiscountedOwnershipType < ::Form::Question
"discounted_ownership_type_definitions" if form.start_date.year >= 2023
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 5, 2024 => 7 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 5, 2024 => 7, 2025 => 8 }.freeze
end

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

@ -9,9 +9,11 @@ class Form::Sales::Questions::Equity < ::Form::Question
@step = 0.1
@width = 5
@suffix = "%"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@question_number = question_number_from_year[form.start_date.year] || question_number_from_year[question_number_from_year.keys.max]
@top_guidance_partial = "financial_calculations_shared_ownership"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 90 }.freeze
def question_number_from_year
{ 2023 => 89, 2024 => 90, 2025 => subsection.id == "shared_ownership_staircasing_transaction" ? 98 : 81 }
end
end

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

@ -18,5 +18,6 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 94, 2 => 107, 3 => 115 },
2024 => { 1 => 95, 2 => 108, 3 => 115 },
2025 => { 2 => 109 },
}.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 87, 2025 => 78 }.freeze
end

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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 21, 2024 => 23, 2025 => 21 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 31, 2025 => 29 }.freeze
end

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

@ -12,5 +12,5 @@ class Form::Sales::Questions::Grant < ::Form::Question
@top_guidance_partial = "financial_calculations_discounted_ownership"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 102 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 102, 2025 => 104 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 84, 2025 => 76 }.freeze
end

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

@ -16,7 +16,7 @@ class Form::Sales::Questions::HasLeaseholdCharges < ::Form::Question
],
}
@ownershipsch = ownershipsch
@question_number = question_number
@question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch]
end
ANSWER_OPTIONS = {
@ -24,14 +24,8 @@ class Form::Sales::Questions::HasLeaseholdCharges < ::Form::Question
"0" => { "value" => "No" },
}.freeze
def question_number
case @ownershipsch
when 1
99
when 2
110
when 3
117
end
end
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2024 => { 1 => 99, 2 => 110, 3 => 117 },
2025 => { 1 => 88, 2 => 111 },
}.freeze
end

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

@ -15,10 +15,13 @@ class Form::Sales::Questions::HasManagementFee < ::Form::Question
},
],
}
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"0" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 89 }.freeze
end

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

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

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

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

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

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

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

@ -12,5 +12,5 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question
"2" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 11 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 11, 2025 => 9 }.freeze
end

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

@ -15,5 +15,6 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 98, 2 => 109, 3 => 117 },
2024 => { 1 => 99, 2 => 110, 3 => 117 },
2025 => { 1 => 88, 2 => 111 },
}.freeze
end

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

@ -27,5 +27,6 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 75, 2 => 99 },
2024 => { 1 => 77, 2 => 100 },
2025 => { 1 => 75, 2 => 102 },
}.freeze
end

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

@ -18,6 +18,7 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 75, 2 => 99 },
2024 => { 1 => 77, 2 => 101 },
2024 => { 1 => 77, 2 => 100 },
2025 => { 1 => 75, 2 => 102 },
}.freeze
end

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

@ -8,5 +8,8 @@ class Form::Sales::Questions::ManagementFee < ::Form::Question
@step = 0.01
@width = 5
@prefix = "£"
@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 => 89 }.freeze
end

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

@ -72,5 +72,5 @@ private
true
end
QUESTION_NUMBER_FROM_YEAR = { 2024 => 2 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2024 => 2, 2025 => 3 }.freeze
end

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

@ -10,5 +10,5 @@ class Form::Sales::Questions::MonthlyRent < ::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 => 97, 2024 => 98 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 98, 2025 => 87 }.freeze
end

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

@ -11,5 +11,5 @@ class Form::Sales::Questions::MonthlyRentAfterStaircasing < ::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 => 99 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 101 }.freeze
end

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

@ -11,5 +11,5 @@ class Form::Sales::Questions::MonthlyRentBeforeStaircasing < ::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 => 98 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 100 }.freeze
end

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

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

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

@ -18,5 +18,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 93, 2 => 106, 3 => 114 },
2024 => { 1 => 94, 2 => 107, 3 => 114 },
2025 => { 1 => 84, 2 => 108 },
}.freeze
end

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

@ -5,7 +5,7 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
@type = "radio"
@answer_options = ANSWER_OPTIONS
@ownershipsch = ownershipsch
@question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch]
@question_number = question_number_from_year_and_ownership.fetch(form.start_date.year, question_number_from_year_and_ownership.max_by { |k, _v| k }.last)[ownershipsch]
@top_guidance_partial = top_guidance_partial
end
@ -29,10 +29,13 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
ANSWER_OPTIONS.reject { |key, _v| key == "3" }
end
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 1 => 90, 2 => 103, 3 => 111 },
2024 => { 1 => 91, 2 => 104, 3 => 112 },
}.freeze
def question_number_from_year_and_ownership
{
2023 => { 1 => 90, 2 => 103, 3 => 111 },
2024 => { 1 => 91, 2 => 104, 3 => 112 },
2025 => { 1 => subsection.id == "shared_ownership_staircasing_transaction" ? 99 : 82, 2 => 106 },
}
end
def top_guidance_partial
return "financial_calculations_shared_ownership" if @ownershipsch == 1

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

@ -5,20 +5,18 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
@answer_options = GlobalConstants::COUNTRIES_ANSWER_OPTIONS
@check_answers_card_number = buyer_index
@buyer_index = buyer_index
@question_number = question_number
@question_number = QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX.max_by { |k, _v| k }.last)[buyer_index]
end
def answer_label(log, _current_user = nil)
answer_options[log.send(id).to_s]["name"]
end
def question_number
if form.start_date.year == 2023
@buyer_index == 1 ? 24 : 32
else
@buyer_index == 1 ? 26 : 34
end
end
QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX = {
2023 => { 1 => 24, 2 => 32 },
2024 => { 1 => 26, 2 => 34 },
2025 => { 1 => 24, 2 => 32 },
}.freeze
def label_from_value(value)
return unless value

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

@ -7,7 +7,7 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
@conditional_for = buyer_index == 1 ? { "nationality_all" => [12] } : { "nationality_all_buyer2" => [12] }
@hidden_in_check_answers = { "depends_on" => [{ id => 12 }] }
@buyer_index = buyer_index
@question_number = question_number
@question_number = QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX.max_by { |k, _v| k }.last)[buyer_index]
end
ANSWER_OPTIONS = {
@ -16,11 +16,9 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
"0" => { "value" => "Buyer prefers not to say" },
}.freeze
def question_number
if form.start_date.year == 2023
@buyer_index == 1 ? 24 : 32
else
@buyer_index == 1 ? 26 : 34
end
end
QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX = {
2023 => { 1 => 24, 2 => 32 },
2024 => { 1 => 26, 2 => 34 },
2025 => { 1 => 24, 2 => 32 },
}.freeze
end

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

@ -13,5 +13,5 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 12 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 12, 2025 => 10 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 37, 2025 => 35 }.freeze
end

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

@ -93,5 +93,5 @@ private
"#{name} (inactive as of #{merge_date.to_fs(:govuk_date)})"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => nil, 2024 => 1 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => nil, 2024 => 1, 2025 => 2 }.freeze
end

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

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

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

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

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

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

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

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

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

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

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

@ -22,5 +22,5 @@ class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question
@hide_question_number_on_page = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 14 }.freeze
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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 86, 2025 => 77 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 57, 2024 => 59, 2025 => 57 }.freeze
end

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

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

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

@ -19,5 +19,5 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
"0" => { "value" => "Don't know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63, 2025 => 60 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 58, 2024 => 60, 2025 => 58 }.freeze
end

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

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

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

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

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

@ -32,5 +32,5 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
@joint_purchase ? "privacy_notice_buyer_joint_purchase" : "privacy_notice_buyer"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 19, 2024 => 14 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 19, 2024 => 14, 2025 => 12 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 20, 2025 => 18 }.freeze
end

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

@ -15,5 +15,5 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question
log.saledate && log.saledate.year >= 2023 && log.is_la_inferred?
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17, 2025 => 15 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 18, 2025 => 17 }.freeze
end

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

@ -16,5 +16,5 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question
"9" => { "value" => "Other" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 19 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 19, 2025 => 16 }.freeze
end

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

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

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

@ -15,6 +15,7 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
2023 => { 2 => 100, 3 => 110 },
2024 => { 2 => 101, 3 => 111 },
2025 => { 2 => 103 },
}.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 82, 2025 => 74 }.freeze
end

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

@ -6,5 +6,5 @@ class Form::Sales::Questions::SaleDate < ::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 => 1, 2024 => 3 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 3, 2025 => 1 }.freeze
end

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

@ -11,5 +11,5 @@ class Form::Sales::Questions::Savings < ::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 => 72, 2024 => 74 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71 }.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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 74, 2025 => 71 }.freeze
end

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

@ -22,5 +22,5 @@ class Form::Sales::Questions::Staircase < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 76, 2024 => 78 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 76, 2024 => 78, 2025 => 7 }.freeze
end

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 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 79, 2025 => 90 }.freeze
end

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

Write Preview
Loading…
Cancel
Save