Browse Source

CLDC-3949 Add dividers before don't know answer options (#3023)

* Add dividers

* Update csvs

* Update divider order

* Update joint divider
pull/3026/head
kosiakkatrina 3 weeks ago committed by GitHub
parent
commit
13106fd6cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      app/models/form/lettings/questions/armedforces.rb
  2. 2
      app/models/form/lettings/questions/hb.rb
  3. 1
      app/models/form/lettings/questions/hbrentshortfall.rb
  4. 3
      app/models/form/lettings/questions/housingneeds_other.rb
  5. 2
      app/models/form/lettings/questions/joint.rb
  6. 4
      app/models/form/lettings/questions/reason.rb
  7. 3
      app/models/form/sales/questions/armed_forces.rb
  8. 3
      app/models/form/sales/questions/armed_forces_spouse.rb
  9. 1
      app/models/form/sales/questions/buyer1_previous_tenure.rb
  10. 3
      app/models/form/sales/questions/buyer2_living_in.rb
  11. 3
      app/models/form/sales/questions/buyer_still_serving.rb
  12. 3
      app/models/form/sales/questions/extra_borrowing.rb
  13. 3
      app/models/form/sales/questions/household_disability.rb
  14. 3
      app/models/form/sales/questions/household_wheelchair.rb
  15. 2
      app/models/form/sales/questions/housing_benefits.rb
  16. 1
      app/models/form/sales/questions/la_nominations.rb
  17. 3
      app/models/form/sales/questions/mortgageused.rb
  18. 1
      app/models/form/sales/questions/number_joint_buyers.rb
  19. 1
      app/models/form/sales/questions/previous_tenure.rb
  20. 3
      app/models/form/sales/questions/previous_tenure_buyer2.rb
  21. 1
      app/models/form/sales/questions/prevown.rb
  22. 1
      app/models/form/sales/questions/prevshared.rb
  23. 3
      app/models/form/sales/questions/property_wheelchair_accessible.rb
  24. 1
      app/models/form/sales/questions/staircase.rb
  25. 3
      app/models/form/sales/questions/staircase_sale.rb
  26. 2
      spec/fixtures/files/sales_logs_csv_export_labels_23.csv
  27. 2
      spec/fixtures/files/sales_logs_csv_export_labels_24.csv
  28. 2
      spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv
  29. 3
      spec/models/form/lettings/questions/housingneeds_other_spec.rb
  30. 2
      spec/models/form/lettings/questions/joint_spec.rb
  31. 3
      spec/models/form/sales/questions/armed_forces_spec.rb
  32. 3
      spec/models/form/sales/questions/armed_forces_spouse_spec.rb
  33. 1
      spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
  34. 3
      spec/models/form/sales/questions/buyer2_living_in_spec.rb
  35. 3
      spec/models/form/sales/questions/buyer_still_serving_spec.rb
  36. 3
      spec/models/form/sales/questions/extra_borrowing_spec.rb
  37. 3
      spec/models/form/sales/questions/household_disability_spec.rb
  38. 3
      spec/models/form/sales/questions/household_wheelchair_spec.rb
  39. 1
      spec/models/form/sales/questions/la_nominations_spec.rb
  40. 2
      spec/models/form/sales/questions/mortgageused_spec.rb
  41. 1
      spec/models/form/sales/questions/number_joint_buyers_spec.rb
  42. 3
      spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
  43. 1
      spec/models/form/sales/questions/previous_tenure_spec.rb
  44. 1
      spec/models/form/sales/questions/prevown_spec.rb
  45. 1
      spec/models/form/sales/questions/prevshared_spec.rb
  46. 3
      spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
  47. 3
      spec/models/form/sales/questions/staircase_sale_spec.rb
  48. 1
      spec/models/form/sales/questions/staircase_spec.rb

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

@ -13,8 +13,8 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
"4" => { "value" => "Yes – the person is a current or former reserve" },
"5" => { "value" => "Yes – the person is a spouse or civil partner of a UK armed forces member and has been bereaved or separated from them within the last 2 years" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Person prefers not to say" },
"divider" => { "value" => true },
"6" => { "value" => "Don’t know" },
}.freeze

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

@ -12,9 +12,9 @@ class Form::Lettings::Questions::Hb < ::Form::Question
"1" => { "value" => "Housing benefit" },
"6" => { "value" => "Universal Credit housing element" },
"9" => { "value" => "Neither" },
"10" => { "value" => "Tenant prefers not to say" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
"10" => { "value" => "Tenant prefers not to say" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88 }.freeze

1
app/models/form/lettings/questions/hbrentshortfall.rb

@ -11,6 +11,7 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

3
app/models/form/lettings/questions/housingneeds_other.rb

@ -13,7 +13,8 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
{
"1" => { "value" => "Yes" },
"0" => { "value" => "No" },
"2" => { "value" => "Don't know" },
"divider" => { "value" => true },
"2" => { "value" => "Don’t know" },
}.freeze
else
{

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

@ -11,7 +11,7 @@ class Form::Lettings::Questions::Joint < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => "true" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

4
app/models/form/lettings/questions/reason.rb

@ -83,9 +83,9 @@ class Form::Lettings::Questions::Reason < ::Form::Question
"18" => { "value" => "To move to accommodation with support" },
"19" => { "value" => "To move to independent accommodation" },
"20" => { "value" => "Other" },
"28" => { "value" => "Don’t know" },
"divider" => { "value" => true },
"47" => { "value" => "Tenant prefers not to say" },
"divider" => { "value" => true },
"28" => { "value" => "Don’t know" },
}.freeze
end

3
app/models/form/sales/questions/armed_forces.rb

@ -11,7 +11,8 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
"1" => { "value" => "Yes" },
"7" => { "value" => "No" },
"3" => { "value" => "Buyer prefers not to say" },
"8" => { "value" => "Don't know" },
"divider" => { "value" => true },
"8" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 62, 2024 => 64, 2025 => 61 }.freeze

3
app/models/form/sales/questions/armed_forces_spouse.rb

@ -11,7 +11,8 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
"divider" => { "value" => true },
"7" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63 }.freeze

1
app/models/form/sales/questions/buyer1_previous_tenure.rb

@ -17,6 +17,7 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"divider" => { "value" => true },
"0" => { "value" => "Don’t know" },
}
end

3
app/models/form/sales/questions/buyer2_living_in.rb

@ -10,7 +10,8 @@ class Form::Sales::Questions::Buyer2LivingIn < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62, 2025 => 59 }.freeze

3
app/models/form/sales/questions/buyer_still_serving.rb

@ -11,7 +11,8 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
"divider" => { "value" => true },
"7" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 63, 2024 => 65, 2025 => 62 }.freeze

3
app/models/form/sales/questions/extra_borrowing.rb

@ -12,7 +12,8 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {

3
app/models/form/sales/questions/household_disability.rb

@ -10,7 +10,8 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 65, 2024 => 67, 2025 => 64 }.freeze

3
app/models/form/sales/questions/household_wheelchair.rb

@ -10,7 +10,8 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 68, 2025 => 65 }.freeze

2
app/models/form/sales/questions/housing_benefits.rb

@ -11,8 +11,8 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
ANSWER_OPTIONS = {
"2" => { "value" => "Housing benefit" },
"3" => { "value" => "Universal Credit housing element" },
"divider" => { "value" => true },
"1" => { "value" => "Neither housing benefit or Universal Credit housing element" },
"divider" => { "value" => true },
"4" => { "value" => "Don’t know " },
}.freeze

1
app/models/form/sales/questions/la_nominations.rb

@ -11,6 +11,7 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

3
app/models/form/sales/questions/mortgageused.rb

@ -22,11 +22,12 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
def answer_options_without_dont_know
ANSWER_OPTIONS.reject { |key, _v| key == "3" }
ANSWER_OPTIONS.reject { |key, _v| %w[3 divider].include?(key) }
end
def question_number_from_year_and_ownership

1
app/models/form/sales/questions/number_joint_buyers.rb

@ -10,6 +10,7 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

1
app/models/form/sales/questions/previous_tenure.rb

@ -13,6 +13,7 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
"2" => { "value" => "Affordable Rent" },
"3" => { "value" => "London Affordable Rent" },
"9" => { "value" => "Other" },
"divider" => { "value" => true },
"10" => { "value" => "Don’t know" },
}.freeze

3
app/models/form/sales/questions/previous_tenure_buyer2.rb

@ -16,7 +16,8 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don't know" },
"divider" => { "value" => true },
"0" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63, 2025 => 60 }.freeze

1
app/models/form/sales/questions/prevown.rb

@ -11,6 +11,7 @@ class Form::Sales::Questions::Prevown < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

1
app/models/form/sales/questions/prevshared.rb

@ -10,6 +10,7 @@ class Form::Sales::Questions::Prevshared < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze

3
app/models/form/sales/questions/property_wheelchair_accessible.rb

@ -11,7 +11,8 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 21, 2025 => 19 }.freeze

1
app/models/form/sales/questions/staircase.rb

@ -17,6 +17,7 @@ class Form::Sales::Questions::Staircase < ::Form::Question
{
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
end

3
app/models/form/sales/questions/staircase_sale.rb

@ -11,7 +11,8 @@ class Form::Sales::Questions::StaircaseSale < ::Form::Question
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
}.freeze
QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 81, 2025 => 92 }.freeze

2
spec/fixtures/files/sales_logs_csv_export_labels_23.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/sales_logs_csv_export_labels_24.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv vendored

File diff suppressed because one or more lines are too long

3
spec/models/form/lettings/questions/housingneeds_other_spec.rb

@ -49,7 +49,8 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"0" => { "value" => "No" },
"2" => { "value" => "Don't know" },
"divider" => { "value" => true },
"2" => { "value" => "Don’t know" },
})
end
end

2
spec/models/form/lettings/questions/joint_spec.rb

@ -31,7 +31,7 @@ RSpec.describe Form::Lettings::Questions::Joint, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => "true" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/armed_forces_spec.rb

@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::ArmedForces, type: :model do
"1" => { "value" => "Yes" },
"7" => { "value" => "No" },
"3" => { "value" => "Buyer prefers not to say" },
"8" => { "value" => "Don't know" },
"divider" => { "value" => true },
"8" => { "value" => "Don’t know" },
})
end
end

3
spec/models/form/sales/questions/armed_forces_spouse_spec.rb

@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
"divider" => { "value" => true },
"7" => { "value" => "Don’t know" },
})
end
end

1
spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb

@ -32,6 +32,7 @@ RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"divider" => { "value" => true },
"0" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/buyer2_living_in_spec.rb

@ -25,7 +25,8 @@ RSpec.describe Form::Sales::Questions::Buyer2LivingIn, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end
end

3
spec/models/form/sales/questions/buyer_still_serving_spec.rb

@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::BuyerStillServing, type: :model do
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
"divider" => { "value" => true },
"7" => { "value" => "Don’t know" },
})
end
end

3
spec/models/form/sales/questions/extra_borrowing_spec.rb

@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::ExtraBorrowing, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/household_disability_spec.rb

@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::HouseholdDisability, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/household_wheelchair_spec.rb

@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

1
spec/models/form/sales/questions/la_nominations_spec.rb

@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Questions::LaNominations, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

2
spec/models/form/sales/questions/mortgageused_spec.rb

@ -25,6 +25,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end
@ -156,6 +157,7 @@ private
expect(question.displayed_answer_options(log)).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

1
spec/models/form/sales/questions/number_joint_buyers_spec.rb

@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Questions::NumberJointBuyers, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb

@ -31,7 +31,8 @@ RSpec.describe Form::Sales::Questions::PreviousTenureBuyer2, type: :model do
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don't know" },
"divider" => { "value" => true },
"0" => { "value" => "Don’t know" },
})
end
end

1
spec/models/form/sales/questions/previous_tenure_spec.rb

@ -29,6 +29,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
"2" => { "value" => "Affordable Rent" },
"3" => { "value" => "London Affordable Rent" },
"9" => { "value" => "Other" },
"divider" => { "value" => true },
"10" => { "value" => "Don’t know" },
})
end

1
spec/models/form/sales/questions/prevown_spec.rb

@ -28,6 +28,7 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

1
spec/models/form/sales/questions/prevshared_spec.rb

@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

3
spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb

@ -33,7 +33,8 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end
end

3
spec/models/form/sales/questions/staircase_sale_spec.rb

@ -31,7 +31,8 @@ RSpec.describe Form::Sales::Questions::StaircaseSale, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"3" => { "value" => "Don't know" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

1
spec/models/form/sales/questions/staircase_spec.rb

@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
expect(question.answer_options).to eq({
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
"divider" => { "value" => true },
"3" => { "value" => "Don’t know" },
})
end

Loading…
Cancel
Save