Browse Source

CLDC-4202: Update household characteristics question nums

done separate as these question numbers are calculated
CLDC-4202-update-question-numbers
Samuel Young 1 week ago
parent
commit
6b0d735063
  1. 16
      app/models/form/lettings/questions/age.rb
  2. 2
      app/models/form/lettings/questions/ethnic_arab.rb
  3. 2
      app/models/form/lettings/questions/ethnic_asian.rb
  4. 2
      app/models/form/lettings/questions/ethnic_black.rb
  5. 2
      app/models/form/lettings/questions/ethnic_group.rb
  6. 2
      app/models/form/lettings/questions/ethnic_mixed.rb
  7. 2
      app/models/form/lettings/questions/ethnic_white.rb
  8. 2
      app/models/form/lettings/questions/nationality_all.rb
  9. 2
      app/models/form/lettings/questions/nationality_all_group.rb
  10. 16
      app/models/form/lettings/questions/person_partner.rb
  11. 16
      app/models/form/lettings/questions/person_working_situation.rb
  12. 2
      app/models/form/lettings/questions/working_situation1.rb

16
app/models/form/lettings/questions/age.rb

@ -19,11 +19,23 @@ class Form::Lettings::Questions::Age < ::Form::Question
base_question_number = case form.start_date.year
when 2023
31
else
when 2024
30
when 2025
30
when 2026
27
else
27
end
base_question_number + (4 * @person_index)
person_question_count = if form.start_year_2026_or_later?
5
else
4
end
base_question_number + (person_question_count * @person_index)
end
def hint_text

2
app/models/form/lettings/questions/ethnic_arab.rb

@ -18,5 +18,5 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 33 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

2
app/models/form/lettings/questions/ethnic_asian.rb

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

2
app/models/form/lettings/questions/ethnic_black.rb

@ -21,5 +21,5 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 33 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

2
app/models/form/lettings/questions/ethnic_group.rb

@ -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, 2025 => 33, 2026 => 32 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33, 2025 => 33, 2026 => 33 }.freeze
end

2
app/models/form/lettings/questions/ethnic_mixed.rb

@ -24,5 +24,5 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
},
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 33 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
end

2
app/models/form/lettings/questions/ethnic_white.rb

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

2
app/models/form/lettings/questions/nationality_all.rb

@ -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, 2025 => 35, 2026 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
def label_from_value(value)
return unless value

2
app/models/form/lettings/questions/nationality_all_group.rb

@ -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, 2025 => 35, 2026 => 34 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
end

16
app/models/form/lettings/questions/person_partner.rb

@ -21,11 +21,23 @@ class Form::Lettings::Questions::PersonPartner < ::Form::Question
base_question_number = case form.start_date.year
when 2023
30
else
when 2024
29
when 2025
29
when 2026
28
else
28
end
base_question_number + (4 * @person_index)
person_question_count = if form.start_year_2026_or_later?
5
else
4
end
base_question_number + (person_question_count * @person_index)
end
def derived?(log)

16
app/models/form/lettings/questions/person_working_situation.rb

@ -57,10 +57,22 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
base_question_number = case form.start_date.year
when 2023
33
else
when 2024
32
when 2025
32
when 2026
31
else
31
end
base_question_number + (4 * @person_index)
person_question_count = if form.start_year_2026_or_later?
5
else
4
end
base_question_number + (person_question_count * @person_index)
end
end

2
app/models/form/lettings/questions/working_situation1.rb

@ -40,5 +40,5 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 37, 2024 => 36, 2025 => 36, 2026 => 35 }.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 37, 2024 => 36, 2025 => 36, 2026 => 36 }.freeze
end

Loading…
Cancel
Save