From e78862437d6019de4a66a6682741632985413521 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 1 May 2017 16:09:45 -0400
Subject: [PATCH] removing unecessary code from the ajax-search queries and
 testing the ajax speed by removing the js code

trying to figure out of the ajax calls are slow because of the network or
the pending js operations that are done during the success functions
---
 js/app.js                 | 32 ++++++++++----------
 js/custom/headerSearch.js | 32 ++++++++++----------
 lib/ajax-search.php       | 61 ++-------------------------------------
 3 files changed, 35 insertions(+), 90 deletions(-)

diff --git a/js/app.js b/js/app.js
index 8915939..aa970a2 100644
--- a/js/app.js
+++ b/js/app.js
@@ -123,7 +123,7 @@ $(document).ready(function () {
                 others: {'destination' : $('#destination-search option:selected').val(), 'park' : $('#park-search option:selected').val()}
 
             },
-             complete: console.log("done"),
+            complete: console.log("done"),
             success:function(data){
                var activity_data = data;
 
@@ -220,31 +220,31 @@ $(document).ready(function () {
             },
              complete: console.log("done"),
             success:function(data){
+                console.log("SUCCESS");
                var destination_data = data;
                 option = {};
                 $('#activity-search option').not(':eq(0), :selected').remove();
                 var selected = $('#activity-search option:selected').val();
 //               counties.append($('<option>', {value: 'default', text: 'County', 'data-taxonomy': 'default'}));
-                $.each(destination_data.categories.Activities,function(index,value){
-                    if(value.category !== selected){
-                        var option = $('<option>', {value: value.category, text: value.name});
-                        option.attr('data-id', value.id);
-                        activities.append(option);
-                    }
-                });
+//                $.each(destination_data.categories.Activities,function(index,value){
+//                    if(value.category !== selected){
+//                        var option = $('<option>', {value: value.category, text: value.name});
+//                        option.attr('data-id', value.id);
+//                        activities.append(option);
+//                    }
+//                });
                 option = {};
                 $('#park-search option').not(':eq(0), :selected').remove();
                 var selected = $('#park-search option:selected').val();
      
 //               counties.append($('<option>', {value: 'default', text: 'County', 'data-taxonomy': 'default'}));
-                $.each(destination_data.categories.Parks,function(index,value){
-                    if(value.category !== selected){
-                        var option = $('<option>', {value: value.category, text: value.name});
-                        option.attr('data-id', value.id);
-                        parks.append(option);
-                    }
-                });
-
+//                $.each(destination_data.categories.Parks,function(index,value){
+//                    if(value.category !== selected){
+//                        var option = $('<option>', {value: value.category, text: value.name});
+//                        option.attr('data-id', value.id);
+//                        parks.append(option);
+//                    }
+//                });
             }
         });
     });
diff --git a/js/custom/headerSearch.js b/js/custom/headerSearch.js
index e4efd24..4205636 100644
--- a/js/custom/headerSearch.js
+++ b/js/custom/headerSearch.js
@@ -114,7 +114,7 @@ $(document).ready(function () {
                 others: {'destination' : $('#destination-search option:selected').val(), 'park' : $('#park-search option:selected').val()}
 
             },
-             complete: console.log("done"),
+            complete: console.log("done"),
             success:function(data){
                var activity_data = data;
 
@@ -211,31 +211,31 @@ $(document).ready(function () {
             },
              complete: console.log("done"),
             success:function(data){
+                console.log("SUCCESS");
                var destination_data = data;
                 option = {};
                 $('#activity-search option').not(':eq(0), :selected').remove();
                 var selected = $('#activity-search option:selected').val();
 //               counties.append($('<option>', {value: 'default', text: 'County', 'data-taxonomy': 'default'}));
-                $.each(destination_data.categories.Activities,function(index,value){
-                    if(value.category !== selected){
-                        var option = $('<option>', {value: value.category, text: value.name});
-                        option.attr('data-id', value.id);
-                        activities.append(option);
-                    }
-                });
+//                $.each(destination_data.categories.Activities,function(index,value){
+//                    if(value.category !== selected){
+//                        var option = $('<option>', {value: value.category, text: value.name});
+//                        option.attr('data-id', value.id);
+//                        activities.append(option);
+//                    }
+//                });
                 option = {};
                 $('#park-search option').not(':eq(0), :selected').remove();
                 var selected = $('#park-search option:selected').val();
      
 //               counties.append($('<option>', {value: 'default', text: 'County', 'data-taxonomy': 'default'}));
-                $.each(destination_data.categories.Parks,function(index,value){
-                    if(value.category !== selected){
-                        var option = $('<option>', {value: value.category, text: value.name});
-                        option.attr('data-id', value.id);
-                        parks.append(option);
-                    }
-                });
-
+//                $.each(destination_data.categories.Parks,function(index,value){
+//                    if(value.category !== selected){
+//                        var option = $('<option>', {value: value.category, text: value.name});
+//                        option.attr('data-id', value.id);
+//                        parks.append(option);
+//                    }
+//                });
             }
         });
     });
diff --git a/lib/ajax-search.php b/lib/ajax-search.php
index 530a923..0584b82 100644
--- a/lib/ajax-search.php
+++ b/lib/ajax-search.php
@@ -191,24 +191,6 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
                 $group_by = ' GROUP BY CM.category';
                 
                 $query = $sql . $where . $group_by;
-//                $where = "
-//                SELECT CM.category, CAT.name, CAT.parent
-//                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-//                 WHERE CM.member_info IN (SELECT member_info FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info WHERE category = $activity_id)
-//                 AND MI.status = 10 AND CM.category = CAT.id AND NOT CM.category = $activity_id 
-//                 $group
-//            ";
-            }else {
-                $query = "
-                SELECT CM.category, CAT.name, CAT.parent
-                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-                 WHERE MI.status = 10 AND CM.category = CAT.id 
-                 GROUP BY CM.category
-            "; 
             }
             
             $results = $wpdb->get_results($query, ARRAY_A);
@@ -221,10 +203,9 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
 
             $trail_data = array(
                 'categories' => $categories,
-                'test'      => $query
             );
 
-        // on city dropdown change //////////////////////////////////////////
+        // on park dropdown change //////////////////////////////////////////
         } else if( isset($_REQUEST['park']) ){
 
             $park_id = isset($_REQUEST['park'] )? filter_var($_REQUEST['park'],FILTER_SANITIZE_STRING) : '';
@@ -250,24 +231,6 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
                 $group_by = ' GROUP BY CM.category';
                 
                 $query = $sql . $where . $group_by;
-//                $where = "
-//                SELECT CM.category, CAT.name, CAT.parent
-//                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-//                 WHERE CM.member_info IN (SELECT member_info FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info WHERE category = $activity_id)
-//                 AND MI.status = 10 AND CM.category = CAT.id AND NOT CM.category = $activity_id 
-//                 $group
-//            ";
-            }else {
-                $query = "
-                SELECT CM.category, CAT.name, CAT.parent
-                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-                 WHERE MI.status = 10 AND CM.category = CAT.id 
-                 GROUP BY CM.category
-            "; 
             }
 
 
@@ -281,7 +244,6 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
 
             $trail_data = array(
                 'categories' => $categories,
-                'test'  => $query
             );
         }else if( isset($_REQUEST['destination']) ){
 
@@ -307,24 +269,7 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
                 $group_by = ' GROUP BY CM.category';
                 
                 $query = $sql . $where . $group_by;
-//                $where = "
-//                SELECT CM.category, CAT.name, CAT.parent
-//                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-//                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-//                 WHERE CM.member_info IN (SELECT member_info FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info WHERE category = $activity_id)
-//                 AND MI.status = 10 AND CM.category = CAT.id AND NOT CM.category = $activity_id 
-//                 $group
-//            ";
-            }else {
-                $query = "
-                 SELECT CM.category, CAT.name, CAT.parent
-                  FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info MI,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info CM,
-                       ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories CAT
-                 WHERE MI.status = 10 AND CM.category = CAT.id 
-                 GROUP BY CM.category
-            "; 
+
             }
 
             $results = $wpdb->get_results($query, ARRAY_A);
@@ -337,7 +282,7 @@ var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>';
 
             $trail_data = array(
                 'categories' => $categories,
-                'test'  => $query
+              
             );
         }
 
-- 
2.17.1