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

A better happening now, with admin debug on. LOL

Browse source
This commit is contained in:
Michael Ball 2020-07-31 10:58:37 -07:00
parent 61f5c9e0ee
commit 0b0518d67d
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/events_helper.rb
View file

@ -181,7 +181,7 @@ module EventsHelper
if current_user.roles.where(id: conference.roles).any? if current_user.roles.where(id: conference.roles).any?
# Show Pre-Event links for any memeber of the conference team. # Show Pre-Event links for any memeber of the conference team.
link_to("Join Live Event", link_to("Join Live Event (debug is now?: #{is_now})",
event.url, target: '_blank') event.url, target: '_blank')
elsif current_user.registered_to_event?(conference) elsif current_user.registered_to_event?(conference)
link_to('Join Live Event', event.url, target: '_blank') link_to('Join Live Event', event.url, target: '_blank')

8
app/models/event_schedule.rb
View file

@ -36,12 +36,16 @@ class EventSchedule < ApplicationRecord
# #
def happening_now?(threshold=30.minutes) def happening_now?(threshold=30.minutes)
in_tz_start = start_time.in_time_zone(timezone) in_tz_start = start_time.in_time_zone(timezone)
in_tz_end = start_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
begin_range = Time.now - threshold begin_range = Time.now - threshold
end_range = Time.now + threshold + 1.minute # The range is exclusive. end_range = Time.now + threshold + 1.minute # The range is exclusive.
(begin_range..end_range).include?(in_tz_start..in_tz_end) # || (begin_range..end_range).cover?(in_tz_end) # event_time_range = in_tz_start.strftime('%Y-%m-%d %H:%M')..in_tz_end.strftime('%Y-%m-%d %H:%M')
# now_range = begin_range.strftime('%Y-%m-%d %H:%M')..end_range.strftime('%Y-%m-%d %H:%M')
event_time_range = in_tz_start..in_tz_end
now_range = begin_range..end_range
event_time_range.overlaps?(now_range) # || (begin_range..end_range).cover?(in_tz_end)
end end
def self.withdrawn_or_canceled_event_schedules(schedule_ids) def self.withdrawn_or_canceled_event_schedules(schedule_ids)