From 32ef4a294b3931e473603e68c70beb58f8a784cf Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 29 Jul 2020 22:42:45 -0700 Subject: [PATCH] GDI...typo. --- app/helpers/events_helper.rb | 3 ++- app/models/event_schedule.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index a5846074..47970a85 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -177,7 +177,8 @@ module EventsHelper return unless event.url.present? && current_user conference = event.conference - is_today = event.time&.in_time_zone(c.timezone).to_date == conference.current_conference_day + is_today = event.time&.in_time_zone(conference.timezone).to_date + == conference.current_conference_day if current_user.roles.where(id: conference.roles).any? # Show Pre-Event links for any memeber of the conference team. diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index 7c537285..01f80b51 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -27,6 +27,15 @@ class EventSchedule < ApplicationRecord delegate :guid, to: :room, prefix: true + delegate :timezone, to: event + + ## + # True within 1 hour before and after the event. + # + def happening_now?(threshold=1.hour) + false + end + def self.withdrawn_or_canceled_event_schedules(schedule_ids) EventSchedule .unscoped