From 20c64778e1db46b6c0b92b0331e33138af6d7dd0 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Mon, 9 Jul 2018 14:49:31 -0400 Subject: [PATCH] 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. --- controllers/admin.php | 6 ++++-- index.php | 13 +++++++++++++ models/admin/dashboardWidget/index.php | 19 ++++++++++++------- models/admin/members/index.php | 19 ++++++++++++------- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/controllers/admin.php b/controllers/admin.php index 9bc9dec2..4e21f2f3 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -449,7 +449,7 @@ class glmMembersAdmin extends GlmPluginSupport reset($this->config['addOns']); foreach ($this->config['addOns'] as $a) { $cssFile = GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/css/admin.css'; - + if (is_file($cssFile)) { $cssName = $a['slug'].'-admin-css'; wp_register_style( @@ -465,7 +465,7 @@ class glmMembersAdmin extends GlmPluginSupport $cssGridFile = GLM_MEMBERS_PLUGIN_PATH.'/css/glm-grid.css'; if (is_file($cssGridFileOld)) { - + $cssGridNameOld = 'grid-admin-css-old'; wp_register_style( $cssGridNameOld, @@ -716,6 +716,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 @@ -1068,6 +1069,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 -- 2.17.1