removing date picker from front end events widget for now. only showing

the next three upcoming events with no toggle capability

diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php
index 17561de..50a55be 100644 (file)
--- a/models/admin/ajax/eventsCalMonthAJAX.php
+++ b/models/admin/ajax/eventsCalMonthAJAX.php
@@ -81,7 +81,7 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
      * from within a given date range. Left out of the where statement because it is
      * already performed by $this->dateRange
      */
-    public function getModelTimesData(  )
+    public function getModelTimesData( )
     {
         $this->postAddTimes = true;
         $where = '';
@@ -126,23 +126,47 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
         $event_data = [];
 
         // this section is for a sidebar events widget, typically on a front page
-        if( isset( $_REQUEST['date_string'] ) ){
+        if( isset( $_REQUEST['date_string'] ) || isset($_REQUEST['all_events'] ) ){
             $image_url = GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/';
-        
-            $date = date_parse($_REQUEST['date_string']);
-            $month = $date['month'];
-            $year  = $date['year'];
+            if( isset( $_REQUEST['date_string'] ) ){
+                
+
+                $date = date_parse($_REQUEST['date_string']);
+                $month = $date['month'];
+                $year  = $date['year'];
 
-            $from     = date('Y-m-01', strtotime($year.'-'.$month."-01"));
-            $to   = date('Y-m-t', strtotime($year.'-'.$month."-01"));
+                $from     = date('Y-m-01', strtotime($year.'-'.$month."-01"));
+                $to   = date('Y-m-t', strtotime($year.'-'.$month."-01"));
 
-            $this->dateRangeTimes = "start_time BETWEEN CAST('{$from}' AS DATE) AND CAST('{$to}' as DATE) AND end_time >= CURDATE() ORDER BY start_time LIMIT 3";
+                $this->dateRangeTimes = "start_time BETWEEN CAST('{$from}' AS DATE) AND CAST('{$to}' as DATE) AND end_time >= CURDATE() ORDER BY start_time LIMIT 3";
 
-            $events = $this->getModelTimesData();
+                $events = $this->getModelTimesData();
+            } else if( isset( $_REQUEST['all_events'] ) ){
+
+                $this->dateRangeTimes = "end_time >= CURDATE() ORDER BY start_time LIMIT 3";
+                $events = $this->getModelTimesData();
+//                $sql = "SELECT * FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times WHERE end_time >= CURDATE() GROUP BY event ORDER BY start_time LIMIT 3;";
+//                $events = $wpdb->get_results($sql, 'ARRAY_A');
+                
+//                foreach($events_times as $times){
+//                    $sql = "SELECT * FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events WHERE id = " . $times->event.";";
+//                    $event[] = $wpdb->get_results($sql, 'ARRAY_A');
+//                }
+//                foreach($event as $ev){
+//                    foreach($ev as $e){
+//                        $events[] = $e;
+//                    }
+//                }
+            
+            }
+//                $this->dateRangeTimes = "AND end_time >= CURDATE() ORDER BY start_time LIMIT 3";
+//                $events = $this->getModelTimesData();
+                
+
+    
     
             $datesArray = array();
-            foreach($events as $event){
-//            
+            foreach($events as $event){        
                 $sql = "SELECT * FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events WHERE id = " . $event['event'];
 
                 $event_recur = $wpdb->get_results($sql);
@@ -234,7 +258,7 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
         $return = array(
 //            'status' => false,       // Assume nothing works
             'events'          => $event_data  ,    // Where our events list will go
-            'message'         => $datesArray,
+            'message'         => $image_url,
             'array_dates'     => $datesArray,
 //            'event'           => $dates
         );

diff --git a/views/front/events/sidebarEvents.html b/views/front/events/sidebarEvents.html
index 6b8ca6d..bff6b08 100644 (file)
--- a/views/front/events/sidebarEvents.html
+++ b/views/front/events/sidebarEvents.html
@@ -1,5 +1,5 @@
     <h1>Upcoming Events </h1>
-    <div id="sidebar-date-select" class="sidebar-datepicker"></div>
+    <div style="display:none;" id="sidebar-date-select" class="sidebar-datepicker"></div>
     <div class="sidebar-events">
         <div class="sidebar-events-overlay">
             <div class="sidebar-loading"></div>
@@ -92,7 +92,7 @@
         var dat = {
                 action: 'glm_members_admin_ajax',
                 glm_action: 'eventsCalMonthAJAX',
-                date_string: date_string
+                all_events: true
         };
         ajaxEvents(dat);