From 0b0518d67d742a8752b8e11e17785528d4cf6d3b Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Fri, 31 Jul 2020 10:58:37 -0700 Subject: [PATCH] A better happening now, with admin debug on. LOL --- app/helpers/events_helper.rb | 2 +- app/models/event_schedule.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index cb1d1652..80bb3ae3 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -181,7 +181,7 @@ module EventsHelper if current_user.roles.where(id: conference.roles).any? # 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') elsif current_user.registered_to_event?(conference) link_to('Join Live Event', event.url, target: '_blank') diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index 6e3ec4f8..7a7d39de 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -36,12 +36,16 @@ class EventSchedule < ApplicationRecord # def happening_now?(threshold=30.minutes) 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_end -= in_tz_end.utc_offset begin_range = Time.now - threshold 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 def self.withdrawn_or_canceled_event_schedules(schedule_ids)