adding all_day parameter to the full calendar object

diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php
index 84c58f4..e357ebf 100644 (file)
--- a/models/admin/ajax/eventsCalMonthAJAX.php
+++ b/models/admin/ajax/eventsCalMonthAJAX.php
@@ -158,27 +158,23 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEvents
         )";
 
         $events= $this->getModelEventsData();
-
+//        var_dump($events);
         foreach ($events as $e=>$val){
-            $times[] = ($val['times']);
+//            $times[] = ($val['times']);
             $event_data[$e]['title'] = $val['name'];
             $event_data[$e]['url'] = GLM_MEMBERS_EVENTS_SITE_BASE_URL . "event-detail/" . $val['name_slug'] . "/";
             
             $start = date('Y-m-d h:i:s', strtotime($val['starting_date']));
             $last = date('Y-m-d h:i:s', strtotime($val['ending_date']));
             
+            $all_day = $val['all_day'];
+            
+            $event_data[$e]['all_day'] = ($all_day === "0" ? false : true);
             $event_data[$e]['start'] = ($start);
             $event_data[$e]['last'] = ($last);
 
         }
 
-        foreach($times as $t=>$val){
-            foreach($val as $v){
-
-            }
-        }
-
-
         $return = array(
             'status' => false,       // Assume nothing works
             'events' => $event_data,       // Where our events list will go

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 6e8cab7..9ec65db 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -69,12 +69,12 @@
         
         calendar.hide();
         
-        event_search.on("click", function (){
-            
-            rows.fadeIn("slow", function (){});
-            calendar.fadeOut("slow", function(){});
-            
-        });
+//        event_search.on("click", function (){
+//            
+//            rows.fadeIn("slow", function (){});
+//            calendar.fadeOut("slow", function(){});
+//            
+//        });
         // AJAX FUNCTION ************************************************
         // Get calendar month via AJAX
         function eventsCalMonthAJAX(month) {
@@ -96,15 +96,13 @@
                     var buildingEvents = [];
                     var events_obj = jQuery.parseJSON(response);
                     var events = events_obj.events;
-//                    console.log(events);
 
                     buildingEvents = $.map(events, function(i, val) {   
-//                        console.log(i.start);
                         return {   
                             title:   i.title,
                             start:   i.start,
                             end:     i.last,
-//                            allDay:  i.allDay,
+                            allDay:  i.all_day,
                             url:     i.url
                         };
                     });
@@ -114,36 +112,37 @@
             });
         }
         
-     // Calendar *****************************************************
-    $('#eventCalendar').fullCalendar({
-        viewRender: function (view, element){
-            post_start = view.start._d;
-            post_end = view.end._d;
-            {literal}month_obj = {start: view.start._d, last: view.end._d};{/literal}
-        },
-        header: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'month,agendaWeek,agendaDay'
-        },
-        dayClick: function(date, jsEvent, view) {
-            test = $('#eventCalendar').fullCalendar('getView').end;
-            console.log(test);
-            $('#eventCalendar').fullCalendar('changeView', 'agendaDay');
-            $('#eventCalendar').fullCalendar('gotoDate', date);
-        },
-        lazyFetching: true,
-        eventClick : function (event){
-            location.href = event.url;
-        },
-        nextDayThreshold: '00:00:00',
-        views: {
-            month: {
-                eventLimit: 4
+        // Calendar *****************************************************
+        $('#eventCalendar').fullCalendar({
+            viewRender: function (view, element){
+                post_start = view.start._d;
+                post_end = view.end._d;
+                {literal}month_obj = {start: view.start._d, last: view.end._d};{/literal}
+            },
+            header: {
+                left: 'prev,next today',
+                center: 'title',
+                right: 'month,agendaWeek,agendaDay'
+            },
+            dayClick: function(date, jsEvent, view) {
+                test = $('#eventCalendar').fullCalendar('getView').end;
+                console.log(test);
+                $('#eventCalendar').fullCalendar('changeView', 'agendaDay');
+                $('#eventCalendar').fullCalendar('gotoDate', date);
+            },
+            lazyFetching: true,
+            eventClick : function (event){
+                location.href = event.url;
+            },
+            nextDayThreshold: '00:00:00',
+            eventLimit: true,
+            views: {
+                month: {
+                    eventLimit: 4
+                }
             }
-        }
-    });
-    $("#glm-event-view-select").on("change", function (){
+        });
+        $("#glm-event-view-select").on("change", function (){
             if($("#glm-event-view-select option:selected").val() === "calendar"){
                 rows.fadeOut('slow', function(){});
 //                search.fadeOut('slow', function(){});
@@ -158,16 +157,12 @@
                 calendar.fadeOut('slow', function(){});
             }
         });
-    // initialize calendar with AJAX calls *************************************
-    var x = eventsCalMonthAJAX(month_obj);
-    $(document).on("click", "button.fc-button", function () {
+        
+        // initialize calendar with AJAX calls *************************************
         var x = eventsCalMonthAJAX(month_obj);
-    });
-
-    if (table == 'glm-table-calendar' && !fullCalendarLoaded) {
-
-        fullCalendarLoaded = true;
-    }
+        $(document).on("click", "button.fc-button", function () {
+            var x = eventsCalMonthAJAX(month_obj);
+        });
 
     });
 </script>