From eaffefbb0a864d5816c44dd4f792944e62436d86 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 4 Apr 2017 15:33:32 -0400
Subject: [PATCH] Added warnings for no counties to members dashboard and main
 dashboard GLM Associate widget

---
 models/admin/dashboardWidget/index.php |  7 ++++++
 models/admin/members/index.php         |  7 ++++++
 views/admin/dashboardWidget/index.html | 31 +++++++++++++++-----------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/models/admin/dashboardWidget/index.php b/models/admin/dashboardWidget/index.php
index 25c22a40..73a355b3 100644
--- a/models/admin/dashboardWidget/index.php
+++ b/models/admin/dashboardWidget/index.php
@@ -156,6 +156,12 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers
         $citiesStats = $Cities->getStats();
         $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();
+        $haveCounties  = ($countiesStats > 0);
+
         // Check for required Regions
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php';
         $Regions = new GlmDataRegions($this->wpdb, $this->config);
@@ -190,6 +196,7 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers
             'haveAmenities' => $haveAmenities,
             'haveRegions' => $haveRegions,
             'haveCities' => $haveCities,
+            'haveCounties' => $haveCounties,
             'pendingList' => $pendingList
 //            'addOns' => $this->config['addOns']
         );
diff --git a/models/admin/members/index.php b/models/admin/members/index.php
index 1f72d466..959b233f 100644
--- a/models/admin/members/index.php
+++ b/models/admin/members/index.php
@@ -132,6 +132,12 @@ class GlmMembersAdmin_members_index extends GlmDataMembers
         $citiesStats = $Cities->getStats();
         $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();
+        $haveCounties  = ($countiesStats > 0);
+
         // Check for required Regions
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataRegions.php';
         $Regions      = new GlmDataRegions($this->wpdb, $this->config);
@@ -167,6 +173,7 @@ class GlmMembersAdmin_members_index extends GlmDataMembers
             'haveMemberTypes' => $haveMemberTypes,
             'haveCategories'  => $haveCategories,
             'haveAmenities'   => $haveAmenities,
+            'haveCounties'    => $haveCounties,
             'haveRegions'     => $haveRegions,
             'haveCities'      => $haveCities,
             'pendingList'     => $pendingList
diff --git a/views/admin/dashboardWidget/index.html b/views/admin/dashboardWidget/index.html
index 1de6800d..6101a0da 100644
--- a/views/admin/dashboardWidget/index.html
+++ b/views/admin/dashboardWidget/index.html
@@ -61,41 +61,46 @@
 
 {if $settings.enable_members && apply_filters('glm_members_permit_admin_widget_warnings', true)}
     <table class="wp-list-table striped glm-admin-table">
-  {if !$haveMemberTypes || !$haveCategories || !$haveAmenities || !$haveCities || !$haveRegions || $numbMembers == 0}
-        <tr><th colspan="2"><h4><span  class="glm-error">Pending {$terms.term_member_cap} Information</span></h4></th></tr>
+  {if !$haveMemberTypes || !$haveCategories || !$haveAmenities || !$haveCities || !$haveCounties || !$haveRegions || $numbMembers == 0}
     {if !$haveMemberTypes}
         <tr>
-            <th class="glm-error">No {$terms.term_member_cap} Types</th>
-            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes" class="glm-right">Add</a></td>
+            <th class="glm-error">No {$terms.term_member_cap} Types Listed</th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settingts&glm_action=memberTypes" class="glm-right">Add</a></td>
         </tr>
     {/if}                
     {if !$haveCategories}
         <tr>
-            <th><span class="glm-error">No {$terms.term_member_cap} Categories</span></th>
-            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=categories" class="glm-right">Add</a></td>
+            <th><span class="glm-error">No {$terms.term_member_cap} Categories Listed</span></th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settings&glm_action=categories" class="glm-right">Add</a></td>
         </tr>
     {/if}                
     {if !$haveAmenities}
         <tr>
-            <th><span class="glm-error">No Amenities</span></th>
-            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=amenities" class="glm-right">Add</a></td>
+            <th><span class="glm-error">No Amenities Listed</span></th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settings&glm_action=amenities" class="glm-right">Add</a></td>
         </tr>
     {/if}                
     {if !$haveCities}
         <tr>
-            <th><span class="glm-error">No Cities</span></th>
-            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=cities" class="glm-right">Add</a></td>
+            <th><span class="glm-error">No Cities Listed</span></th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settings&glm_action=cities" class="glm-right">Add</a></td>
+        </tr>
+    {/if}
+    {if !$haveCounties}
+        <tr>
+            <th><span class="glm-error">No {$terms.term_county_plur_cap} Listed</span></th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settings&glm_action=counties" class="glm-right">Add</a></td>
         </tr>
     {/if}                
     {if !$haveRegions}
         <tr>
-            <th><span class="glm-error">No Regions</span></th>
-            <td><a href="{$adminUrl}?page=glm-members-admin-menu-configure&glm_action=regions" class="glm-right">Add</a></td>
+            <th><span class="glm-error">No Regions Listed</span></th>
+            <td><a href="{$adminUrl}?page=glm-members-admin-menu-settings&glm_action=regions" class="glm-right">Add</a></td>
         </tr>
     {/if}                
     {if $numbMembers == 0}
         <tr>
-           <th> <span class="glm-error">No {$terms.term_member_plur_cap}</span></th>
+           <th> <span class="glm-error">No {$terms.term_member_plur_cap} Listed</span></th>
             <td><a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member_id=" class="glm-right">Add a {$terms.term_member_cap}</a></td>
         </tr>
     {/if}     
-- 
2.17.1