gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fix] Fix event_schedule#happening_now?

Browse source
This commit is contained in:
Jimmy 2021-03-31 08:34:04 +08:00
parent 455faed638
commit 010f72d42f
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/event_schedule.rb
View file

@ -55,13 +55,14 @@ class EventSchedule < ApplicationRecord
# True within `threshold` before and after the event. # True within `threshold` before and after the event.
# #
def happening_now?(threshold = 30.minutes) def happening_now?(threshold = 30.minutes)
return false if end_time < Time.now
# TODO: Save start_time with local timezone info when making an event schedule # TODO: Save start_time with local timezone info when making an event schedule
in_tz_start = start_time.in_time_zone(timezone) in_tz_start = start_time.in_time_zone(timezone)
in_tz_end = end_time.in_time_zone(timezone) in_tz_end = end_time.in_time_zone(timezone)
in_tz_start -= in_tz_start.utc_offset in_tz_start -= in_tz_start.utc_offset
in_tz_end -= in_tz_end.utc_offset in_tz_end -= in_tz_end.utc_offset
return false if in_tz_end < Time.now
begin_range = Time.now - threshold begin_range = Time.now - threshold
end_range = Time.now + threshold end_range = Time.now + threshold
event_time_range = in_tz_start..in_tz_end event_time_range = in_tz_start..in_tz_end