diff --git a/app/models/form/lettings/pages/referral.rb b/app/models/form/lettings/pages/referral.rb deleted file mode 100644 index 8b6fcadbb..000000000 --- a/app/models/form/lettings/pages/referral.rb +++ /dev/null @@ -1,12 +0,0 @@ -class Form::Lettings::Pages::Referral < ::Form::Page - def initialize(id, hsh, subsection) - super - @id = "referral" - @copy_key = "lettings.household_situation.referral.general_needs.la" - @depends_on = [{ "owning_organisation_provider_type" => "LA", "needstype" => 1, "renewal" => 0 }] - end - - def questions - @questions ||= [Form::Lettings::Questions::Referral.new(nil, nil, self)] - end -end diff --git a/app/models/form/lettings/pages/referral_general_needs.rb b/app/models/form/lettings/pages/referral_general_needs.rb index 2778fbdbe..5522d1f23 100644 --- a/app/models/form/lettings/pages/referral_general_needs.rb +++ b/app/models/form/lettings/pages/referral_general_needs.rb @@ -1,9 +1,9 @@ class Form::Lettings::Pages::ReferralGeneralNeeds < ::Form::Page def initialize(id, hsh, subsection) super - @id = "referral_prp" - @copy_key = "lettings.household_situation.referral.general_needs.prp" - @depends_on = [{ "owning_organisation_provider_type" => "PRP", "needstype" => 1, "renewal" => 0 }] + @id = "referral" + @copy_key = "lettings.household_situation.referral.general_needs.la" + @depends_on = [{ "owning_organisation_provider_type" => "LA", "needstype" => 1, "renewal" => 0 }] end def questions diff --git a/app/models/form/lettings/pages/referral_general_needs_prp.rb b/app/models/form/lettings/pages/referral_general_needs_prp.rb new file mode 100644 index 000000000..e3206ebdb --- /dev/null +++ b/app/models/form/lettings/pages/referral_general_needs_prp.rb @@ -0,0 +1,12 @@ +class Form::Lettings::Pages::ReferralGeneralNeedsPrp < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "referral_prp" + @copy_key = "lettings.household_situation.referral.general_needs.prp" + @depends_on = [{ "owning_organisation_provider_type" => "PRP", "needstype" => 1, "renewal" => 0 }] + end + + def questions + @questions ||= [Form::Lettings::Questions::ReferralGeneralNeedsPrp.new(nil, nil, self)] + end +end diff --git a/app/models/form/lettings/questions/referral_general_needs.rb b/app/models/form/lettings/questions/referral_general_needs.rb index b73a9438d..6efdfc1f0 100644 --- a/app/models/form/lettings/questions/referral_general_needs.rb +++ b/app/models/form/lettings/questions/referral_general_needs.rb @@ -2,7 +2,7 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question def initialize(id, hsh, page) super @id = "referral" - @copy_key = "lettings.household_situation.referral.general_needs.prp" + @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] @@ -18,9 +18,6 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question "2" => { "value" => "Tenant applied directly (no referral or nomination)", }, - "3" => { - "value" => "Nominated by a local housing authority", - }, "8" => { "value" => "Re-located through official housing mobility scheme", }, @@ -61,12 +58,6 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question "2" => { "value" => "Tenant applied directly (no referral or nomination)", }, - "3" => { - "value" => "Nominated by a local housing authority", - }, - "4" => { - "value" => "Referred by local authority housing department", - }, "8" => { "value" => "Re-located through official housing mobility scheme", }, diff --git a/app/models/form/lettings/questions/referral.rb b/app/models/form/lettings/questions/referral_general_needs_prp.rb similarity index 88% rename from app/models/form/lettings/questions/referral.rb rename to app/models/form/lettings/questions/referral_general_needs_prp.rb index 98e5a9186..afd26117b 100644 --- a/app/models/form/lettings/questions/referral.rb +++ b/app/models/form/lettings/questions/referral_general_needs_prp.rb @@ -1,8 +1,8 @@ -class Form::Lettings::Questions::Referral < ::Form::Question +class Form::Lettings::Questions::ReferralGeneralNeedsPrp < ::Form::Question def initialize(id, hsh, page) super @id = "referral" - @copy_key = "lettings.household_situation.referral.general_needs.la" + @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] @@ -18,6 +18,9 @@ class Form::Lettings::Questions::Referral < ::Form::Question "2" => { "value" => "Tenant applied directly (no referral or nomination)", }, + "3" => { + "value" => "Nominated by a local housing authority", + }, "8" => { "value" => "Re-located through official housing mobility scheme", }, @@ -58,6 +61,12 @@ class Form::Lettings::Questions::Referral < ::Form::Question "2" => { "value" => "Tenant applied directly (no referral or nomination)", }, + "3" => { + "value" => "Nominated by a local housing authority", + }, + "4" => { + "value" => "Referred by local authority housing department", + }, "8" => { "value" => "Re-located through official housing mobility scheme", }, diff --git a/app/models/form/lettings/subsections/household_situation.rb b/app/models/form/lettings/subsections/household_situation.rb index bb49c876b..8bf747f01 100644 --- a/app/models/form/lettings/subsections/household_situation.rb +++ b/app/models/form/lettings/subsections/household_situation.rb @@ -38,8 +38,8 @@ class Form::Lettings::Subsections::HouseholdSituation < ::Form::Subsection ] else [ - Form::Lettings::Pages::Referral.new(nil, nil, self), Form::Lettings::Pages::ReferralGeneralNeeds.new(nil, nil, self), + Form::Lettings::Pages::ReferralGeneralNeedsPrp.new(nil, nil, self), Form::Lettings::Pages::ReferralSupportedHousing.new(nil, nil, self), Form::Lettings::Pages::ReferralSupportedHousingPrp.new(nil, nil, self), ] diff --git a/spec/models/form/lettings/questions/referral_spec.rb b/spec/models/form/lettings/questions/referral_general_needs_prp_spec.rb similarity index 91% rename from spec/models/form/lettings/questions/referral_spec.rb rename to spec/models/form/lettings/questions/referral_general_needs_prp_spec.rb index 75e6c2f42..832394bcc 100644 --- a/spec/models/form/lettings/questions/referral_spec.rb +++ b/spec/models/form/lettings/questions/referral_general_needs_prp_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe Form::Lettings::Questions::Referral, type: :model do +RSpec.describe Form::Lettings::Questions::ReferralGeneralNeedsPrp, type: :model do subject(:question) { described_class.new(question_id, question_definition, page) } let(:question_id) { nil } @@ -40,6 +40,8 @@ RSpec.describe Form::Lettings::Questions::Referral, type: :model do expect(question.answer_options).to eq({ "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." }, "2" => { "value" => "Tenant applied directly (no referral or nomination)" }, + "3" => { "value" => "Nominated by a local housing authority" }, + "4" => { "value" => "Referred by local authority housing department" }, "8" => { "value" => "Re-located through official housing mobility scheme" }, "10" => { "value" => "Other social landlord" }, "9" => { "value" => "Community learning disability team" }, @@ -69,6 +71,7 @@ RSpec.describe Form::Lettings::Questions::Referral, type: :model do expect(question.answer_options).to eq({ "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." }, "2" => { "value" => "Tenant applied directly (no referral or nomination)" }, + "3" => { "value" => "Nominated by a local housing authority" }, "8" => { "value" => "Re-located through official housing mobility scheme" }, "10" => { "value" => "Other social landlord" }, "9" => { "value" => "Community learning disability team" }, diff --git a/spec/models/form/lettings/questions/referral_general_needs_spec.rb b/spec/models/form/lettings/questions/referral_general_needs_spec.rb index 7b36b5c4a..2f7c7a864 100644 --- a/spec/models/form/lettings/questions/referral_general_needs_spec.rb +++ b/spec/models/form/lettings/questions/referral_general_needs_spec.rb @@ -40,8 +40,6 @@ RSpec.describe Form::Lettings::Questions::ReferralGeneralNeeds, type: :model do expect(question.answer_options).to eq({ "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." }, "2" => { "value" => "Tenant applied directly (no referral or nomination)" }, - "3" => { "value" => "Nominated by a local housing authority" }, - "4" => { "value" => "Referred by local authority housing department" }, "8" => { "value" => "Re-located through official housing mobility scheme" }, "10" => { "value" => "Other social landlord" }, "9" => { "value" => "Community learning disability team" }, @@ -71,7 +69,6 @@ RSpec.describe Form::Lettings::Questions::ReferralGeneralNeeds, type: :model do expect(question.answer_options).to eq({ "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." }, "2" => { "value" => "Tenant applied directly (no referral or nomination)" }, - "3" => { "value" => "Nominated by a local housing authority" }, "8" => { "value" => "Re-located through official housing mobility scheme" }, "10" => { "value" => "Other social landlord" }, "9" => { "value" => "Community learning disability team" },