From 1c54d38094db97b5ba1c8d251274bf0c6670052c Mon Sep 17 00:00:00 2001 From: Jimmy Date: Fri, 19 Mar 2021 17:13:34 +0800 Subject: [PATCH] [fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient --- app/models/event_schedule.rb | 3 ++- app/views/schedules/happening_now.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb index 4585d993..3c52c499 100644 --- a/app/models/event_schedule.rb +++ b/app/models/event_schedule.rb @@ -55,9 +55,10 @@ class EventSchedule < ApplicationRecord # True within `threshold` before and after the event. # def happening_now?(threshold = 30.minutes) + return false if end_time < Time.now event_time_range = start_time..end_time now_range = (Time.now - threshold)..(Time.now + threshold) - event_time_range.overlaps?(now_range) && (end_time > Time.now) + event_time_range.overlaps?(now_range) end def self.withdrawn_or_canceled_event_schedules(schedule_ids) diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml index 0704b30e..537727c3 100644 --- a/app/views/schedules/happening_now.haml +++ b/app/views/schedules/happening_now.haml @@ -12,7 +12,7 @@ %h3 This page was loaded at = inyourtz(Time.now) do - Time.now.strftime('%a %b %d at %I:%M %P (%z)').to_s + #{Time.now.strftime('%a %b %d at %I:%M %P (%z)').to_s} .row / TODO: Clean this up, merge with all events page.