Fix the output for recurring schedule.

Find the recurring schedule that matches the correct time for the event
in the agenda view.

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index dd8bfb5..271b393 100644 (file)
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -571,7 +571,7 @@ class GlmDataEvents extends GlmDataAbstract
             $r['recurrences'] = array();
             include_once  GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataRecurrences.php';
             $recurrenceData = new GlmDataEventsRecurrences( $this->wpdb, $this->config );
-            $recurrenceData->fields['start_time']['time_format'] = 'g:i a';
+            //$recurrenceData->fields['start_time']['time_format'] = 'g:i a';
             $where = "T.event = {$r['id']}";
             $recurrences = $recurrenceData->getList( $where );
             if ( !empty( $recurrences ) ) {

diff --git a/models/front/events/list.php b/models/front/events/list.php
index a3210b6..6a87c0f 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -578,7 +578,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;
+
                         if ( $event['all_day'] ) {
                             $eventsByDate[$eventDateTime][][$eventDateTime . '-' . $event['id']] = $event;
                         } else {

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index cc9b86c..ecdf673 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -21,17 +21,20 @@
                                 {$showTime = true}
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
-                                        <h2 class="agenda-event-name">{$event.name}</h2>
+                                    <h2 class="agenda-event-name">{$event.name}</h2>
+                                    {$eventDateTime = $event.starting_date|date_format:"%I:%M %P"}
                                         {foreach $event.recurrences as $rec}
+                                            {$start_time = $rec.start_time.time}
+                                            {if $start_time == $eventDateTime}
                                                 {if ($rec.from_date.timestamp == $rec.to_date.timestamp && $rec.from_date.timestamp == $date)
                                                 or ($date <= $rec.to_date.timestamp && $date >= $rec.from_date.timestamp )}
                                                     <div class='date-range-container'>
                                                         {if !$event.all_day}
                                                             {$showTime = false}
-                                                            {if $rec.start_time.time == $rec.end_time.time}
-                                                                {$rec.start_time.time}
+                                                            {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}
-                                                                {$rec.start_time.time} - {$rec.end_time.time}                                                                                                                                 {/if}
+                                                                {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}                                                           {/if}
                                                         {/if}
                                                         {if $rec.name && $rec.name != 'Imported'}
                                                             {$rec.name}
@@ -60,6 +63,7 @@
                                                      )
                                                     </div>
                                                 {/if}
+                                            {/if}
                                         {/foreach}
                                     <div class="day-times-wrapper">
                                         {if !$event.all_day && $showTime}