Updating event agenda and detail views

Updating how the event dates and times are outputting.

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index db4f34d..dd8bfb5 100644 (file)
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -571,6 +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';
             $where = "T.event = {$r['id']}";
             $recurrences = $recurrenceData->getList( $where );
             if ( !empty( $recurrences ) ) {

diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php
index d292ba7..9d62c0e 100644 (file)
--- a/models/front/events/baseAction.php
+++ b/models/front/events/baseAction.php
@@ -441,7 +441,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
                 'timestamp'
             );
         }
-        $event['recurDays'] = $this->getEventRecurDays( $event );
+        $event['recurDays'] = $this->getEventRecurDays( $event ).' ';
         $this->postAddTimes     = false;
         $this->postAddLocations = false;
         return $event;

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index d9a89e0..dbafa78 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -18,40 +18,53 @@
                     <div class="small-12 medium-10 columns">
                         {foreach $key as $events}
                             {foreach $events as $event}
+                                {$showTime = true}
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
                                         <h2 class="agenda-event-name">{$event.name}</h2>
                                         {foreach $event.recurrences as $rec}
-                                            {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'>
-                                                    ( Occurring {$rec.from_date.date} <span class="agenda-event-recur-dates">
-                                                      {if $rec.from_date.date != $rec.to_date.date}
-                                                        - {$rec.to_date.date}
-                                                       {else if $rec.specific_dates}
-                                                        - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"}
-                                                      {/if}
-                                                    </span>
+                                            {if $rec.start_time.time == $event.starting_date|date_format:"%I:%M %P"}
+                                                {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 $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:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}                                                                                   {/if}
+                                                        {/if}
+                                                        {if $rec.name && $rec.name != 'Imported'}
+                                                            {$rec.name}
+                                                        {/if}
+                                                        ( Occurring {$rec.from_date.date} <span class="agenda-event-recur-dates">
+                                                          {if $rec.from_date.date != $rec.to_date.date}
+                                                            - {$rec.to_date.date}
+                                                           {else if $rec.specific_dates}
+                                                            - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"}
+                                                          {/if}
+                                                        </span>
+
+                                                    {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
+                                                    <span class="agenda-days-of-week">
+                                                        on
+                                                        {foreach $rec.day_of_week.names as $day}
+                                                        {if $day == "Thursday"}
+                                                            <span class="agenda-event-weekday"> {$day|substr:0:4} </span>
+                                                         {else}
+                                                            <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
+                                                         {/if}
+                                                         {/foreach}
 
-                                                {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
-                                                <span class="agenda-days-of-week">
-                                                    on
-                                                    {foreach $rec.day_of_week.names as $day}
-                                                    {if $day == "Thursday"}
-                                                        <span class="agenda-event-weekday"> {$day|substr:0:4} </span>
-                                                     {else}
-                                                        <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
-                                                     {/if}
-                                                     {/foreach}
-
-                                                </span>
+                                                    </span>
+                                                    {/if}
+                                                     )
+                                                    </div>
                                                 {/if}
-                                                 )
-                                                </div>
                                             {/if}
                                         {/foreach}
                                     <div class="day-times-wrapper">
-                                        {if !$event.all_day}
+                                        {if !$event.all_day && $showTime}
                                             {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"}
                                             <div class="agenda-event-times">{$event.starting_date|date_format:"%l:%M %P"}</div>
                                             {else}
@@ -63,7 +76,7 @@
                                         {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}/{if $event.recurrences.0.recurring.value}?glm_event_from={$date|date_format:"%m/%d/%Y"|escape:"url"}{/if}">Read More</a>
+                                            <a class="glm-read-more" href="{$siteBaseUrl}event-detail/{$event.name_slug}/">Read More</a>
                                         </div>
                                     </div>
                                 </div>

diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index 2575515..1d651ca 100644 (file)
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -59,17 +59,45 @@
                         {/if}
                         <div class="small-12 medium-{if $event.locations || $event.use_member_location.value || $event.other_ref_dest}7{else}12{/if} column">
                             <div id="glm-event-detail-dates">
-                                <div>
-                                    <strong>{$event.dates}</strong>
-                                    {if $expired} <span style="color:red;">(Expired)</span>{/if}
-                                </div>
-                                {if !$event.all_day}
-                                    {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:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
+                                {foreach $event.recurrences as $rec}
+                                    <div>
+                                    <span>
+                                    {if !$event.all_day}
+                                        {if $rec.start_time.time == $rec.end_time.time}
+                                            {$rec.start_time.time}
+                                        {else}
+                                            {$rec.start_time.time} - {$rec.end_time.time}
+                                        {/if}
                                     {/if}
-                                {/if}
+                                    </span>
+                                    {if $rec.name && $rec.name != 'Imported'}
+                                        {$rec.name}
+                                    {/if}
+                                    ( Occurring
+                                    {$rec.from_date.timestamp|date_format:"%m/%d/%Y"}
+                                      {if $rec.from_date.date != $rec.to_date.date}
+                                        - {$rec.to_date.timestamp|date_format:"%m/%d/%Y"}
+                                       {else if $rec.specific_dates}
+                                        - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"}
+                                      {/if}
+
+                                    {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
+                                    <span class="agenda-days-of-week">
+                                        on
+                                        {foreach $rec.day_of_week.names as $day}
+                                        {if $day == "Thursday"}
+                                            <span> {$day|substr:0:4} </span>
+                                         {else}
+                                            <span> {$day|substr:0:3} </span>
+                                         {/if}
+                                         {/foreach}
+
+                                    </span>
+                                    {/if}
+                                      )
+                                        {if $expired} <span style="color:red;"> (Expired) </span> {/if}
+                                    </div>
+                                {/foreach}
                             </div>
                             {if $event.hide_address.name == 'No'}
                                 {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)}