From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 9 Jul 2018 18:49:31 +0000 (-0400)
Subject: Updated generation of members list for search for Main Dashboard and Members Dashboar... 
X-Git-Tag: v2.10.35^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=43d46ee360cd561feeb765f6559a567c4a4e29b3;p=WP-Plugins%2Fglm-member-db.git

Updated generation of members list for search for Main Dashboard and Members Dashboard to speed response and one other item.

Started adding processing time tracking to index.php for use with debug output.
---

diff --git a/controllers/admin.php b/controllers/admin.php
index 99be3466..877ada44 100644
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -702,6 +702,7 @@ class glmMembersAdmin extends GlmPluginSupport
     {
         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
             trigger_error(glmAssociateMemoryUsage()." - Start Admin Controller, Menu = $menuItem, Action = $action",E_USER_NOTICE);
+            trigger_error(glmAssociateTimeTracker()." - Start Admin Controller",E_USER_NOTICE);
         }
 
         // Enque admin scripts and css here so that only happens when we're doing something
@@ -1054,6 +1055,7 @@ class glmMembersAdmin extends GlmPluginSupport
 
         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
             trigger_error(glmAssociateMemoryUsage().' - End Admin Controller',E_USER_NOTICE);
+            trigger_error(glmAssociateTimeTracker().' - End Admin Controller',E_USER_NOTICE);
         }
 
         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) {
diff --git a/index.php b/index.php
index b9372219..1202775e 100644
--- a/index.php
+++ b/index.php
@@ -23,6 +23,7 @@
  */
 
 $GLOBALS['glmAssociateMemTracker'] = memory_get_usage();
+$GLOBALS['glmAssociateTimeTrackerStart'] = microtime(true);
 
 // Check that we're being called by WordPress.
 if (!defined('ABSPATH')) {
@@ -735,6 +736,18 @@ function glmAssociateMemoryUsage() {
     return 'GLM Associate Memory Usage: '.number_format($mu,0).' of '.number_format($m,0).' Bytes';
 }
 
+function glmAssociateTimeTracker() {
+    if (!isset($GLOBALS['glmAssociateTimeTrackerLast'])) {
+        $GLOBALS['glmAssociateTimeTrackerLast'] = $GLOBALS['glmAssociateTimeTrackerStart'];
+    }
+    $t = microtime(true);
+    $timeSinceStart = $t - $GLOBALS['glmAssociateTimeTrackerStart'];
+    $timeSinceLast = $t - $GLOBALS['glmAssociateTimeTrackerLast'];
+    $GLOBALS['glmAssociateTimeTrackerLast'] = $t;
+    return 'GLM Associate Time Tracker: Since GLM Start = '.number_format($timeSinceStart,3).', Since last time report = '.number_format($timeSinceLast,3).' (Seconds)';
+}
+
+
 /*
  * GLM Associate Cron
  *
diff --git a/models/admin/dashboardWidget/index.php b/models/admin/dashboardWidget/index.php
index 6d0e70f7..b2695dec 100644
--- a/models/admin/dashboardWidget/index.php
+++ b/models/admin/dashboardWidget/index.php
@@ -130,42 +130,47 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers
         $stats = $this->getStats();
 
         // Get simple member list
-        $membersList = $this->getSimpleMembersList();
+        $sql = "
+            SELECT id, name
+              FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX. "members
+             WHERE access != ".$this->config['access_numb']['Archived']."
+        ;";
+        $membersList = $this->wpdb->get_results($sql, ARRAY_A);
 
         // Check for required Member Types
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php';
         $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config);
-        $memberTypesStats = $MemberTypes->getStats();
+        $memberTypesStats = $MemberTypes->getStats('true LIMIT 1');
         $haveMemberTypes = ($memberTypesStats > 0);
 
         // Check for required Categories
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php';
         $Categories = new GlmDataCategories($this->wpdb, $this->config);
-        $categoriesStats = $Categories->getStats();
+        $categoriesStats = $Categories->getStats('true LIMIT 1');
         $haveCategories = ($categoriesStats > 0);
 
         // Check for required Amenities
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php';
         $Amenities = new GlmDataAmenities($this->wpdb, $this->config);
-        $amenitiesStats = $Amenities->getStats();
+        $amenitiesStats = $Amenities->getStats('true LIMIT 1');
         $haveAmenities = ($amenitiesStats > 0);
 
         // Check for required Cities
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php';
         $Cities = new GlmDataCities($this->wpdb, $this->config);
-        $citiesStats = $Cities->getStats();
+        $citiesStats = $Cities->getStats('true LIMIT 1');
         $haveCities = ($citiesStats > 0);
 
         // Check for required Counties
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCounties.php';
         $Counties      = new GlmDataCounties($this->wpdb, $this->config);
-        $countiesStats = $Counties->getStats();
+        $countiesStats = $Counties->getStats('true LIMIT 1');
         $haveCounties  = ($countiesStats > 0);
 
         // Check for required Regions
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php';
         $Regions = new GlmDataRegions($this->wpdb, $this->config);
-        $regionsStats = $Regions->getStats();
+        $regionsStats = $Regions->getStats('true LIMIT 1');
         $haveRegions = ($regionsStats > 0);
 
         // Get number of member information records with pending updates
diff --git a/models/admin/members/index.php b/models/admin/members/index.php
index 16340f20..c781b53a 100644
--- a/models/admin/members/index.php
+++ b/models/admin/members/index.php
@@ -106,42 +106,47 @@ class GlmMembersAdmin_members_index extends GlmDataMembers
         $stats = $this->getStats();
 
         // Get simple member list
-        $membersList = $this->getSimpleMembersList();
+        $sql = "
+            SELECT id, name
+              FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX. "members
+             WHERE access != ".$this->config['access_numb']['Archived']."
+        ;";
+        $membersList = $this->wpdb->get_results($sql, ARRAY_A);
 
         // Check for required Member Types
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php';
         $MemberTypes      = new GlmDataMemberTypes($this->wpdb, $this->config);
-        $memberTypesStats = $MemberTypes->getStats();
+        $memberTypesStats = $MemberTypes->getStats('true LIMIT 1');
         $haveMemberTypes  = ($memberTypesStats > 0);
 
         // Check for required Categories
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php';
         $Categories      = new GlmDataCategories($this->wpdb, $this->config);
-        $categoriesStats = $Categories->getStats();
+        $categoriesStats = $Categories->getStats('true LIMIT 1');
         $haveCategories  = ($categoriesStats > 0);
 
         // Check for required Amenities
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php';
         $Amenities      = new GlmDataAmenities($this->wpdb, $this->config);
-        $amenitiesStats = $Amenities->getStats();
+        $amenitiesStats = $Amenities->getStats('true LIMIT 1');
         $haveAmenities  = ($amenitiesStats > 0);
 
         // Check for required Cities
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php';
         $Cities      = new GlmDataCities($this->wpdb, $this->config);
-        $citiesStats = $Cities->getStats();
+        $citiesStats = $Cities->getStats('true LIMIT 1');
         $haveCities  = ($citiesStats > 0);
 
         // Check for required Counties
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCounties.php';
         $Counties      = new GlmDataCounties($this->wpdb, $this->config);
-        $countiesStats = $Counties->getStats();
+        $countiesStats = $Counties->getStats('true LIMIT 1');
         $haveCounties  = ($countiesStats > 0);
 
         // Check for required Regions
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php';
         $Regions      = new GlmDataRegions($this->wpdb, $this->config);
-        $regionsStats = $Regions->getStats();
+        $regionsStats = $Regions->getStats('true LIMIT 1');
         $haveRegions  = ($regionsStats > 0);
 
         // Get number of member information records with pending updates