diff --git a/app/models/form/common/questions/created_by_id.rb b/app/models/form/common/questions/created_by_id.rb index b8409d99c..a67e33776 100644 --- a/app/models/form/common/questions/created_by_id.rb +++ b/app/models/form/common/questions/created_by_id.rb @@ -6,7 +6,6 @@ class Form::Common::Questions::CreatedById < ::Form::Question @header = "Which user are you creating this log for?" @hint_text = "" @type = "select" - @page = page end def answer_options diff --git a/app/models/form/common/questions/owning_organisation_id.rb b/app/models/form/common/questions/owning_organisation_id.rb index 9adb0bf64..624289797 100644 --- a/app/models/form/common/questions/owning_organisation_id.rb +++ b/app/models/form/common/questions/owning_organisation_id.rb @@ -6,7 +6,6 @@ class Form::Common::Questions::OwningOrganisationId < ::Form::Question @header = "Which organisation owns this log?" @hint_text = "" @type = "select" - @page = page end def answer_options diff --git a/app/models/form/lettings/questions/created_by_id.rb b/app/models/form/lettings/questions/created_by_id.rb index a120e72a8..855a00891 100644 --- a/app/models/form/lettings/questions/created_by_id.rb +++ b/app/models/form/lettings/questions/created_by_id.rb @@ -6,7 +6,6 @@ class Form::Lettings::Questions::CreatedById < ::Form::Question @header = "Which user are you creating this log for?" @hint_text = "" @type = "select" - @page = page end def answer_options diff --git a/app/models/form/lettings/questions/irproduct_other.rb b/app/models/form/lettings/questions/irproduct_other.rb index 7607d6d9c..99945ceea 100644 --- a/app/models/form/lettings/questions/irproduct_other.rb +++ b/app/models/form/lettings/questions/irproduct_other.rb @@ -5,6 +5,5 @@ class Form::Lettings::Questions::IrproductOther < ::Form::Question @check_answer_label = "Product name" @header = "Name of rent product" @type = "text" - @page = page end end diff --git a/app/models/form/lettings/questions/managing_organisation.rb b/app/models/form/lettings/questions/managing_organisation.rb index 3f33c8617..bd4f57fe8 100644 --- a/app/models/form/lettings/questions/managing_organisation.rb +++ b/app/models/form/lettings/questions/managing_organisation.rb @@ -8,7 +8,6 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question @header = "Which organisation manages this letting?" @type = "select" @answer_options = answer_options - @page = page end def answer_options diff --git a/app/models/form/lettings/questions/needs_type.rb b/app/models/form/lettings/questions/needs_type.rb index 46949a2bf..331899821 100644 --- a/app/models/form/lettings/questions/needs_type.rb +++ b/app/models/form/lettings/questions/needs_type.rb @@ -7,7 +7,6 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question @hint_text = "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes." @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/lettings/questions/property_reference.rb b/app/models/form/lettings/questions/property_reference.rb index 40517b9d3..75168f1bd 100644 --- a/app/models/form/lettings/questions/property_reference.rb +++ b/app/models/form/lettings/questions/property_reference.rb @@ -7,6 +7,5 @@ class Form::Lettings::Questions::PropertyReference < ::Form::Question @hint_text = "This is how you usually refer to this property on your own systems." @type = "text" @width = 10 - @page = page end end diff --git a/app/models/form/lettings/questions/renewal.rb b/app/models/form/lettings/questions/renewal.rb index 06b5f0ff4..efab7117e 100644 --- a/app/models/form/lettings/questions/renewal.rb +++ b/app/models/form/lettings/questions/renewal.rb @@ -7,7 +7,6 @@ class Form::Lettings::Questions::Renewal < ::Form::Question @hint_text = "" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/lettings/questions/rent_type.rb b/app/models/form/lettings/questions/rent_type.rb index c7c23c74b..11ce46d17 100644 --- a/app/models/form/lettings/questions/rent_type.rb +++ b/app/models/form/lettings/questions/rent_type.rb @@ -8,7 +8,6 @@ class Form::Lettings::Questions::RentType < ::Form::Question @type = "radio" @answer_options = ANSWER_OPTIONS @conditional_for = { "irproduct_other" => [5] } - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb index 1f4323531..de82258a6 100644 --- a/app/models/form/lettings/questions/stock_owner.rb +++ b/app/models/form/lettings/questions/stock_owner.rb @@ -7,7 +7,6 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question @check_answer_label = "Stock owner" @header = "Which organisation owns this property?" @type = "select" - @page = page end def answer_options diff --git a/app/models/form/lettings/questions/tenancy_start_date.rb b/app/models/form/lettings/questions/tenancy_start_date.rb index 925eb00bc..b50021597 100644 --- a/app/models/form/lettings/questions/tenancy_start_date.rb +++ b/app/models/form/lettings/questions/tenancy_start_date.rb @@ -6,6 +6,5 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question @header = "What is the tenancy start date?" @type = "date" @unresolved_hint_text = "Some scheme details have changed, and now this log needs updating. Check that the tenancy start date is correct." - @page = page end end diff --git a/app/models/form/lettings/questions/tenant_code.rb b/app/models/form/lettings/questions/tenant_code.rb index dcbbb72a8..1872ebe8e 100644 --- a/app/models/form/lettings/questions/tenant_code.rb +++ b/app/models/form/lettings/questions/tenant_code.rb @@ -7,6 +7,5 @@ class Form::Lettings::Questions::TenantCode < ::Form::Question @hint_text = "This is how you usually refer to this tenancy on your own systems." @type = "text" @width = 10 - @page = page end end diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb index 48dfa7446..e38224b17 100644 --- a/app/models/form/sales/questions/age1.rb +++ b/app/models/form/sales/questions/age1.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Age1 < ::Form::Question @check_answer_label = "Lead buyer’s age" @header = "Age" @type = "numeric" - @page = page @width = 2 @inferred_check_answers_value = { "condition" => { diff --git a/app/models/form/sales/questions/age2.rb b/app/models/form/sales/questions/age2.rb index ade402eb6..9696679a8 100644 --- a/app/models/form/sales/questions/age2.rb +++ b/app/models/form/sales/questions/age2.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Age2 < ::Form::Question @check_answer_label = "Buyer 2’s age" @header = "Age" @type = "numeric" - @page = page @width = 2 @inferred_check_answers_value = { "condition" => { "age2_known" => 1 }, diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb index 6822e712a..af003c5b2 100644 --- a/app/models/form/sales/questions/armed_forces.rb +++ b/app/models/form/sales/questions/armed_forces.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question @type = "radio" @hint_text = "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/armed_forces_spouse.rb b/app/models/form/sales/questions/armed_forces_spouse.rb index cd9a3aca1..e463dfb1c 100644 --- a/app/models/form/sales/questions/armed_forces_spouse.rb +++ b/app/models/form/sales/questions/armed_forces_spouse.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question @type = "radio" @hint_text = "" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb index f3b0c0938..74d9a122b 100644 --- a/app/models/form/sales/questions/buyer1_age_known.rb +++ b/app/models/form/sales/questions/buyer1_age_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question @header = "Do you know buyer 1’s age?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @conditional_for = { "age1" => [0], diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb index 2006eec92..19526f5b7 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question @header = "Which of the following best describes the buyer 1’s Arab background?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb index 9e61ed0a6..ee910c054 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question @header = "Which of the following best describes the buyer 1’s Asian or Asian British background?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb index bc9f16dde..4c24f1433 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question @header = "Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb index c264459c7..8fa879949 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question @header = "Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb index 52e771191..4b7ec9182 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question @header = "Which of the following best describes the buyer 1’s White background?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_ethnic_group.rb b/app/models/form/sales/questions/buyer1_ethnic_group.rb index 85a809aae..a9c52dbed 100644 --- a/app/models/form/sales/questions/buyer1_ethnic_group.rb +++ b/app/models/form/sales/questions/buyer1_ethnic_group.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question @header = "What is buyer 1’s ethnic group?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @inferred_check_answers_value = { "condition" => { diff --git a/app/models/form/sales/questions/buyer1_income.rb b/app/models/form/sales/questions/buyer1_income.rb index aa4a9df09..4a7e43e55 100644 --- a/app/models/form/sales/questions/buyer1_income.rb +++ b/app/models/form/sales/questions/buyer1_income.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Buyer1Income < ::Form::Question @check_answer_label = "Buyer 1’s gross annual income" @header = "Buyer 1’s gross annual income" @type = "numeric" - @page = page @min = 0 @max = 999_999 @step = 1 diff --git a/app/models/form/sales/questions/buyer1_income_known.rb b/app/models/form/sales/questions/buyer1_income_known.rb index 4e7ef182e..36b5ec3f4 100644 --- a/app/models/form/sales/questions/buyer1_income_known.rb +++ b/app/models/form/sales/questions/buyer1_income_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1IncomeKnown < ::Form::Question @header = "Do you know buyer 1’s annual income?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @guidance_position = GuidancePosition::BOTTOM @guidance_partial = "what_counts_as_income_sales" @conditional_for = { diff --git a/app/models/form/sales/questions/buyer1_income_value_check.rb b/app/models/form/sales/questions/buyer1_income_value_check.rb index 9b0f21660..0913dd788 100644 --- a/app/models/form/sales/questions/buyer1_income_value_check.rb +++ b/app/models/form/sales/questions/buyer1_income_value_check.rb @@ -20,6 +20,5 @@ class Form::Sales::Questions::Buyer1IncomeValueCheck < ::Form::Question ], } @check_answers_card_number = 1 - @page = page end end diff --git a/app/models/form/sales/questions/buyer1_live_in_property.rb b/app/models/form/sales/questions/buyer1_live_in_property.rb index 31111ce81..4f18f60df 100644 --- a/app/models/form/sales/questions/buyer1_live_in_property.rb +++ b/app/models/form/sales/questions/buyer1_live_in_property.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question @header = "Will buyer 1 live in the property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_mortgage.rb b/app/models/form/sales/questions/buyer1_mortgage.rb index 76f25085c..f226f956c 100644 --- a/app/models/form/sales/questions/buyer1_mortgage.rb +++ b/app/models/form/sales/questions/buyer1_mortgage.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question @header = "Was buyer 1's income used for a mortgage application?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer1_previous_tenure.rb b/app/models/form/sales/questions/buyer1_previous_tenure.rb index b2d3e01c4..f075e615c 100644 --- a/app/models/form/sales/questions/buyer1_previous_tenure.rb +++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question @header = "What was buyer 1's previous tenure?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb index 5b933d794..d9c22ea03 100644 --- a/app/models/form/sales/questions/buyer1_working_situation.rb +++ b/app/models/form/sales/questions/buyer1_working_situation.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question @header = "Which of these best describes buyer 1's working situation?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it's a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/buyer2_age_known.rb b/app/models/form/sales/questions/buyer2_age_known.rb index d4cd6a777..c100d0b67 100644 --- a/app/models/form/sales/questions/buyer2_age_known.rb +++ b/app/models/form/sales/questions/buyer2_age_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question @header = "Do you know buyer 2’s age?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @conditional_for = { "age2" => [0], } diff --git a/app/models/form/sales/questions/buyer2_income.rb b/app/models/form/sales/questions/buyer2_income.rb index 8e4d66278..2bda83544 100644 --- a/app/models/form/sales/questions/buyer2_income.rb +++ b/app/models/form/sales/questions/buyer2_income.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Buyer2Income < ::Form::Question @check_answer_label = "Buyer 2’s gross annual income" @header = "Buyer 2’s gross annual income" @type = "numeric" - @page = page @min = 0 @step = 1 @width = 5 diff --git a/app/models/form/sales/questions/buyer2_income_known.rb b/app/models/form/sales/questions/buyer2_income_known.rb index fd312776b..385bd9562 100644 --- a/app/models/form/sales/questions/buyer2_income_known.rb +++ b/app/models/form/sales/questions/buyer2_income_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2IncomeKnown < ::Form::Question @header = "Do you know buyer 2’s annual income?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @guidance_position = GuidancePosition::BOTTOM @guidance_partial = "what_counts_as_income_sales" @conditional_for = { diff --git a/app/models/form/sales/questions/buyer2_live_in_property.rb b/app/models/form/sales/questions/buyer2_live_in_property.rb index 654832cfb..6c570b977 100644 --- a/app/models/form/sales/questions/buyer2_live_in_property.rb +++ b/app/models/form/sales/questions/buyer2_live_in_property.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question @type = "radio" @hint_text = "" @answer_options = ANSWER_OPTIONS - @page = page @check_answers_card_number = 2 end diff --git a/app/models/form/sales/questions/buyer2_mortgage.rb b/app/models/form/sales/questions/buyer2_mortgage.rb index 329567d3c..5697aea15 100644 --- a/app/models/form/sales/questions/buyer2_mortgage.rb +++ b/app/models/form/sales/questions/buyer2_mortgage.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question @header = "Was buyer 2's income used for a mortgage application?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @check_answers_card_number = 2 end diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb index 4564a2381..129ece54a 100644 --- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb +++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question @header = "What is buyer 2's relationship to buyer 1?" @type = "radio" @hint_text = "" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 end diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb index bc9bcbe1a..b898efa1e 100644 --- a/app/models/form/sales/questions/buyer2_working_situation.rb +++ b/app/models/form/sales/questions/buyer2_working_situation.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question @header = "Which of these best describes buyer 2's working situation?" @type = "radio" @hint_text = "" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 end diff --git a/app/models/form/sales/questions/buyer_company.rb b/app/models/form/sales/questions/buyer_company.rb index 70c732866..036e96577 100644 --- a/app/models/form/sales/questions/buyer_company.rb +++ b/app/models/form/sales/questions/buyer_company.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::BuyerCompany < ::Form::Question @hint_text = "" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb index 1b354b1d5..b157c05cc 100644 --- a/app/models/form/sales/questions/buyer_interview.rb +++ b/app/models/form/sales/questions/buyer_interview.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question @header = "Was the buyer interviewed for any of the answers you will provide on this log?" @type = "radio" @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person" - @page = page @answer_options = ANSWER_OPTIONS end diff --git a/app/models/form/sales/questions/buyer_live.rb b/app/models/form/sales/questions/buyer_live.rb index ad5ec7f22..a8aeb0401 100644 --- a/app/models/form/sales/questions/buyer_live.rb +++ b/app/models/form/sales/questions/buyer_live.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerLive < ::Form::Question @header = "Will the buyers live in the property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb index ae9ac22ea..18ac019cb 100644 --- a/app/models/form/sales/questions/buyer_previous.rb +++ b/app/models/form/sales/questions/buyer_previous.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question @header = "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb index a15994e19..eb6d5736a 100644 --- a/app/models/form/sales/questions/buyer_still_serving.rb +++ b/app/models/form/sales/questions/buyer_still_serving.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question @type = "radio" @hint_text = "" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyers_organisations.rb b/app/models/form/sales/questions/buyers_organisations.rb index dd3d87bd0..6457b6866 100644 --- a/app/models/form/sales/questions/buyers_organisations.rb +++ b/app/models/form/sales/questions/buyers_organisations.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::BuyersOrganisations < ::Form::Question @header = "What organisations were the buyers registered with?" @type = "checkbox" @hint_text = "Select all that apply" - @page = page @answer_options = ANSWER_OPTIONS end diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb index 8252ad8d7..b054f76f2 100644 --- a/app/models/form/sales/questions/deposit_amount.rb +++ b/app/models/form/sales/questions/deposit_amount.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question @check_answer_label = "Cash deposit" @header = "How much cash deposit was paid on the property?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb index 9496f90fd..dd3f98939 100644 --- a/app/models/form/sales/questions/deposit_discount.rb +++ b/app/models/form/sales/questions/deposit_discount.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question @check_answer_label = "Cash discount through SocialHomeBuy" @header = "How much cash discount was given through Social HomeBuy?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/deposit_value_check.rb b/app/models/form/sales/questions/deposit_value_check.rb index 86bc0d226..f3cd27e3a 100644 --- a/app/models/form/sales/questions/deposit_value_check.rb +++ b/app/models/form/sales/questions/deposit_value_check.rb @@ -20,6 +20,5 @@ class Form::Sales::Questions::DepositValueCheck < ::Form::Question ], } @check_answers_card_number = 0 - @page = page end end diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb index d7b9fa33b..01ae38fd5 100644 --- a/app/models/form/sales/questions/discount.rb +++ b/app/models/form/sales/questions/discount.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Discount < ::Form::Question @check_answer_label = "Percentage discount" @header = "What was the percentage discount?" @type = "numeric" - @page = page @min = 0 @max = 100 @width = 5 diff --git a/app/models/form/sales/questions/discounted_ownership_type.rb b/app/models/form/sales/questions/discounted_ownership_type.rb index b04e76c1e..2cbef6117 100644 --- a/app/models/form/sales/questions/discounted_ownership_type.rb +++ b/app/models/form/sales/questions/discounted_ownership_type.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::DiscountedOwnershipType < ::Form::Question @header = "What is the type of discounted ownership sale?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb index 585a14c36..7dec2ac37 100644 --- a/app/models/form/sales/questions/equity.rb +++ b/app/models/form/sales/questions/equity.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Equity < ::Form::Question @check_answer_label = "Initial percentage equity stake" @header = "What was the initial percentage equity stake purchased?" @type = "numeric" - @page = page @min = 0 @max = 100 @width = 5 diff --git a/app/models/form/sales/questions/exchange_date.rb b/app/models/form/sales/questions/exchange_date.rb index 2c726e441..69b8ec39f 100644 --- a/app/models/form/sales/questions/exchange_date.rb +++ b/app/models/form/sales/questions/exchange_date.rb @@ -5,6 +5,5 @@ class Form::Sales::Questions::ExchangeDate < ::Form::Question @check_answer_label = "Exchange of contracts date" @header = "What is the exchange of contracts date?" @type = "date" - @page = page end end diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb index bfc98f3a0..9c4788b25 100644 --- a/app/models/form/sales/questions/gender_identity1.rb +++ b/app/models/form/sales/questions/gender_identity1.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question @header = "Which of these best describes buyer 1’s gender identity?" @type = "radio" @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = 1 end diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb index 8e27c0cb5..8783cc76c 100644 --- a/app/models/form/sales/questions/gender_identity2.rb +++ b/app/models/form/sales/questions/gender_identity2.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question @check_answer_label = "Buyer 2’s gender identity" @header = "Which of these best describes buyer 2’s gender identity?" @type = "radio" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = 2 end diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb index edab388ac..181e2281d 100644 --- a/app/models/form/sales/questions/grant.rb +++ b/app/models/form/sales/questions/grant.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Grant < ::Form::Question @check_answer_label = "Amount of any loan, grant or subsidy" @header = "What was the amount of any loan, grant, discount or subsidy given?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/handover_date.rb b/app/models/form/sales/questions/handover_date.rb index b00f39601..06a89eb04 100644 --- a/app/models/form/sales/questions/handover_date.rb +++ b/app/models/form/sales/questions/handover_date.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question @check_answer_label = "Practical completion or handover date" @header = "What is the practical completion or handover date?" @type = "date" - @page = page @hint_text = "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" end end diff --git a/app/models/form/sales/questions/household_disability.rb b/app/models/form/sales/questions/household_disability.rb index d0990f17a..c0edef69c 100644 --- a/app/models/form/sales/questions/household_disability.rb +++ b/app/models/form/sales/questions/household_disability.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question @check_answer_label = "Does anyone in the household have a disability?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "This includes any long-term health condition that has an impact on the person's day-to-day life" end diff --git a/app/models/form/sales/questions/household_wheelchair.rb b/app/models/form/sales/questions/household_wheelchair.rb index 43acfcc24..9266909dc 100644 --- a/app/models/form/sales/questions/household_wheelchair.rb +++ b/app/models/form/sales/questions/household_wheelchair.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question @header = "Does anyone in the household use a wheelchair?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "This can be inside or outside the home" end diff --git a/app/models/form/sales/questions/household_wheelchair_check.rb b/app/models/form/sales/questions/household_wheelchair_check.rb index 71cfcc23e..1a9db3f3a 100644 --- a/app/models/form/sales/questions/household_wheelchair_check.rb +++ b/app/models/form/sales/questions/household_wheelchair_check.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question @check_answer_label = "Does anyone in the household use a wheelchair?" @header = "Are you sure? You said previously that somebody in household uses a wheelchair" @type = "interruption_screen" - @page = page @answer_options = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" }, @@ -20,6 +19,5 @@ class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question }, ], } - @page = page end end diff --git a/app/models/form/sales/questions/housing_benefits.rb b/app/models/form/sales/questions/housing_benefits.rb index 7b19473ab..578578eb4 100644 --- a/app/models/form/sales/questions/housing_benefits.rb +++ b/app/models/form/sales/questions/housing_benefits.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question @check_answer_label = "Housing-related benefits buyer received before buying this property" @header = "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" @type = "radio" - @page = page @hint_text = "" @answer_options = ANSWER_OPTIONS end diff --git a/app/models/form/sales/questions/joint_purchase.rb b/app/models/form/sales/questions/joint_purchase.rb index 893398399..76d04a852 100644 --- a/app/models/form/sales/questions/joint_purchase.rb +++ b/app/models/form/sales/questions/joint_purchase.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question @hint_text = "" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb index 5db0178b6..806f7cfdd 100644 --- a/app/models/form/sales/questions/la_nominations.rb +++ b/app/models/form/sales/questions/la_nominations.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::LaNominations < ::Form::Question @header = "Was the household rehoused under a 'local authority nominations agreement'?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" end diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb index eb19a7377..ef9260c56 100644 --- a/app/models/form/sales/questions/leasehold_charges.rb +++ b/app/models/form/sales/questions/leasehold_charges.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question @check_answer_label = "Monthly leasehold charges" @header = "Enter the total monthly charge" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/leasehold_charges_known.rb b/app/models/form/sales/questions/leasehold_charges_known.rb index a94e7f63e..2c28e1814 100644 --- a/app/models/form/sales/questions/leasehold_charges_known.rb +++ b/app/models/form/sales/questions/leasehold_charges_known.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question @hint_text = "For example, service and management charges" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @conditional_for = { "mscharge" => [1], } diff --git a/app/models/form/sales/questions/living_before_purchase.rb b/app/models/form/sales/questions/living_before_purchase.rb index 0486fa4d7..feedaac63 100644 --- a/app/models/form/sales/questions/living_before_purchase.rb +++ b/app/models/form/sales/questions/living_before_purchase.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question @header = "How long did the buyer(s) live in the property before purchase?" @hint_text = "You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'" @type = "numeric" - @page = page @min = 0 @max = 80 @step = 1 diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb index 4195b1238..34ac1bed9 100644 --- a/app/models/form/sales/questions/monthly_rent.rb +++ b/app/models/form/sales/questions/monthly_rent.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question @check_answer_label = "Monthly rent" @header = "What is the basic monthly rent?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb index c385563c5..2cd03448f 100644 --- a/app/models/form/sales/questions/mortgage_amount.rb +++ b/app/models/form/sales/questions/mortgage_amount.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question @check_answer_label = "Mortgage amount" @header = "What is the mortgage amount?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb index 3c06e6e12..7bc09ff8a 100644 --- a/app/models/form/sales/questions/mortgage_length.rb +++ b/app/models/form/sales/questions/mortgage_length.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question @check_answer_label = "Length of mortgage" @header = "What is the length of the mortgage?" @type = "numeric" - @page = page @min = 0 @width = 5 @suffix = " years" diff --git a/app/models/form/sales/questions/mortgage_value_check.rb b/app/models/form/sales/questions/mortgage_value_check.rb index 9d063f428..39079d40e 100644 --- a/app/models/form/sales/questions/mortgage_value_check.rb +++ b/app/models/form/sales/questions/mortgage_value_check.rb @@ -20,6 +20,5 @@ class Form::Sales::Questions::MortgageValueCheck < ::Form::Question ], } @check_answers_card_number = 1 - @page = page end end diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb index 2374056a8..b55bd8817 100644 --- a/app/models/form/sales/questions/mortgageused.rb +++ b/app/models/form/sales/questions/mortgageused.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question @header = "Was a mortgage used for the purchase of this property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" end diff --git a/app/models/form/sales/questions/nationality1.rb b/app/models/form/sales/questions/nationality1.rb index 4d3dabb01..82a40df4e 100644 --- a/app/models/form/sales/questions/nationality1.rb +++ b/app/models/form/sales/questions/nationality1.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Nationality1 < ::Form::Question @header = "What is buyer 1’s nationality?" @type = "radio" @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." - @page = page @answer_options = ANSWER_OPTIONS @conditional_for = { "othernational" => [12], diff --git a/app/models/form/sales/questions/number_joint_buyers.rb b/app/models/form/sales/questions/number_joint_buyers.rb index 2370d03c6..b9c2fc2e2 100644 --- a/app/models/form/sales/questions/number_joint_buyers.rb +++ b/app/models/form/sales/questions/number_joint_buyers.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/number_of_others_in_property.rb b/app/models/form/sales/questions/number_of_others_in_property.rb index ddf2adb31..136cabcfb 100644 --- a/app/models/form/sales/questions/number_of_others_in_property.rb +++ b/app/models/form/sales/questions/number_of_others_in_property.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question @header = "Besides the buyers, how many other people live in the property?" @type = "numeric" @hint_text = "You can provide details for a maximum of 4 other people." - @page = page @width = 2 end end diff --git a/app/models/form/sales/questions/other_nationality1.rb b/app/models/form/sales/questions/other_nationality1.rb index 293d4a2f3..3eb6a48d7 100644 --- a/app/models/form/sales/questions/other_nationality1.rb +++ b/app/models/form/sales/questions/other_nationality1.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::OtherNationality1 < ::Form::Question @check_answer_label = "Buyer 1’s nationality" @header = "Nationality" @type = "text" - @page = page @check_answers_card_number = 1 end end diff --git a/app/models/form/sales/questions/other_ownership_type.rb b/app/models/form/sales/questions/other_ownership_type.rb index 23995bb9e..428691381 100644 --- a/app/models/form/sales/questions/other_ownership_type.rb +++ b/app/models/form/sales/questions/other_ownership_type.rb @@ -6,6 +6,5 @@ class Form::Sales::Questions::OtherOwnershipType < ::Form::Question @header = "What type of sale is it?" @type = "text" @width = 10 - @page = page end end diff --git a/app/models/form/sales/questions/outright_ownership_type.rb b/app/models/form/sales/questions/outright_ownership_type.rb index 494722031..baead7f5a 100644 --- a/app/models/form/sales/questions/outright_ownership_type.rb +++ b/app/models/form/sales/questions/outright_ownership_type.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::OutrightOwnershipType < ::Form::Question @header = "What is the type of outright sale?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @conditional_for = { "othtype" => [12], } diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb index 6db17550a..fc30ce3b4 100644 --- a/app/models/form/sales/questions/ownership_scheme.rb +++ b/app/models/form/sales/questions/ownership_scheme.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::OwnershipScheme < ::Form::Question @header = "Was this purchase made through an ownership scheme?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person_age.rb b/app/models/form/sales/questions/person_age.rb index 73dcce914..74e140f32 100644 --- a/app/models/form/sales/questions/person_age.rb +++ b/app/models/form/sales/questions/person_age.rb @@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonAge < Form::Sales::Questions::Person @check_answer_label = "Person #{person_display_number}’s age" @header = "Age" @type = "numeric" - @page = page @width = 3 @inferred_check_answers_value = { "condition" => { field_for_person("age", "_known") => 1 }, diff --git a/app/models/form/sales/questions/person_age_known.rb b/app/models/form/sales/questions/person_age_known.rb index 1b0643f7f..26913955e 100644 --- a/app/models/form/sales/questions/person_age_known.rb +++ b/app/models/form/sales/questions/person_age_known.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Sales::Questions::Person @header = "Do you know person #{person_display_number}’s age?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" @conditional_for = { field_for_person("age") => [0], diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb index db1f44f0f..71bebd818 100644 --- a/app/models/form/sales/questions/person_gender_identity.rb +++ b/app/models/form/sales/questions/person_gender_identity.rb @@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Sales::Questions::P @check_answer_label = "Person #{person_display_number}’s gender identity" @header = "Which of these best describes Person #{person_display_number}’s gender identity?" @type = "radio" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = person_index end diff --git a/app/models/form/sales/questions/person_known.rb b/app/models/form/sales/questions/person_known.rb index 487b3f6d9..02c9a3aaf 100644 --- a/app/models/form/sales/questions/person_known.rb +++ b/app/models/form/sales/questions/person_known.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::PersonKnown < Form::Sales::Questions::Person @header = "Do you know the details for person #{person_display_number}?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" @hidden_in_check_answers = { "depends_on" => [ diff --git a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb index a6c898796..7dba287f0 100644 --- a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb +++ b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Sales::Questi @header = "What is Person #{person_display_number}’s relationship to Buyer 1?" @type = "radio" @hint_text = "" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = person_index end diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb index 6c48d1844..5393ce80d 100644 --- a/app/models/form/sales/questions/person_working_situation.rb +++ b/app/models/form/sales/questions/person_working_situation.rb @@ -4,7 +4,6 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Sales::Questions: @check_answer_label = "Person #{person_display_number}’s working situation" @header = "Which of these best describes Person #{person_display_number}’s working situation?" @type = "radio" - @page = page @answer_options = ANSWER_OPTIONS @check_answers_card_number = person_index end diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb index 60f361499..e63a1b3cf 100644 --- a/app/models/form/sales/questions/previous_bedrooms.rb +++ b/app/models/form/sales/questions/previous_bedrooms.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question @check_answer_label = "Number of bedrooms in previous property" @header = "How many bedrooms did the property have?" @type = "numeric" - @page = page @width = 5 @min = 0 @hint_text = "For bedsits enter 1" diff --git a/app/models/form/sales/questions/previous_la_known.rb b/app/models/form/sales/questions/previous_la_known.rb index 686a60e58..b38f5c560 100644 --- a/app/models/form/sales/questions/previous_la_known.rb +++ b/app/models/form/sales/questions/previous_la_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PreviousLaKnown < ::Form::Question @header = "Do you know the local authority of buyer 1’s last settled accommodation?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "This is also known as the household’s 'last settled home'" @hidden_in_check_answers = { "depends_on" => [ diff --git a/app/models/form/sales/questions/previous_postcode.rb b/app/models/form/sales/questions/previous_postcode.rb index a5bb7c54a..8d06bfb2d 100644 --- a/app/models/form/sales/questions/previous_postcode.rb +++ b/app/models/form/sales/questions/previous_postcode.rb @@ -4,7 +4,6 @@ class Form::Sales::Questions::PreviousPostcode < ::Form::Question @id = "ppostcode_full" @check_answer_label = "Postcode of buyer 1’s last settled accommodation" @header = "Postcode" - @page = page @type = "text" @width = 5 @hint_text = "" diff --git a/app/models/form/sales/questions/previous_postcode_known.rb b/app/models/form/sales/questions/previous_postcode_known.rb index 7c85aabe5..25ee906f8 100644 --- a/app/models/form/sales/questions/previous_postcode_known.rb +++ b/app/models/form/sales/questions/previous_postcode_known.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PreviousPostcodeKnown < ::Form::Question @header = "Do you know the postcode of buyer 1’s last settled accommodation?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @conditional_for = { "ppostcode_full" => [0], } diff --git a/app/models/form/sales/questions/prevloc.rb b/app/models/form/sales/questions/prevloc.rb index ea7b9cf3b..495a855aa 100644 --- a/app/models/form/sales/questions/prevloc.rb +++ b/app/models/form/sales/questions/prevloc.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Prevloc < ::Form::Question @header = "Select a local authority" @type = "select" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" @inferred_check_answers_value = { "condition" => { diff --git a/app/models/form/sales/questions/prevown.rb b/app/models/form/sales/questions/prevown.rb index 9127a84c1..3220e735a 100644 --- a/app/models/form/sales/questions/prevown.rb +++ b/app/models/form/sales/questions/prevown.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Prevown < ::Form::Question @header = "Has the buyer previously owned a property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" end diff --git a/app/models/form/sales/questions/privacy_notice.rb b/app/models/form/sales/questions/privacy_notice.rb index e853b38de..c7d456556 100644 --- a/app/models/form/sales/questions/privacy_notice.rb +++ b/app/models/form/sales/questions/privacy_notice.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question @header = "Declaration" @type = "checkbox" @hint_text = "" - @page = page @answer_options = ANSWER_OPTIONS @guidance_position = GuidancePosition::TOP @guidance_partial = "privacy_notice_buyer" diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb index 416c9928e..cbd0706b6 100644 --- a/app/models/form/sales/questions/property_building_type.rb +++ b/app/models/form/sales/questions/property_building_type.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question @header = "What type of building is the property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" end diff --git a/app/models/form/sales/questions/property_local_authority.rb b/app/models/form/sales/questions/property_local_authority.rb index 462956eeb..8def2d9f3 100644 --- a/app/models/form/sales/questions/property_local_authority.rb +++ b/app/models/form/sales/questions/property_local_authority.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question @header = "What is the local authority of the property?" @type = "select" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/property_local_authority_known.rb b/app/models/form/sales/questions/property_local_authority_known.rb index 11ebeca6a..cbb534a06 100644 --- a/app/models/form/sales/questions/property_local_authority_known.rb +++ b/app/models/form/sales/questions/property_local_authority_known.rb @@ -14,7 +14,6 @@ class Form::Sales::Questions::PropertyLocalAuthorityKnown < ::Form::Question }, ], } - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb index 34b319240..d06d943cf 100644 --- a/app/models/form/sales/questions/property_number_of_bedrooms.rb +++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb @@ -7,6 +7,5 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question @hint_text = "A bedsit has 1 bedroom" @type = "text" @width = 10 - @page = page end end diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb index 2ebc1a8c2..afa4f0f38 100644 --- a/app/models/form/sales/questions/property_unit_type.rb +++ b/app/models/form/sales/questions/property_unit_type.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question @header = "What type of unit is the property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb index 0290815ef..bfdd133c2 100644 --- a/app/models/form/sales/questions/property_wheelchair_accessible.rb +++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question @header = "Is the property build or adapted to wheelchair-user standards?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/purchase_price.rb b/app/models/form/sales/questions/purchase_price.rb index da714d9df..1cce4582b 100644 --- a/app/models/form/sales/questions/purchase_price.rb +++ b/app/models/form/sales/questions/purchase_price.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question @check_answer_label = "Purchase price" @header = "What is the full purchase price?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£" diff --git a/app/models/form/sales/questions/purchaser_code.rb b/app/models/form/sales/questions/purchaser_code.rb index 1f9551d05..7a5cc4bf7 100644 --- a/app/models/form/sales/questions/purchaser_code.rb +++ b/app/models/form/sales/questions/purchaser_code.rb @@ -7,6 +7,5 @@ class Form::Sales::Questions::PurchaserCode < ::Form::Question @hint_text = "This is how you usually refer to the purchaser on your own systems." @type = "text" @width = 10 - @page = page end end diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb index 8da7d8abd..e67491d65 100644 --- a/app/models/form/sales/questions/resale.rb +++ b/app/models/form/sales/questions/resale.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Resale < ::Form::Question @header = "Is this a resale?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." end diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb index 2b0a3d171..ce085b646 100644 --- a/app/models/form/sales/questions/sale_date.rb +++ b/app/models/form/sales/questions/sale_date.rb @@ -5,6 +5,5 @@ class Form::Sales::Questions::SaleDate < ::Form::Question @check_answer_label = "Sale completion date" @header = "What is the sale completion date?" @type = "date" - @page = page end end diff --git a/app/models/form/sales/questions/savings.rb b/app/models/form/sales/questions/savings.rb index d605b4a47..920b87d4f 100644 --- a/app/models/form/sales/questions/savings.rb +++ b/app/models/form/sales/questions/savings.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Savings < ::Form::Question @check_answer_label = "Buyer’s total savings (to nearest £10) before any deposit paid" @header = "Enter their total savings to the nearest £10" @type = "numeric" - @page = page @width = 5 @prefix = "£" @step = 1 diff --git a/app/models/form/sales/questions/savings_nk.rb b/app/models/form/sales/questions/savings_nk.rb index bce9d849d..649ebb86a 100644 --- a/app/models/form/sales/questions/savings_nk.rb +++ b/app/models/form/sales/questions/savings_nk.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::SavingsNk < ::Form::Question @header = "Do you know how much the buyer had in savings before they paid any deposit for the property?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "" @conditional_for = { "savings" => [0], diff --git a/app/models/form/sales/questions/savings_value_check.rb b/app/models/form/sales/questions/savings_value_check.rb index 6af93ee03..bcd16827a 100644 --- a/app/models/form/sales/questions/savings_value_check.rb +++ b/app/models/form/sales/questions/savings_value_check.rb @@ -20,6 +20,5 @@ class Form::Sales::Questions::SavingsValueCheck < ::Form::Question ], } @check_answers_card_number = 0 - @page = page end end diff --git a/app/models/form/sales/questions/shared_ownership_type.rb b/app/models/form/sales/questions/shared_ownership_type.rb index 27d6ea074..6351cc185 100644 --- a/app/models/form/sales/questions/shared_ownership_type.rb +++ b/app/models/form/sales/questions/shared_ownership_type.rb @@ -7,7 +7,6 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question @hint_text = "A shared ownership sale is when the purchaser buys up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb index e204414b9..c03c24089 100644 --- a/app/models/form/sales/questions/staircase.rb +++ b/app/models/form/sales/questions/staircase.rb @@ -6,7 +6,6 @@ class Form::Sales::Questions::Staircase < ::Form::Question @header = "Is this a staircasing transaction?" @type = "radio" @answer_options = ANSWER_OPTIONS - @page = page @hint_text = "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" end diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb index 5afca794d..bdb5ac965 100644 --- a/app/models/form/sales/questions/staircase_bought.rb +++ b/app/models/form/sales/questions/staircase_bought.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question @check_answer_label = "Percentage bought in this staircasing transaction" @header = "What percentage of the property has been bought in this staircasing transaction?" @type = "numeric" - @page = page @width = 5 @min = 0 @max = 100 diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb index 0fa37ec7a..6f9e13b14 100644 --- a/app/models/form/sales/questions/staircase_owned.rb +++ b/app/models/form/sales/questions/staircase_owned.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::StaircaseOwned < ::Form::Question @check_answer_label = "Percentage the buyer now owns in total" @header = "What percentage of the property does the buyer now own in total?" @type = "numeric" - @page = page @width = 5 @min = 0 @max = 100 diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb index 0686d6610..24e20e5ca 100644 --- a/app/models/form/sales/questions/value.rb +++ b/app/models/form/sales/questions/value.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::Value < ::Form::Question @check_answer_label = "Full purchase price" @header = "What was the full purchase price?" @type = "numeric" - @page = page @min = 0 @width = 5 @prefix = "£"