From 02d2521427a7e182076b902bcbe77eb13a5215aa Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Apr 2016 12:24:36 -0400
Subject: [PATCH] Updates for front end

Output the time into the detail event pages.
Sort the list of event by the day so they are order by times.
---
 models/admin/management/events.php |  2 +-
 models/front/events/list.php       | 10 ++++++++--
 views/front/events/agenda.html     |  9 ++++-----
 views/front/events/detail.html     |  7 +++++++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/models/admin/management/events.php b/models/admin/management/events.php
index da1816c..f7157f8 100644
--- a/models/admin/management/events.php
+++ b/models/admin/management/events.php
@@ -807,7 +807,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                 if ( $etime ) {
                     $etime = $event['bdate'] . ' ' . $etime;
                 } else {
-                    $etime = $btime;
+                    $etime = $event['bdate'];
                 }
                 $recurData =array(
                     'event'             => $eventId,
diff --git a/models/front/events/list.php b/models/front/events/list.php
index f302fd0..74fe2ea 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -388,19 +388,22 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         }
 
         // group the events by the starting date
+        //echo '<pre>' . print_r($events, true) . '</pre>';
+        //exit;
         $eventsByDate = array();
         if ($events) {
             foreach ( $events as $event ) {
                 foreach ( $event['times'] as $eventTime ) {
                     $eventDateTime = mktime(
-                        0, 0, 0,
+                        0, 
+                        0, 
+                        0,
                         date('n', $eventTime['start_time']['timestamp']),
                         date('j', $eventTime['start_time']['timestamp']),
                         date('Y', $eventTime['start_time']['timestamp'])
                     );
                     $event['starting_date'] = $eventTime['start_time']['timestamp'];
                     $event['ending_date']   = $eventTime['end_time']['timestamp'];
-                    $event['hasSameTimes']  = ($event['starting_date'] == $event['ending_date']) ? 1 : 0;
                     $eventsByDate[$eventDateTime][$eventTime['start_time']['timestamp']] = $event;
                     // if there's a name search stop for the first occurrence of that event
                     if ( $action == 'event-list-name' ) {
@@ -409,6 +412,9 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 }
             }
             ksort($eventsByDate);
+            foreach ($eventsByDate as &$eventDate ) {
+                ksort($eventDate);
+            }
         }
         //echo '<pre>' . print_r($eventsByDate, true) . '</pre>';
         //exit;
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 4a1bcfd..2cd5dc3 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -58,11 +58,10 @@
                         <div class="row glm-event-day-event">
                             <div class="small-12 column">
                                 <h2>{$event.name}</h2>
-                                {if !$event.hasSameTimes}
-                                {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
-                                {/if}
-                                {if $event.hasSameTimes}
-                                {$event.starting_date|date_format:"%l %P"}
+                                {if $event.starting_date|date_format:"%l %P" == $event.ending_date|date_format:"%l %P"}
+                                    {$event.starting_date|date_format:"%l %P"}
+                                {else}
+                                    {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
                                 {/if}
                                 <div class="event-content hide clearfix">
                                     {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index 7640db9..e90a8bb 100644
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -35,6 +35,13 @@
                 <div class="small-{if $event.locations}7{else}12{/if} column">
                     <div class="row">
                         <div class="small-12 column"><strong>{$event.dates}</strong></div>
+                        <div class="small-12 column">
+                        {if $event.starting_date|date_format:"%l %P" == $event.ending_date|date_format:"%l %P"}
+                            {$event.starting_date|date_format:"%l %P"}
+                        {else}
+                            {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
+                        {/if}
+                        </div>
                         <div class="small-12 column">
                             {if $event.locations.name}{$event.locations.name}<br>{/if}
                             {$event.locations.address}<br>
-- 
2.17.1