From 0066a2a7124b9cb2cb3c62d87bcfeeef12bc79c0 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 20 May 2025 15:40:09 +0100 Subject: [PATCH] explicitly write out years for clarity --- app/models/form/sales/questions/managing_organisation.rb | 4 +++- app/models/form/sales/questions/owning_organisation_id.rb | 2 +- app/models/form/sales/questions/sale_date.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/form/sales/questions/managing_organisation.rb b/app/models/form/sales/questions/managing_organisation.rb index b68a359d7..2079f37f5 100644 --- a/app/models/form/sales/questions/managing_organisation.rb +++ b/app/models/form/sales/questions/managing_organisation.rb @@ -4,7 +4,7 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question @id = "managing_organisation_id" @derived = true @type = "select" - @question_number = 2 + @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end def answer_options(log = nil, user = nil) @@ -71,4 +71,6 @@ private def selected_answer_option_is_derived?(_log) true end + + QUESTION_NUMBER_FROM_YEAR = { 2024 => 2, 2025 => 2 }.freeze end diff --git a/app/models/form/sales/questions/owning_organisation_id.rb b/app/models/form/sales/questions/owning_organisation_id.rb index faf72e59e..54afdb123 100644 --- a/app/models/form/sales/questions/owning_organisation_id.rb +++ b/app/models/form/sales/questions/owning_organisation_id.rb @@ -93,5 +93,5 @@ private "#{name} (inactive as of #{merge_date.to_fs(:govuk_date)})" end - QUESTION_NUMBER_FROM_YEAR = { 2023 => nil, 2024 => 1 }.freeze + QUESTION_NUMBER_FROM_YEAR = { 2023 => nil, 2024 => 1, 2025 => 1 }.freeze end diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb index 00f0c86dd..a60a5eddf 100644 --- a/app/models/form/sales/questions/sale_date.rb +++ b/app/models/form/sales/questions/sale_date.rb @@ -6,5 +6,5 @@ class Form::Sales::Questions::SaleDate < ::Form::Question @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end - QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 3 }.freeze + QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 3, 2025 => 3 }.freeze end