Browse Source

Move collection start date logic to form handler

pull/1026/head
Kat 4 years ago
parent
commit
17fecefa25
  1. 5
      app/models/form_handler.rb
  2. 3
      app/models/location.rb
  3. 3
      app/models/scheme.rb

5
app/models/form_handler.rb

@ -49,6 +49,11 @@ class FormHandler
today < window_end_date ? today.year - 1 : today.year
end
def collection_start_date(date)
window_end_date = Time.zone.local(date.year, 4, 1)
date < window_end_date ? Time.zone.local(date.year - 1, 4, 1) : Time.zone.local(date.year, 4, 1)
end
def current_collection_start_date
Time.zone.local(current_collection_start_year, 4, 1)
end

3
app/models/location.rb

@ -372,8 +372,7 @@ class Location < ApplicationRecord
def available_from
return startdate if startdate.present?
window_end_date = Time.zone.local(created_at.year, 4, 1)
created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1)
FormHandler.instance.collection_start_date(created_at)
end
def status

3
app/models/scheme.rb

@ -210,8 +210,7 @@ class Scheme < ApplicationRecord
end
def available_from
window_end_date = Time.zone.local(created_at.year, 4, 1)
created_at < window_end_date ? Time.zone.local(created_at.year - 1, 4, 1) : Time.zone.local(created_at.year, 4, 1)
FormHandler.instance.collection_start_date(created_at)
end
def status

Loading…
Cancel
Save