Work on sorting events for agenda view

had to add another array level so the events can be sorted properly.

diff --git a/models/front/events/list.php b/models/front/events/list.php
index c45a8bf..cbd4f93 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -393,7 +393,7 @@ 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();
+        $eventsByDate = $mainEvents = array();
         if ($events) {
             foreach ( $events as $event ) {
                 foreach ( $event['times'] as $eventTime ) {
@@ -407,18 +407,24 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     );
                     $event['starting_date'] = $eventTime['start_time']['timestamp'];
                     $event['ending_date']   = $eventTime['end_time']['timestamp'];
-                    $eventsByDate[$eventDateTime][$eventTime['start_time']['timestamp']] = $event;
+                    //$eventsByDate[$eventDateTime][$eventTime['start_time']['timestamp']][] = $event;
+                    $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' ) {
                         break;
                     }
                 }
             }
+
             ksort($eventsByDate);
-            foreach ($eventsByDate as &$eventDate ) {
-                ksort($eventDate);
+            foreach ($eventsByDate as $eventDate => $events ) {
+                foreach ( $events as &$times ) {
+                    ksort($times);
+                } 
             }
         }
+        //echo '<pre>' . print_r($events, true) . '</pre>';
+        //exit;
         //echo '<pre>' . print_r($eventsByDate, true) . '</pre>';
         //exit;
 

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 705c96f..d3599f2 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -42,7 +42,7 @@
                     </div>
                 </div>
             </form>
-            {foreach $eventsByDate as $date => $events}
+            {foreach $eventsByDate as $date => $key}
                 <div class="row glm-event-day-row">
                     <div class="small-4 medium-3 large-2 columns">
                         <div class="glm-event-cal">
@@ -54,24 +54,26 @@
                         </div>
                     </div>
                     <div class="small-8 medium-9 large-10 columns">
-                        {foreach $events as $event}
-                        <div class="row glm-event-day-event">
-                            <div class="small-12 column">
-                                <h2>{$event.name}</h2>
-                                {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}
-                                    {$event.intro}
-                                    <div>
-                                        <a class="glm-read-more" href="{$siteBaseUrl}event-detail/{$event.name_slug}/?glm_event_from={$fromDate|unescape:"html"}">Read More</a>
+                        {foreach $key as $events}
+                            {foreach $events as $event}
+                            <div class="row glm-event-day-event">
+                                <div class="small-12 column">
+                                    <h2>{$event.name}</h2>
+                                    {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}
+                                        {$event.intro}
+                                        <div>
+                                            <a class="glm-read-more" href="{$siteBaseUrl}event-detail/{$event.name_slug}/?glm_event_from={$fromDate|unescape:"html"}">Read More</a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                            {/foreach}
                         {/foreach}
                     </div>
                 </div>

diff --git a/views/front/events/shortCuts.html b/views/front/events/shortCuts.html
index 4b26f7b..c8b9f51 100644 (file)
--- a/views/front/events/shortCuts.html
+++ b/views/front/events/shortCuts.html
@@ -3,7 +3,7 @@
             <li><a href="{$currentUrl}?t=today" class="shortcuts-button">Today's Events</a></li>
             <li><a href="{$currentUrl}?t=tomorrow" class="shortcuts-button">Tomorrow's Events</a></li>
             <li><a href="{$currentUrl}?t=nextseven" class="shortcuts-button">Next 7 Days</a></li>
-            <li><a href="#" class="shortcuts-button">Add an Event</a></li>
+            <!-- <li><a href="#" class="shortcuts-button">Add an Event</a></li>-->
         </ul>
     </div>