From 3afc0e25a560b35d798314ea7aeebc64d1f3d180 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 12 Apr 2019 17:56:15 -0400
Subject: [PATCH] Preliminary totalCount and paginationRemaining code for
 search results

---
 models/admin/manageDashboard/members.php      | 22 ++++++++++++++++---
 .../adminSearch/pagination.html               |  2 +-
 .../adminSearch/searchHeader.html             |  4 +++-
 views/admin/manageDashboard/index.html        |  5 +++++
 views/admin/manageDashboard/list.html         |  1 -
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index 492eb878..1c4295b2 100644
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -169,7 +169,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         $prevStart          = false;
         $nextStart          = false;
         $start              = 1;
-        $limit              = 1;        // Set to the number of listings per page
+        $limit              = 4;        // Set to the number of listings per page
         $namesList          = false;
         $enable_members     = $this->config['settings']['enable_members'];
         $textSearch         = false;
@@ -395,6 +395,20 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         if ($nextStart > $memberCount) {
             $nextStart = false;
         }
+        // Find the remaining members to be shown in the 'Next Members' pagination button
+        if ( ($nextStart + $limit) > $memberCount ) {
+            $paginationShowRemaining = $memberCount % $limit;
+        } else {
+            $paginationShowRemaining = $limit;
+        }
+
+        $this->write_log("\npaginationShowRemaining: " . $paginationShowRemaining);
+        // if ( ( $memberCount - $nextStart) < ($memberCount % $limit) ) {
+        //     $paginationShowRemaining = ($memberCount % $limit);
+        // } else {
+        //     $paginationShowRemaining = $limit;
+            
+        // }
 
         //$this->write_log("\nYOP". $memberCount . " mcL: " . $nextStart);
         // $this->write_log("\nstart: " . $start);
@@ -484,7 +498,6 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
 
     
 
-
         foreach($this->config['addOns'] as $addOn){
             $nickName = ucfirst(substr($addOn['slug'], strpos($addOn['slug'], "glm-member-db-") + 14));
             $addOns[$nickName] = $addOn;
@@ -520,7 +533,10 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
             'textSearch'        => $textSearch,
             'addOns'            => $addOns,
             'imageUrl'          => GLM_MEMBERS_PLUGIN_MEDIA_URL,
-            'searchFields'      => $glmMemberSearch
+            'searchFields'      => $glmMemberSearch,
+
+            'paginationShowRemaining' => $paginationShowRemaining,
+            'filteredMembersFound' => $filteredMembersFound
         );
         //$this->write_log("admin/manageDashboard/$view.html");
         // Return status, suggested view, and data to controller
diff --git a/views/admin/manageDashboard/adminSearch/pagination.html b/views/admin/manageDashboard/adminSearch/pagination.html
index 93bb9345..9458a5a8 100644
--- a/views/admin/manageDashboard/adminSearch/pagination.html
+++ b/views/admin/manageDashboard/adminSearch/pagination.html
@@ -3,6 +3,6 @@
         Previous {$limit} {$terms.term_member_plur_cap}
     </span>
     <span class="pagination button button-secondary next-button glm-button next-start-button {if !$nextStart}disabled{/if}">
-        Next {$limit} {$terms.term_member_plur_cap}
+        Next <span class="pagination-show-remaining">{$paginationShowRemaining}</span> {$terms.term_member_plur_cap}
     </span>
 </div>
\ No newline at end of file
diff --git a/views/admin/manageDashboard/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
index 57ac74db..b9df7f51 100644
--- a/views/admin/manageDashboard/adminSearch/searchHeader.html
+++ b/views/admin/manageDashboard/adminSearch/searchHeader.html
@@ -3,7 +3,9 @@
 <div id="glm-admin-search-header">
     <div class="glm-admin-member-count">
         <span>Total found:</span>
-        <span> {$memberCount}</span>
+        <span> {$filteredMembersFound}</span>
+
+        <span>(out of {$memberCount})</span>
     </div>
     <div id="glm-manage-member-dashboard-searchForm">
         <div id="search-form-simple">
diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index e06f284b..b68e2fc4 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -215,6 +215,9 @@
                 listData.pageSelect = $(this).text();
                 listData.prevStart = $("#pagination-data").attr("data-prevStart");
                 listData.nextStart = $("#pagination-data").attr("data-nextStart");
+                listData.paginationShowRemaining = $(".pagination-show-remaining").html();
+                console.log(listData.paginationShowRemaining);
+                window.Glma.updateSearchFilterValues();
                 var queries = window.Glma.getSearchFieldValues();
                 window.Glma.mergeProps(listData, queries);
                 Glma.manageMember(
@@ -234,6 +237,8 @@
                         } else {
                             $(".pagination.next-button").addClass("disabled");
                         }
+                        $(".pagination-show-remaining").html(listData.paginationShowRemaining);
+                        console.log(listData.paginationShowRemaining);
                     },
                     function(error) {
                         console.log(error);
diff --git a/views/admin/manageDashboard/list.html b/views/admin/manageDashboard/list.html
index a8de4bd9..70fc7c3e 100644
--- a/views/admin/manageDashboard/list.html
+++ b/views/admin/manageDashboard/list.html
@@ -1,5 +1,4 @@
     <span id="pagination-data" {if $prevStart}data-prevStart="{$prevStart}"{/if}{if $nextStart}data-nextStart="{$nextStart}"{/if}{if $limit}data-limit="{$limit}"{/if}></span>
-    {$prevStart}
     {if $haveMembers}
         {foreach $members as $member}
             
-- 
2.17.1