From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 14 Mar 2019 20:52:42 +0000 (-0400)
Subject: adding filtering for bad lat lon data in the list
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2301721674cf0fd192b859e58051ca2bfa8ebca6;p=WP-Plugins%2Fglm-member-db.git

adding filtering for bad lat lon data in the list
---

diff --git a/js/memberManagement.js b/js/memberManagement.js
index fd30c61f..74194cd9 100644
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -132,8 +132,8 @@ window.Glma = (function() {
     }
     var resetAllFilters = function(){
         resetStandardFilters();
-        $("#quickSearchForm-pending").prop("checked", false).parent().css({color: "#9E9E9E"});
-        $("#bad-map-location").prop("checked", false).parent().css({color: "#9E9E9E"});
+        $("#quickSearchForm-pending").parent().css({color: "#9E9E9E"});
+        $("#bad-map-location").parent().css({color: "#9E9E9E"});
     }
     var updateSearchFilterValues = function(){
         var queries = {};
@@ -262,6 +262,7 @@ window.Glma = (function() {
                     deleteAllFilterFields(listData);
                     updateSearchFilterValues();
                     var queries = getSearchFieldValues();
+                    console.log(queries)
                     mergeProps(listData, queries);
                     
                     jQuery.ajax({
diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index 2ef5a8a7..fdf8b4cb 100644
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -288,12 +288,11 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
             $haveFilter = true;
         }
         if (isset($_REQUEST['filterBadLocation'])) {
-
-            // Refine search only to members with pending Info data
+            // Refine search only to members with Bad Location
             $where .= " AND (
                 SELECT COUNT(id)
                   FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info I
-                 WHERE I.has_no_map_data = 1 AND I.member = T.id
+                 WHERE I.lat = 0 AND I.lon = 0 AND I.member = T.id AND status <> 90
             )";
                
             $filterBadLocation = true;
@@ -375,7 +374,6 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         // Get stats for number of members found matching current selection criteria (includes alpha selection)
         $filteredMembersFound = $this->getStats(str_replace('T.', '', $where.$alphaWhere));
 
-        $support->write_log($where);
         // Get a current list of members
         $listResult = $this->getSimpleMembersList($where.$alphaWhere, 'name', true, 'id', $start, $limit);
         //$support->write_log($listResult );
@@ -422,7 +420,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
 
         // Determine if current user can add, edit, delete member data
 //        $canEdit = current_user_can('glm_members_edit');
-
+$support->write_log($list);
         // get all active member profile IDs and Images
         $sql = "SELECT id, member, logo FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info where status = 10";
         $profileResults = $this->wpdb->get_results($sql, ARRAY_A);
@@ -439,7 +437,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
                 $list[$member['id']]['member_slug'] = sanitize_title($member['name']);
             }
         }
-
+        $support->write_log($where);
         // Create current month/date string to pre-populate the Month/Year field for
         $monthYear = date('F Y');
 
@@ -448,10 +446,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         $textSearch = str_replace('\\"', '&quot;', $textSearch );
         $textSearch = str_replace('\\', '', $textSearch );
 
-        
-        
-        
-        // $this->write_log("\nstart : $nextStart");
+        // $this->write_log($list);
         // Compile template data
         $templateData = array(
             'monthYear'         => $monthYear,
diff --git a/views/admin/manageDashboard/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
index 245e2edc..36ec54d8 100644
--- a/views/admin/manageDashboard/adminSearch/searchHeader.html
+++ b/views/admin/manageDashboard/adminSearch/searchHeader.html
@@ -31,14 +31,14 @@
 
                     <div class="switch">
                         <label>
-                            <input id="quickSearchForm-pending" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterPending" data-view="list" data-separate-query>
+                            <input id="quickSearchForm-pending" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterPending" data-view="list" class="glm-admin-search-field" data-searchtype="checkbox">
                             <span class="lever"></span>
                             Pending Members Only{if isset($pendingMembersCount) && $pendingMembersCount}: {$pendingMembersCount}{/if}
                         </label>
                     </div>
                     <div class="switch">
                         <label>
-                            <input id="bad-map-location" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterBadLocation" data-view="list" data-separate-query>
+                            <input id="bad-map-location" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterBadLocation" data-view="list" class="glm-admin-search-field" data-searchtype="checkbox">
                             <span class="lever"></span>
                             Bad Map Location Only{if isset($badMapLocationCount) && $badMapLocationCount}: {$badMapLocationCount}{/if}
                         </label>
diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 4bfed2ed..7300d5c5 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -265,15 +265,11 @@
                     overlay     :  overlay ? $("#glm-admin-" + overlay + "-overlay") : null
                 });
         
-                if( separateSearch ){
-                    window.Glma.resetStandardFilters();
-                    window.Glma.deleteStandardFilterFields(listData);
-                }else{
-                    window.Glma.deleteAllFilterFields(listData);
-                    window.Glma.updateSearchFilterValues();
-                    var queries = window.Glma.getSearchFieldValues();
-                    window.Glma.mergeProps(listData, queries);
-                }
+                window.Glma.deleteAllFilterFields(listData);
+                window.Glma.updateSearchFilterValues();
+                var queries = window.Glma.getSearchFieldValues();
+                window.Glma.mergeProps(listData, queries);
+                
                 if(typeof target.data("multiSelect") !== "undefined"){
                     if( target.select2("val")){
                         listData['categorySearch'] = target.select2("val").join(",");