Updating the list view for dates and times.

Use same code as the event detail page for the event date and time
output. I also had to add the reccurrences into the event filter.

diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php
index 6c6ad00..70e89f4 100644 (file)
--- a/classes/data/dataRegEvent.php
+++ b/classes/data/dataRegEvent.php
@@ -386,6 +386,9 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
                 if ( isset( $eventData['member'] ) && $eventData['member'] ) {
                     $result_data['member'] = $eventData['member'];
                 }
+                if ( isset( $eventData['recurrences'] ) && $eventData['recurrences'] ) {
+                    $result_data['recurrences'] = $eventData['recurrences'];
+                }
             }
 
         }

diff --git a/js/frontRegApp.js b/js/frontRegApp.js
index 0acb594..c2cc602 100644 (file)
--- a/js/frontRegApp.js
+++ b/js/frontRegApp.js
@@ -98,6 +98,7 @@ app.Models.Front.RegClass = Backbone.Model.extend({
         reg_rate_name: '',
         reg_rate_base_price: '',
         reg_rate_per_reg: '',
+        registrant_credits: '',
         reg_count: 0,
         loggedIn: false,
         selectedTime: 0,

diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html
index 67d99e6..df87120 100644 (file)
--- a/views/front/registrations/list.html
+++ b/views/front/registrations/list.html
@@ -18,16 +18,59 @@
                 <strong> Dates/Times: </strong>
             </div>
             <div class="glm-columns glm-large-10">
-                {foreach $event.times as $time}
-                    {if $time.recur_name && $time.recur_name != 'Imported Event Schedule'}
-                    <strong>{$time.recur_name}</strong><br />
+                {$lastDate = ''}
+                {foreach $event.recurrences as $rec}
+
+                    {$eDate = $rec.from_date.timestamp|date_format:"%A, %B %e, %Y"}
+                    {if $eDate != $lastDate}
+                        {$lastDate = $eDate}
+                        <div>
+                        {if $event.recurrences.0.recurring.value == 1} Occurring {/if}
+
+                        {$eDate}
+                            {if $rec.from_date.date != $rec.to_date.date}
+                                - {$rec.to_date.timestamp|date_format:"%B %e, %Y"}
+                            {else if $rec.specific_dates}
+                                - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}
+                            {/if}
+
+
+                            {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
+                                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}
+
+                            {/if}
+
+                        </div>
+                    {/if}
+                    {if !$event.all_day}
+                        <div>
+                                {if $rec.start_time.time == $rec.end_time.time || $rec.start_time_only.value}
+                                    {$rec.start_time.time|strtotime|date_format:"%l:%M %P"}
+                                {else}
+                                    {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} - {$rec.end_time.time|strtotime|date_format:"%l:%M %P"}
+                                {/if}
+                                {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' }
+                                    {$rec.name}
+                                {/if}
+                                {if $expired} <span style="color:red;"> (Expired) </span> {/if}
+                        </div>
+                    {else}
+                        {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' }
+                            {$rec.name}
+                        {/if}
+
+                        {if $expired} <span style="color:red;"> (Expired) </span> {/if}
                     {/if}
-                    {$time.start_time.timestamp|date_format:"%A, %B %e, %Y"}
-                    {$time.start_time.timestamp|date_format:"%l:%M %P"}
-                    -
-                    {$time.end_time.timestamp|date_format:"%l:%M %P"}<br />
                 {/foreach}
-            </div>
+
+        </div>
         </div>
         {if $event.hide_address.name == 'No'}
             <div class="glm-row">