diff --git a/app/helpers/collection_time_helper.rb b/app/helpers/collection_time_helper.rb index 5a59959e0..4381aa43a 100644 --- a/app/helpers/collection_time_helper.rb +++ b/app/helpers/collection_time_helper.rb @@ -46,7 +46,7 @@ module CollectionTimeHelper current_collection_start_date - 1.year end - def twice_previous_collection_start_year + def archived_collection_start_year current_collection_start_year - 2 end diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index e9f37fca0..8841a0d36 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -1,4 +1,6 @@ module FiltersHelper + include CollectionTimeHelper + def filter_selected?(filter, value, filter_type) return false unless session[session_name_for(filter_type)] @@ -96,7 +98,7 @@ module FiltersHelper { current_collection_start_year.to_s => year_combo(current_collection_start_year), previous_collection_start_year.to_s => year_combo(previous_collection_start_year), - twice_previous_collection_start_year.to_s => year_combo(twice_previous_collection_start_year), + archived_collection_start_year.to_s => year_combo(archived_collection_start_year), } end diff --git a/db/schema.rb b/db/schema.rb index 9e263472c..e6f2de905 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -303,7 +303,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_30_084707) do t.integer "scharge_value_check" t.integer "pscharge_value_check" t.integer "duplicate_set_id" - t.integer "accessible_register" t.integer "nationality_all" t.integer "nationality_all_group" t.index ["bulk_upload_id"], name: "index_lettings_logs_on_bulk_upload_id" diff --git a/spec/helpers/filters_helper_spec.rb b/spec/helpers/filters_helper_spec.rb index 46b4a981d..52a9595fc 100644 --- a/spec/helpers/filters_helper_spec.rb +++ b/spec/helpers/filters_helper_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -require "timecop" RSpec.describe FiltersHelper do describe "#filter_selected?" do