Browse Source

refactor: minor renaming

pull/2216/head
natdeanlewissoftwire 2 years ago
parent
commit
c11b372b7b
  1. 2
      app/helpers/collection_time_helper.rb
  2. 4
      app/helpers/filters_helper.rb
  3. 1
      db/schema.rb
  4. 1
      spec/helpers/filters_helper_spec.rb

2
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

4
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

1
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"

1
spec/helpers/filters_helper_spec.rb

@ -1,5 +1,4 @@
require "rails_helper"
require "timecop"
RSpec.describe FiltersHelper do
describe "#filter_selected?" do

Loading…
Cancel
Save