CLDC-4402: lettings pages

app/models/form/lettings/pages/lead_tenant_nationality.rb

@@ -2,18 +2,14 @@ class Form::Lettings::Pages::LeadTenantNationality < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_nationality"
-    @copy_key = "lettings.household_characteristics.#{form.start_year_2024_or_later? ? 'nationality_all' : 'national'}"
+    @copy_key = "lettings.household_characteristics.nationality_all"
     @depends_on = [{ "declaration" => 1 }]
   end
 
   def questions
-    @questions ||= if form.start_year_2024_or_later?
+    @questions ||= [
-                     [
+      Form::Lettings::Questions::NationalityAllGroup.new(nil, nil, self),
-                       Form::Lettings::Questions::NationalityAllGroup.new(nil, nil, self),
+      Form::Lettings::Questions::NationalityAll.new(nil, nil, self),
-                       Form::Lettings::Questions::NationalityAll.new(nil, nil, self),
+    ]
-                     ]
-                   else
-                     [Form::Lettings::Questions::Nationality.new(nil, nil, self)]
-                   end
   end
 end

app/models/form/lettings/pages/uprn.rb

@@ -14,20 +14,12 @@ class Form::Lettings::Pages::Uprn < ::Form::Page
   end
 
   def skip_text
-    if form.start_year_2024_or_later?
+    "Search for address instead"
-      "Search for address instead"
-    else
-      "Enter address instead"
-    end
   end
 
   def skip_href(log = nil)
     return unless log
 
-    if form.start_year_2024_or_later?
+    "address-matcher"
-      "address-matcher"
-    else
-      "address"
-    end
   end
 end

app/models/form/lettings/questions/nationality.rb

@@ -1,23 +0,0 @@
-class Form::Lettings::Questions::Nationality < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "national"
-    @type = "radio"
-    @check_answers_card_number = 1
-    @answer_options = ANSWER_OPTIONS
-    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
-  end
-
-  ANSWER_OPTIONS = {
-    "18" => { "value" => "United Kingdom" },
-    "17" => { "value" => "Republic of Ireland" },
-    "19" => { "value" => "European Economic Area (EEA) country, excluding Ireland" },
-    "20" => { "value" => "Afghanistan" },
-    "21" => { "value" => "Ukraine" },
-    "12" => { "value" => "Other" },
-    "divider" => true,
-    "13" => { "value" => "Tenant prefers not to say" },
-  }.freeze
-
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 34 }.freeze
-end