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-4202: No longer assume question numbers for years 

the default logic is already a little confusing with the .max call, and we renumber most questions anyway between years

to simply this logic and make it less surprising, specify each year

all files should now specify 2023, 2024, 2025, 2026
pull/3169/head
Samuel Young 4 months ago
parent
99e4d12053
commit
b80dd94d2f
122 changed files with 244 additions and 244 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. 4
      app/models/form/lettings/questions/address_line1.rb
  2. 4
      app/models/form/lettings/questions/address_search.rb
  3. 4
      app/models/form/lettings/questions/age1.rb
  4. 4
      app/models/form/lettings/questions/age1_known.rb
  5. 4
      app/models/form/lettings/questions/armedforces.rb
  6. 4
      app/models/form/lettings/questions/beds.rb
  7. 4
      app/models/form/lettings/questions/benefits.rb
  8. 4
      app/models/form/lettings/questions/brent_4_weekly.rb
  9. 4
      app/models/form/lettings/questions/brent_bi_weekly.rb
  10. 4
      app/models/form/lettings/questions/brent_monthly.rb
  11. 4
      app/models/form/lettings/questions/brent_weekly.rb
  12. 4
      app/models/form/lettings/questions/builtype.rb
  13. 4
      app/models/form/lettings/questions/chcharge_4_weekly.rb
  14. 4
      app/models/form/lettings/questions/chcharge_bi_weekly.rb
  15. 4
      app/models/form/lettings/questions/chcharge_monthly.rb
  16. 4
      app/models/form/lettings/questions/chcharge_weekly.rb
  17. 4
      app/models/form/lettings/questions/condition_effects.rb
  18. 4
      app/models/form/lettings/questions/county.rb
  19. 4
      app/models/form/lettings/questions/declaration.rb
  20. 4
      app/models/form/lettings/questions/earnings.rb
  21. 4
      app/models/form/lettings/questions/ethnic_arab.rb
  22. 4
      app/models/form/lettings/questions/ethnic_asian.rb
  23. 4
      app/models/form/lettings/questions/ethnic_black.rb
  24. 4
      app/models/form/lettings/questions/ethnic_group.rb
  25. 4
      app/models/form/lettings/questions/ethnic_mixed.rb
  26. 4
      app/models/form/lettings/questions/ethnic_white.rb
  27. 4
      app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
  28. 4
      app/models/form/lettings/questions/gender_identity1.rb
  29. 4
      app/models/form/lettings/questions/hb.rb
  30. 4
      app/models/form/lettings/questions/hbrentshortfall.rb
  31. 4
      app/models/form/lettings/questions/hhmemb.rb
  32. 4
      app/models/form/lettings/questions/homeless.rb
  33. 4
      app/models/form/lettings/questions/household_charge.rb
  34. 4
      app/models/form/lettings/questions/housingneeds.rb
  35. 4
      app/models/form/lettings/questions/housingneeds_other.rb
  36. 4
      app/models/form/lettings/questions/housingneeds_type.rb
  37. 4
      app/models/form/lettings/questions/illness.rb
  38. 4
      app/models/form/lettings/questions/incfreq.rb
  39. 4
      app/models/form/lettings/questions/irproduct_other.rb
  40. 4
      app/models/form/lettings/questions/is_carehome.rb
  41. 4
      app/models/form/lettings/questions/joint.rb
  42. 4
      app/models/form/lettings/questions/la.rb
  43. 4
      app/models/form/lettings/questions/layear.rb
  44. 4
      app/models/form/lettings/questions/leftreg.rb
  45. 4
      app/models/form/lettings/questions/letting_allocation.rb
  46. 4
      app/models/form/lettings/questions/location_id.rb
  47. 4
      app/models/form/lettings/questions/location_id_search.rb
  48. 4
      app/models/form/lettings/questions/majorrepairs.rb
  49. 4
      app/models/form/lettings/questions/managing_organisation.rb
  50. 4
      app/models/form/lettings/questions/mrcdate.rb
  51. 4
      app/models/form/lettings/questions/nationality.rb
  52. 4
      app/models/form/lettings/questions/nationality_all.rb
  53. 4
      app/models/form/lettings/questions/nationality_all_group.rb
  54. 4
      app/models/form/lettings/questions/needs_type.rb
  55. 4
      app/models/form/lettings/questions/net_income_known.rb
  56. 4
      app/models/form/lettings/questions/offered.rb
  57. 4
      app/models/form/lettings/questions/period.rb
  58. 4
      app/models/form/lettings/questions/postcode_for_full_address.rb
  59. 4
      app/models/form/lettings/questions/ppcodenk.rb
  60. 4
      app/models/form/lettings/questions/ppostcode_full.rb
  61. 4
      app/models/form/lettings/questions/preg_occ.rb
  62. 4
      app/models/form/lettings/questions/previous_la_known.rb
  63. 4
      app/models/form/lettings/questions/previous_let_type.rb
  64. 4
      app/models/form/lettings/questions/previous_tenure.rb
  65. 4
      app/models/form/lettings/questions/previous_tenure_renewal.rb
  66. 4
      app/models/form/lettings/questions/prevloc.rb
  67. 4
      app/models/form/lettings/questions/property_reference.rb
  68. 4
      app/models/form/lettings/questions/pscharge_4_weekly.rb
  69. 4
      app/models/form/lettings/questions/pscharge_bi_weekly.rb
  70. 4
      app/models/form/lettings/questions/pscharge_monthly.rb
  71. 4
      app/models/form/lettings/questions/pscharge_weekly.rb
  72. 4
      app/models/form/lettings/questions/reason.rb
  73. 4
      app/models/form/lettings/questions/reason_renewal.rb
  74. 4
      app/models/form/lettings/questions/reasonable_preference_reason.rb
  75. 4
      app/models/form/lettings/questions/reasonother.rb
  76. 4
      app/models/form/lettings/questions/reasonpref.rb
  77. 4
      app/models/form/lettings/questions/referral_direct.rb
  78. 4
      app/models/form/lettings/questions/referral_general_needs.rb
  79. 4
      app/models/form/lettings/questions/referral_general_needs_prp.rb
  80. 4
      app/models/form/lettings/questions/referral_hsc.rb
  81. 4
      app/models/form/lettings/questions/referral_justice.rb
  82. 4
      app/models/form/lettings/questions/referral_la.rb
  83. 4
      app/models/form/lettings/questions/referral_prp.rb
  84. 4
      app/models/form/lettings/questions/referral_supported_housing.rb
  85. 4
      app/models/form/lettings/questions/referral_supported_housing_prp.rb
  86. 4
      app/models/form/lettings/questions/referral_type.rb
  87. 4
      app/models/form/lettings/questions/renewal.rb
  88. 4
      app/models/form/lettings/questions/rent_type.rb
  89. 4
      app/models/form/lettings/questions/reservist.rb
  90. 4
      app/models/form/lettings/questions/rsnvac.rb
  91. 4
      app/models/form/lettings/questions/rsnvac_first_let.rb
  92. 4
      app/models/form/lettings/questions/scharge_4_weekly.rb
  93. 4
      app/models/form/lettings/questions/scharge_bi_weekly.rb
  94. 4
      app/models/form/lettings/questions/scharge_monthly.rb
  95. 4
      app/models/form/lettings/questions/scharge_weekly.rb
  96. 4
      app/models/form/lettings/questions/scheme_id.rb
  97. 4
      app/models/form/lettings/questions/sheltered.rb
  98. 4
      app/models/form/lettings/questions/starter_tenancy_type.rb
  99. 4
      app/models/form/lettings/questions/startertenancy.rb
  100. 4
      app/models/form/lettings/questions/stock_owner.rb
  101. Some files were not shown because too many files have changed in this diff Show More

4
app/models/form/lettings/questions/address_line1.rb
Unescape View File

@ -7,7 +7,7 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
@type = "text"
@plain_label = true
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@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]
@hide_question_number_on_page = true
end
@ -18,5 +18,5 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
].select(&:present?).join("\n")
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
end

4
app/models/form/lettings/questions/address_search.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
@copy_key = "lettings.property_information.address_search"
@plain_label = true
@bottom_guidance_partial = "address_search"
@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]
@hide_question_number_on_page = true
end
@ -38,5 +38,5 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
answer_options(log, user).transform_values { |value| value["value"] } || {}
end
QUESTION_NUMBER_FROM_YEAR = { 2024 => 12, 2025 => 16 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2024 => 12, 2025 => 16, 2026 => 16 }.freeze
end

4
app/models/form/lettings/questions/age1.rb
Unescape View File

@ -10,8 +10,8 @@ class Form::Lettings::Questions::Age1 < ::Form::Question
@max = 120
@min = 16
@step = 1
@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]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31, 2025 => 31, 2026 => 31 }.freeze
end

4
app/models/form/lettings/questions/age1_known.rb
Unescape View File

@ -8,10 +8,10 @@ class Form::Lettings::Questions::Age1Known < ::Form::Question
@answer_options = ANSWER_OPTIONS
@conditional_for = { "age1" => [0] }
@hidden_in_check_answers = { "depends_on" => [{ "age1_known" => 0 }, { "age1_known" => 1 }] }
@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]
end
ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31, 2025 => 31, 2026 => 31 }.freeze
end

4
app/models/form/lettings/questions/armedforces.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -18,5 +18,5 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
"6" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 65 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 65, 2025 => 65, 2026 => 65 }.freeze
end

4
app/models/form/lettings/questions/beds.rb
Unescape View File

@ -7,12 +7,12 @@ class Form::Lettings::Questions::Beds < ::Form::Question
@max = 12
@min = 1
@step = 1
@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]
end
def derived?(log)
log.is_bedsit?
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 22 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 22, 2025 => 22, 2026 => 22 }.freeze
end

4
app/models/form/lettings/questions/benefits.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Benefits < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -16,5 +16,5 @@ class Form::Lettings::Questions::Benefits < ::Form::Question
"4" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 90, 2024 => 89 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 90, 2024 => 89, 2025 => 89, 2026 => 89 }.freeze
end

4
app/models/form/lettings/questions/brent_4_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::Brent4Weekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 4 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 92 }.freeze
end

4
app/models/form/lettings/questions/brent_bi_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentBiWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 2 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 92 }.freeze
end

4
app/models/form/lettings/questions/brent_monthly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentMonthly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every month"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 92 }.freeze
end

4
app/models/form/lettings/questions/brent_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every week"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 92 }.freeze
end

4
app/models/form/lettings/questions/builtype.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
@id = "builtype"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -12,5 +12,5 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
"1" => { "value" => "Purpose built" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 20, 2025 => 20, 2026 => 20 }.freeze
end

4
app/models/form/lettings/questions/chcharge_4_weekly.rb
Unescape View File

@ -9,9 +9,9 @@ class Form::Lettings::Questions::Chcharge4Weekly < ::Form::Question
@step = 0.01
@prefix = "£"
@suffix = " every 4 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/chcharge_bi_weekly.rb
Unescape View File

@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeBiWeekly < ::Form::Question
@step = 0.01
@prefix = "£"
@suffix = " every 2 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/chcharge_monthly.rb
Unescape View File

@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeMonthly < ::Form::Question
@step = 0.01
@prefix = "£"
@suffix = " every month"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/chcharge_weekly.rb
Unescape View File

@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeWeekly < ::Form::Question
@step = 0.01
@prefix = "£"
@suffix = " every week"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/condition_effects.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ConditionEffects < ::Form::Question
@type = "checkbox"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -27,5 +27,5 @@ class Form::Lettings::Questions::ConditionEffects < ::Form::Question
"illness_type_10" => { "value" => "Other" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 73 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 73, 2025 => 73, 2026 => 73 }.freeze
end

4
app/models/form/lettings/questions/county.rb
Unescape View File

@ -6,9 +6,9 @@ class Form::Lettings::Questions::County < ::Form::Question
@type = "text"
@plain_label = true
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@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]
@hide_question_number_on_page = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
end

4
app/models/form/lettings/questions/declaration.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
@type = "checkbox"
@check_answers_card_number = 0 unless form.start_year_2024_or_later?
@top_guidance_partial = "privacy_notice_tenant"
@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]
end
def answer_options
@ -26,5 +26,5 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 11 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 11, 2025 => 11, 2026 => 11 }.freeze
end

4
app/models/form/lettings/questions/earnings.rb
Unescape View File

@ -15,9 +15,9 @@ class Form::Lettings::Questions::Earnings < ::Form::Question
{ "label" => " every month", "depends_on" => { "incfreq" => 2 } },
{ "label" => " every year", "depends_on" => { "incfreq" => 3 } },
]
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 87 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 87, 2025 => 87, 2026 => 87 }.freeze
end

4
app/models/form/lettings/questions/ethnic_arab.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -18,5 +18,5 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

4
app/models/form/lettings/questions/ethnic_asian.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -27,5 +27,5 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

4
app/models/form/lettings/questions/ethnic_black.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -21,5 +21,5 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

4
app/models/form/lettings/questions/ethnic_group.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -18,5 +18,5 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
"17" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33, 2025 => 33, 2026 => 33 }.freeze
end

4
app/models/form/lettings/questions/ethnic_mixed.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -24,5 +24,5 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

4
app/models/form/lettings/questions/ethnic_white.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
@copy_key = "lettings.household_characteristics.ethnic.ethnic_background_white"
@type = "radio"
@check_answers_card_number = 1
@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]
end
def answer_options
@ -27,5 +27,5 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

4
app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
Unescape View File

@ -3,7 +3,7 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
super
@id = "first_time_property_let_as_social_housing"
@type = "radio"
@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]
end
def answer_options
@ -21,5 +21,5 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
form.start_year_2024_or_later? ? "This is a re-let of existing social housing stock." : "This is a re-let of existing social housing."
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15, 2025 => 12 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15, 2025 => 12, 2026 => 12 }.freeze
end

4
app/models/form/lettings/questions/gender_identity1.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -16,5 +16,5 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
"R" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32, 2025 => 32, 2026 => 32 }.freeze
end

4
app/models/form/lettings/questions/hb.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Hb < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -17,5 +17,5 @@ class Form::Lettings::Questions::Hb < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88, 2025 => 88, 2026 => 88 }.freeze
end

4
app/models/form/lettings/questions/hbrentshortfall.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 99, 2024 => 98, 2025 => 96 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 99, 2024 => 98, 2025 => 96, 2026 => 96 }.freeze
end

4
app/models/form/lettings/questions/hhmemb.rb
Unescape View File

@ -8,8 +8,8 @@ class Form::Lettings::Questions::Hhmemb < ::Form::Question
@max = 8
@min = 1
@step = 1
@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]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 30 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 30, 2025 => 30, 2026 => 30 }.freeze
end

4
app/models/form/lettings/questions/homeless.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Homeless < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -13,5 +13,5 @@ class Form::Lettings::Questions::Homeless < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 78 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 78, 2025 => 78, 2026 => 78 }.freeze
end

4
app/models/form/lettings/questions/household_charge.rb
Unescape View File

@ -5,10 +5,10 @@ class Form::Lettings::Questions::HouseholdCharge < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 91, 2024 => 90 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 91, 2024 => 90, 2025 => 90, 2026 => 90 }.freeze
end

4
app/models/form/lettings/questions/housingneeds.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Housingneeds < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Housingneeds < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 69 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 69, 2025 => 69, 2026 => 69 }.freeze
end

4
app/models/form/lettings/questions/housingneeds_other.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
@copy_key = "lettings.household_needs.housingneeds_type.housingneeds_other"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -24,5 +24,5 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 71 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 71, 2025 => 71, 2026 => 71 }.freeze
end

4
app/models/form/lettings/questions/housingneeds_type.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::HousingneedsType < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -17,5 +17,5 @@ class Form::Lettings::Questions::HousingneedsType < ::Form::Question
"3" => { "value" => "None of the listed options" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 70 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 70, 2025 => 70, 2026 => 70 }.freeze
end

4
app/models/form/lettings/questions/illness.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Illness < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Illness < ::Form::Question
"3" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 72 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 72, 2025 => 72, 2026 => 72 }.freeze
end

4
app/models/form/lettings/questions/incfreq.rb
Unescape View File

@ -7,7 +7,7 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@hidden_in_check_answers = true
@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]
end
ANSWER_OPTIONS = {
@ -16,5 +16,5 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
"3" => { "value" => "Yearly" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 86 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 86, 2025 => 86, 2026 => 86 }.freeze
end

4
app/models/form/lettings/questions/irproduct_other.rb
Unescape View File

@ -4,8 +4,8 @@ class Form::Lettings::Questions::IrproductOther < ::Form::Question
@id = "irproduct_other"
@copy_key = "lettings.setup.rent_type.irproduct_other"
@type = "text"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8, 2025 => 8, 2026 => 8 }.freeze
end

4
app/models/form/lettings/questions/is_carehome.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::IsCarehome < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@conditional_for = { "chcharge" => [1] }
@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]
end
def answer_options
@ -23,5 +23,5 @@ class Form::Lettings::Questions::IsCarehome < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 93, 2024 => 92 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 93, 2024 => 92, 2025 => 92, 2026 => 92 }.freeze
end

4
app/models/form/lettings/questions/joint.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Joint < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Joint < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 25, 2025 => 26 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 25, 2025 => 26, 2026 => 26 }.freeze
end

4
app/models/form/lettings/questions/la.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::La < ::Form::Question
@type = "select"
@check_answers_card_number = nil
@hint_text = ""
@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]
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
@ -13,5 +13,5 @@ class Form::Lettings::Questions::La < ::Form::Question
{ "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).england.map { |la| [la.code, la.name] }.to_h)
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 14, 2025 => 18 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 14, 2025 => 18, 2026 => 18 }.freeze
end

4
app/models/form/lettings/questions/layear.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::Layear < ::Form::Question
@id = "layear"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -36,5 +36,5 @@ class Form::Lettings::Questions::Layear < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 75, 2024 => 74 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 75, 2024 => 74, 2025 => 74, 2026 => 74 }.freeze
end

4
app/models/form/lettings/questions/leftreg.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Leftreg < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -16,5 +16,5 @@ class Form::Lettings::Questions::Leftreg < ::Form::Question
"3" => { "value" => "Person prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 66 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 66, 2025 => 66, 2026 => 66 }.freeze
end

4
app/models/form/lettings/questions/letting_allocation.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::LettingAllocation < ::Form::Question
@id = "letting_allocation"
@type = "checkbox"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -28,5 +28,5 @@ class Form::Lettings::Questions::LettingAllocation < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 84, 2024 => 83 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 84, 2024 => 83, 2025 => 83, 2026 => 83 }.freeze
end

4
app/models/form/lettings/questions/location_id.rb
Unescape View File

@ -10,7 +10,7 @@ class Form::Lettings::Questions::LocationId < ::Form::Question
"needstype": 2,
},
}
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@top_guidance_partial = "finding_location"
end
@ -55,5 +55,5 @@ private
false
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5, 2025 => 5, 2026 => 5 }.freeze
end

4
app/models/form/lettings/questions/location_id_search.rb
Unescape View File

@ -10,7 +10,7 @@ class Form::Lettings::Questions::LocationIdSearch < ::Form::Question
"needstype": 2,
},
}
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@top_guidance_partial = "finding_location"
end
@ -50,5 +50,5 @@ private
false
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5, 2025 => 5, 2026 => 5 }.freeze
end

4
app/models/form/lettings/questions/majorrepairs.rb
Unescape View File

@ -6,10 +6,10 @@ class Form::Lettings::Questions::Majorrepairs < ::Form::Question
@type = "radio"
@answer_options = ANSWER_OPTIONS
@conditional_for = { "mrcdate" => [1] }
@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]
end
ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 24, 2025 => 24, 2026 => 24 }.freeze
end

4
app/models/form/lettings/questions/managing_organisation.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
@id = "managing_organisation_id"
@derived = true
@type = "select"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
def answer_options(log = nil, user = nil)
@ -83,5 +83,5 @@ private
true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 2 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 2, 2024 => 2, 2025 => 2, 2026 => 2 }.freeze
end

4
app/models/form/lettings/questions/mrcdate.rb
Unescape View File

@ -4,8 +4,8 @@ class Form::Lettings::Questions::Mrcdate < ::Form::Question
@id = "mrcdate"
@copy_key = "lettings.property_information.property_major_repairs.mrcdate"
@type = "date"
@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]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 24, 2025 => 24, 2026 => 24 }.freeze
end

4
app/models/form/lettings/questions/nationality.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -19,5 +19,5 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
"13" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
end

4
app/models/form/lettings/questions/nationality_all.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
@type = "select"
@check_answers_card_number = 1
@answer_options = GlobalConstants::COUNTRIES_ANSWER_OPTIONS
@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]
end
def answer_label(log, _current_user = nil)
@ -17,7 +17,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
@answer_options.reject { |key, _| key == "826" }
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
def label_from_value(value)
return unless value

4
app/models/form/lettings/questions/nationality_all_group.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question
@type = "radio"
@check_answers_card_number = 1
@answer_options = ANSWER_OPTIONS
@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]
@conditional_for = { "nationality_all" => [12] }
@hidden_in_check_answers = { "depends_on" => [{ "nationality_all_group" => 12 }] }
end
@ -17,5 +17,5 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question
"0" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
end

4
app/models/form/lettings/questions/needs_type.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
@id = "needstype"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
ANSWER_OPTIONS = {
@ -12,5 +12,5 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
"2" => { "value" => "Supported housing" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 3 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 3, 2024 => 3, 2025 => 3, 2026 => 3 }.freeze
end

4
app/models/form/lettings/questions/net_income_known.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question
@check_answers_card_number = 0
@top_guidance_partial = "what_counts_as_income"
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -16,5 +16,5 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question
"2" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 85 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 85, 2025 => 85, 2026 => 85 }.freeze
end

4
app/models/form/lettings/questions/offered.rb
Unescape View File

@ -8,8 +8,8 @@ class Form::Lettings::Questions::Offered < ::Form::Question
@max = 150
@min = 0
@step = 1
@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]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 18 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 18, 2024 => 18, 2025 => 18, 2026 => 18 }.freeze
end

4
app/models/form/lettings/questions/period.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Period < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -22,7 +22,7 @@ class Form::Lettings::Questions::Period < ::Form::Question
"10" => { "value" => "Weekly for 53 weeks" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 92, 2024 => 91 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 92, 2024 => 91, 2025 => 91, 2026 => 91 }.freeze
def displayed_answer_options(log, _user)
return ANSWER_OPTIONS if log.managing_organisation.nil?

4
app/models/form/lettings/questions/postcode_for_full_address.rb
Unescape View File

@ -18,10 +18,10 @@ class Form::Lettings::Questions::PostcodeForFullAddress < ::Form::Question
}
@plain_label = true
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@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]
@hide_question_number_on_page = true
@bottom_guidance_partial = "address_fallback"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
end

4
app/models/form/lettings/questions/ppcodenk.rb
Unescape View File

@ -8,7 +8,7 @@ class Form::Lettings::Questions::Ppcodenk < ::Form::Question
@answer_options = ANSWER_OPTIONS
@conditional_for = { "ppostcode_full" => [0] }
@hidden_in_check_answers = { "depends_on" => [{ "ppcodenk" => 0 }, { "ppcodenk" => 1 }] }
@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]
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
@ -17,5 +17,5 @@ class Form::Lettings::Questions::Ppcodenk < ::Form::Question
"1" => { "value" => "No" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79, 2025 => 79, 2026 => 79 }.freeze
end

4
app/models/form/lettings/questions/ppostcode_full.rb
Unescape View File

@ -13,9 +13,9 @@ class Form::Lettings::Questions::PpostcodeFull < ::Form::Question
}]
@check_answers_card_number = 0
@inferred_answers = { "prevloc" => { "is_previous_la_inferred" => true } }
@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]
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79, 2025 => 79, 2026 => 79 }.freeze
end

4
app/models/form/lettings/questions/preg_occ.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::PregOcc < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::PregOcc < ::Form::Question
"3" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 68 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 68, 2025 => 68, 2026 => 68 }.freeze
end

4
app/models/form/lettings/questions/previous_la_known.rb
Unescape View File

@ -8,11 +8,11 @@ class Form::Lettings::Questions::PreviousLaKnown < ::Form::Question
@answer_options = ANSWER_OPTIONS
@conditional_for = { "prevloc" => [1] }
@hidden_in_check_answers = { "depends_on" => [{ "previous_la_known" => 0 }, { "previous_la_known" => 1 }] }
@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]
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80, 2025 => 80, 2026 => 80 }.freeze
end

4
app/models/form/lettings/questions/previous_let_type.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::PreviousLetType < ::Form::Question
@id = "unitletas"
@type = "radio"
@answer_options = answer_options
@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]
end
ANSWER_OPTIONS = {
@ -41,7 +41,7 @@ class Form::Lettings::Questions::PreviousLetType < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17, 2025 => 14 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17, 2025 => 14, 2026 => 14 }.freeze
def answer_options
return ANSWER_OPTIONS_AFTER_2025 if form.start_year_2025_or_later?

4
app/models/form/lettings/questions/previous_tenure.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -67,5 +67,5 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
"25" => { "value" => "Any other accommodation" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77, 2025 => 77, 2026 => 77 }.freeze
end

4
app/models/form/lettings/questions/previous_tenure_renewal.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::PreviousTenureRenewal < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -22,5 +22,5 @@ class Form::Lettings::Questions::PreviousTenureRenewal < ::Form::Question
"6" => { "value" => "Other supported housing" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77, 2025 => 77, 2026 => 77 }.freeze
end

4
app/models/form/lettings/questions/prevloc.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::Prevloc < ::Form::Question
@type = "select"
@inferred_check_answers_value = [{ "condition" => { "previous_la_known" => 0 }, "value" => "Not known" }]
@check_answers_card_number = 0
@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]
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
end
@ -14,5 +14,5 @@ class Form::Lettings::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 => 81, 2024 => 80 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80, 2025 => 80, 2026 => 80 }.freeze
end

4
app/models/form/lettings/questions/property_reference.rb
Unescape View File

@ -4,8 +4,8 @@ class Form::Lettings::Questions::PropertyReference < ::Form::Question
@id = "propcode"
@type = "text"
@width = 10
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 8, 2024 => 10 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 8, 2024 => 10, 2025 => 10, 2026 => 10 }.freeze
end

4
app/models/form/lettings/questions/pscharge_4_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::Pscharge4Weekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 4 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 94 }.freeze
end

4
app/models/form/lettings/questions/pscharge_bi_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeBiWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 2 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 94 }.freeze
end

4
app/models/form/lettings/questions/pscharge_monthly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeMonthly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every month"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 94 }.freeze
end

4
app/models/form/lettings/questions/pscharge_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every week"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 94 }.freeze
end

4
app/models/form/lettings/questions/reason.rb
Unescape View File

@ -10,7 +10,7 @@ class Form::Lettings::Questions::Reason < ::Form::Question
20,
],
}
@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]
end
def answer_options
@ -132,5 +132,5 @@ class Form::Lettings::Questions::Reason < ::Form::Question
}.freeze,
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2024 => 76 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2024 => 76, 2025 => 76, 2026 => 76 }.freeze
end

4
app/models/form/lettings/questions/reason_renewal.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
@type = "radio"
@copy_key = "lettings.household_situation.reason.#{page.id}.reason"
@check_answers_card_number = 0
@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]
@conditional_for = {
"reasonother" => [
20,
@ -37,5 +37,5 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76, 2025 => 76, 2026 => 76 }.freeze
end

4
app/models/form/lettings/questions/reasonable_preference_reason.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReasonablePreferenceReason < ::Form::Question
@type = "checkbox"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -17,5 +17,5 @@ class Form::Lettings::Questions::ReasonablePreferenceReason < ::Form::Question
"rp_dontknow" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 82 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 82, 2025 => 82, 2026 => 82 }.freeze
end

4
app/models/form/lettings/questions/reasonother.rb
Unescape View File

@ -5,8 +5,8 @@ class Form::Lettings::Questions::Reasonother < ::Form::Question
@copy_key = "lettings.household_situation.reason.#{@page.id}.reasonother"
@type = "text"
@check_answers_card_number = 0
@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]
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76, 2025 => 76, 2026 => 76 }.freeze
end

4
app/models/form/lettings/questions/reasonpref.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Reasonpref < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Reasonpref < ::Form::Question
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 81 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 81, 2025 => 81, 2026 => 81 }.freeze
end

4
app/models/form/lettings/questions/referral_direct.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralDirect < ::Form::Question
@copy_key = "lettings.household_situation.referral.direct"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -22,5 +22,5 @@ class Form::Lettings::Questions::ReferralDirect < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_general_needs.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question
@copy_key = "lettings.household_situation.referral.general_needs.la"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -92,5 +92,5 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_general_needs_prp.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralGeneralNeedsPrp < ::Form::Question
@copy_key = "lettings.household_situation.referral.general_needs.prp"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -101,5 +101,5 @@ class Form::Lettings::Questions::ReferralGeneralNeedsPrp < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_hsc.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralHsc < ::Form::Question
@copy_key = "lettings.household_situation.referral.hsc"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -28,5 +28,5 @@ class Form::Lettings::Questions::ReferralHsc < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_justice.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralJustice < ::Form::Question
@copy_key = "lettings.household_situation.referral.justice"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -19,5 +19,5 @@ class Form::Lettings::Questions::ReferralJustice < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_la.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralLa < ::Form::Question
@copy_key = "lettings.household_situation.referral.la"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -25,5 +25,5 @@ class Form::Lettings::Questions::ReferralLa < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_prp.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question
@copy_key = "lettings.household_situation.referral.prp"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -22,5 +22,5 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_supported_housing.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
@copy_key = "lettings.household_situation.referral.supported_housing.la"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -92,5 +92,5 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_supported_housing_prp.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
@copy_key = "lettings.household_situation.referral.supported_housing.prp"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -104,5 +104,5 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/referral_type.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReferralType < ::Form::Question
@copy_key = "lettings.household_situation.referral.type"
@type = "radio"
@check_answers_card_number = 0
@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]
end
def answer_options
@ -34,5 +34,5 @@ class Form::Lettings::Questions::ReferralType < ::Form::Question
}.freeze
end
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2025 => 84, 2026 => 84 }.freeze
end

4
app/models/form/lettings/questions/renewal.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
@id = "renewal"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
ANSWER_OPTIONS = {
@ -13,5 +13,5 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
}
.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6, 2025 => 6, 2026 => 6 }.freeze
end

4
app/models/form/lettings/questions/rent_type.rb
Unescape View File

@ -7,7 +7,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
@top_guidance_partial = "rent_type_definitions"
@answer_options = answer_options
@conditional_for = { "irproduct_other" => [5] }
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
ANSWER_OPTIONS = {
@ -29,7 +29,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
"6" => { "value" => "Specified accommodation - exempt accommodation, managed properties, refuges and local authority hostels" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8, 2025 => 8, 2026 => 9 }.freeze
def answer_options
form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS

4
app/models/form/lettings/questions/reservist.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::Reservist < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -15,5 +15,5 @@ class Form::Lettings::Questions::Reservist < ::Form::Question
"3" => { "value" => "Person prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 67 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 67, 2025 => 67, 2026 => 67 }.freeze
end

4
app/models/form/lettings/questions/rsnvac.rb
Unescape View File

@ -3,7 +3,7 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
super
@id = "rsnvac"
@type = "radio"
@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]
end
def answer_options
@ -98,5 +98,5 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 18, 2025 => 15 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 18, 2025 => 15, 2026 => 15 }.freeze
end

4
app/models/form/lettings/questions/rsnvac_first_let.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
@id = "rsnvac"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = {
@ -13,5 +13,5 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
"15" => { "value" => "First let of new-build property" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 13 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 13, 2026 => 13 }.freeze
end

4
app/models/form/lettings/questions/scharge_4_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::Scharge4Weekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 4 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/scharge_bi_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeBiWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every 2 weeks"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/scharge_monthly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeMonthly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every month"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/scharge_weekly.rb
Unescape View File

@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeWeekly < ::Form::Question
@result_field = "tcharge"
@prefix = "£"
@suffix = " every week"
@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]
@strip_commas = true
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 93 }.freeze
end

4
app/models/form/lettings/questions/scheme_id.rb
Unescape View File

@ -5,7 +5,7 @@ class Form::Lettings::Questions::SchemeId < ::Form::Question
@answer_options = answer_options
@top_guidance_partial = "finding_scheme"
@bottom_guidance_partial = "scheme_selection"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
@inferred_answers = {
"location.name": {
"scheme_has_multiple_locations?": false,
@ -56,5 +56,5 @@ private
false
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 4 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 4, 2025 => 4, 2026 => 4 }.freeze
end

4
app/models/form/lettings/questions/sheltered.rb
Unescape View File

@ -3,7 +3,7 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
super
@id = "sheltered"
@type = "radio"
@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]
end
def answer_options
@ -27,5 +27,5 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 29, 2025 => 25 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 29, 2025 => 25, 2026 => 25 }.freeze
end

4
app/models/form/lettings/questions/starter_tenancy_type.rb
Unescape View File

@ -6,7 +6,7 @@ class Form::Lettings::Questions::StarterTenancyType < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@conditional_for = { "tenancyother" => [3] }
@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]
end
def answer_options
@ -65,5 +65,5 @@ class Form::Lettings::Questions::StarterTenancyType < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28, 2026 => 28 }.freeze
end

4
app/models/form/lettings/questions/startertenancy.rb
Unescape View File

@ -5,10 +5,10 @@ class Form::Lettings::Questions::Startertenancy < ::Form::Question
@type = "radio"
@check_answers_card_number = 0
@answer_options = ANSWER_OPTIONS
@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]
end
ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "2" => { "value" => "No" } }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 26, 2025 => 27 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 26, 2025 => 27, 2026 => 27 }.freeze
end

4
app/models/form/lettings/questions/stock_owner.rb
Unescape View File

@ -4,7 +4,7 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
@id = "owning_organisation_id"
@derived = true
@type = "select"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] if form.start_date.present?
end
def answer_options(log = nil, user = nil)
@ -86,5 +86,5 @@ private
"#{name} (inactive as of #{merge_date.to_fs(:govuk_date)})"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 1 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 1, 2025 => 1, 2026 => 1 }.freeze
end

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

Write Preview
Loading…
Cancel
Save