adding days of the week for recurring events in agenda view

diff --git a/css/front.css b/css/front.css
index fe1389f..359dd14 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -285,7 +285,9 @@ a.fc-time-grid-event.fc-v-event {
 #eventCalendar .fc-view-container thead tr .fc-today{
     background: rgba(130,179,209,.6);
 }
-
+#eventCalendar .fc-view-container tbody .fc-today{
+    border: 1px red solid;
+}
 @media (max-width: 640px) and (min-width: 320px){
     .view-select{
         float: left;
@@ -296,10 +298,17 @@ a.fc-time-grid-event.fc-v-event {
         float: right;
     }
 }
-.event-name{
+.agenda-event-name{
     display: inline-block;
 }
-.absolute-dates{
+.agenda-event-recur-dates, .agenda-event-weekday{
     font-size: 13px;
     font-weight: bold;
+}
+span.agenda-event-weekday:first-child{
+    display: inline-block;
+    margin-left: 10px;
+}
+.agenda-days-of-week{
+    display:inline-block;
 }
\ No newline at end of file

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 05098cc..2f61bc1 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -501,8 +501,10 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             exit;
             break;
         default:
+            $this->postAddRecurrences = true;
             $view = 'agenda.html';
             $events = $this->getModelEventsData($categoryId, null, $memberId);
+            $this->postAddRecurrences = false;
 
 
             // Also get event times for calendar display
@@ -627,7 +629,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             $calendar_view = $calendar_view[0]['calendar_view'];
         }
 
-        print_r($calDates);
+//        print_r($calDates);
 //        echo "<pre>", print_r($eventsByDate), "</pre>";
         // Compile template data
         $templateData = array(

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index f85408e..3fb04bc 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -20,15 +20,27 @@
                             {foreach $events as $event}
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
-                                    <h2 class="event-name">{$event.name}</h2>                
-                                    <span class="absolute-dates">{$event.dates}</span>
+                                    <h2 class="agenda-event-name">{$event.name}</h2>                
+                                    <span class="agenda-event-recur-dates">{$event.dates}</span><br>
+                                     
                                     {if !$event.all_day}
                                         {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"}
-                                        <div>{$event.starting_date|date_format:"%l:%M %P"}</div>
+                                        <span class="agend-event-times">{$event.starting_date|date_format:"%l:%M %P"}</span>
                                         {else}
-                                        <div> {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}</div>
+                                        <span class="agend-event-times"> {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}</span>
                                         {/if}
                                     {/if}
+                                    {if $event.recurrences.0.day_of_week.names|@count < 7}
+                                    <div class="agenda-days-of-week">
+                                        {foreach $event.recurrences.0.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}
+                                    </div>
+                                    {/if}
                                     <div class="event-content hide clearfix">
                                         {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
                                         {$event.intro}
@@ -199,7 +211,7 @@
             eventsCalMonthAJAX(month_obj);
         });
         
-        var dates = $(".absolute-dates");
+        var dates = $(".agenda-event-recur-dates");
         dates.each( function (){
            if( $(this).text().indexOf('-') < 0 ){
                $(this).remove();