From 61f5c9e0eea19494aa56ae3248165f63422748c5 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Fri, 31 Jul 2020 10:26:23 -0700
Subject: [PATCH] More consistent happening now formatting

---
 app/models/event_schedule.rb           |  2 +-
 app/views/schedules/happening_now.haml | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb
index 12eeb30c..6e3ec4f8 100644
--- a/app/models/event_schedule.rb
+++ b/app/models/event_schedule.rb
@@ -41,7 +41,7 @@ class EventSchedule < ApplicationRecord
     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).cover?(in_tz_start) || (begin_range..end_range).cover?(in_tz_end)
+    (begin_range..end_range).include?(in_tz_start..in_tz_end) # || (begin_range..end_range).cover?(in_tz_end)
   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 7c7f543f..3e766751 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -31,9 +31,28 @@
 
   .row
     / scheduled events
+    - date = nil
+    - time = nil
     - @events_schedules.each do |event_schedule|
-      .col-xs-12.col-md-11.col-md-offset-1
-        = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }
+      - unless event_schedule.start_time.strftime('%Y-%m-%d').eql?(date)
+        .col-xs-12.col-md-12
+          .date-content
+            %span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" }
+              = inyourtz(event_schedule.start_time, @conference.timezone) do
+                = date = event_schedule.start_time.strftime('%Y-%m-%d')
+            %a{ title: "Go up", class: "pull-right", href: "#program" }
+              %i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
+      - unless event_schedule.start_time.strftime('%H:%M').eql?(time)
+        .col-xs-12.col-md-1
+          .start-time
+            = inyourtz(event_schedule.start_time, @conference.timezone) do
+              = time = event_schedule.start_time.strftime('%H:%M')
+        .col-xs-12.col-md-11
+          .new-time-event
+            = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }
+      - else
+        .col-xs-12.col-md-11.col-md-offset-1
+          = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }
 
 :javascript
   // Go to current date and time