Update for the sorting of Agenda view events

Fixing the times sort for each day.

diff --git a/models/admin/management/events.php b/models/admin/management/events.php
index f7157f8..c94c60f 100644 (file)
--- a/models/admin/management/events.php
+++ b/models/admin/management/events.php
@@ -760,9 +760,9 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                     );
                 }
                 // recurrences for the event
-                $allDates  = !$event['reacur'];
-                if ( !$allDates && ( $event['bdate'] == $event['edate'] ) ) {
-                    $allDates = 1;
+                $allDates  = $event['reacur'];
+                if ( $allDates && ( $event['bdate'] == $event['edate'] ) ) {
+                    $allDates = 0;
                 }
                 $allDay    = $event['all_day'];
                 $dayOfWeek =
@@ -770,7 +770,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                 $weekOfMonth =
                 $byDayOfMonth =
                 $lastDayOfMonth = null;
-                if ( !$allDates ) {
+                if ( $allDates ) {
                     if ( $event['daysow'] ) {
                         $dayOfWeek = $event['daysow'];
                     }
@@ -798,17 +798,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                     $monthOfYear = 4095;
                 }
                 $btime = $this->getTime($event['btime']);
-                if ( $btime ) {
-                    $btime = $event['bdate'] . ' ' . $btime;
-                } else {
-                    $btime = $event['bdate'];
-                }
                 $etime = $this->getTime($event['etime']);
-                if ( $etime ) {
-                    $etime = $event['bdate'] . ' ' . $etime;
-                } else {
-                    $etime = $event['bdate'];
-                }
                 $recurData =array(
                     'event'             => $eventId,
                     'start_time'        => $btime,
@@ -823,6 +813,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                     'by_day_of_month'   => $byDayOfMonth,
                     'last_day_of_month' => $lastDayOfMonth
                 );
+                //echo '<pre>' . print_r( $recurData, true) . '</pre>';
                 echo '<pre>$recurData: ' . print_r($recurData, true) . '</pre>';
                 $this->wpdb->insert(
                     GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . 'recurrences',

diff --git a/models/front/events/list.php b/models/front/events/list.php
index cbd4f93..a3cb568 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -245,8 +245,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                             $eventDates .=  ' (' . implode(', ', $event['recurrences'][0]['day_of_week']['names']) . ')';
                         }
                     }
-                    $startTime = strftime( "%l %P", strtotime( $event['starting_date'] ) );
-                    $endTime   = strftime( "%l %P", strtotime( $event['ending_date'] ) );
+                    $startTime = strftime( "%l:%M %P", strtotime( $event['starting_date'] ) );
+                    $endTime   = strftime( "%l:%M %P", strtotime( $event['ending_date'] ) );
                     if ( $startTime != $endTime ) {
                         $eventDates .= " {$startTime} - {$endTime}";
                     } else {
@@ -391,8 +391,6 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         }
 
         // group the events by the starting date
-        //echo '<pre>' . print_r($events, true) . '</pre>';
-        //exit;
         $eventsByDate = $mainEvents = array();
         if ($events) {
             foreach ( $events as $event ) {
@@ -408,7 +406,7 @@ 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][][$event['starting_date']] = $event;
                     // if there's a name search stop for the first occurrence of that event
                     if ( $action == 'event-list-name' ) {
                         break;
@@ -417,16 +415,18 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             }
 
             ksort($eventsByDate);
-            foreach ($eventsByDate as $eventDate => $events ) {
-                foreach ( $events as &$times ) {
-                    ksort($times);
+            foreach ($eventsByDate as $eventDate => &$eventgroup ) {
+                foreach ( $eventgroup as $key => &$events ) {
+                    $i = 0;
+                    foreach ( $events as $time => $times ) {
+                        ++$i;
+                        $mainEvents[$eventDate][$i][$time] = $times;
+                        ksort($mainEvents[$eventDate][$i]);
+                    }
                 } 
             }
+            $eventsByDate = $mainEvents;
         }
-        //echo '<pre>' . print_r($events, true) . '</pre>';
-        //exit;
-        //echo '<pre>' . print_r($eventsByDate, true) . '</pre>';
-        //exit;
 
         // Compile template data
         $templateData = array(

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index d3599f2..b145114 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -59,10 +59,10 @@
                             <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"}
+                                    {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"}
+                                        {$event.starting_date|date_format:"%l:%M %P"}
                                     {else}
-                                        {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
+                                        {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %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 bfd3bd6..363c41f 100644 (file)
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -36,10 +36,10 @@
                     <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"}
+                            {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"}
+                                {$event.starting_date|date_format:"%l:%M %P"}
                             {else}
-                                {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
+                                {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
                             {/if}
                         </div>
                         {if $event.hide_address.name == 'No' }