Add paging to the member search leads.

Adding in the state and date range searches for paging.

diff --git a/models/admin/travel/members.php b/models/admin/travel/members.php
index b88fa35..8fb20d5 100644 (file)
--- a/models/admin/travel/members.php
+++ b/models/admin/travel/members.php
@@ -91,11 +91,11 @@ class GlmMembersAdmin_travel_members extends GlmDataTravelLeads
         $search_id           = false;
         $numbDisplayed       = false;
         $lastDisplayed       = false;
-        $paging              = false;
+        $paging              = true;
         $prevStart           = false;
         $nextStart           = false;
-        $start               = '';//1;
-        $limit               = '';//20;        // Set to the number of listings per page
+        $start               = 1;
+        $limit               = 20;        // Set to the number of listings per page
         $haveLeads           = false;
         $leadCount           = 0;
         $addingLead          = false;
@@ -323,13 +323,32 @@ class GlmMembersAdmin_travel_members extends GlmDataTravelLeads
             }
 
             // $entry = $this->getList( $where );
-            $orderBy = 'T.company ASC,T.lname ASC,T.fname ASC,T.updated DESC';
-            $entryResults = $this->getList( $where, $orderBy );
+            $orderBy      = 'T.company ASC,T.lname ASC,T.fname ASC,T.updated DESC';
+            $entryResults = $this->getList( $where, $orderBy, true, 'id', $start, $limit );
+            $stats        = $this->getStats( $where );
 
+            // echo '<pre>$entryResults: ' . print_r( $entryResults, true ) . '</pre>';
+            echo '<pre>$stats: ' . print_r( $stats, true ) . '</pre>';
+
+            // Check if we're doing paging
+            if (isset($_REQUEST['pageSelect'])) {
+                // If request is for Next
+                if ($_REQUEST['pageSelect'][0] == 'N') {
+                    $newStart = $_REQUEST['nextStart'] - 0;
+
+                // Otherwise it must be Previous
+                } else {
+                    $newStart = $_REQUEST['prevStart'] - 0;
+                }
+
+                if ($newStart > 0) {
+                    $start = $newStart;
+                }
+            }
             // Get paging results
             $params        = '';
             $numbDisplayed = $entryResults['returned'];
-            $leadCount     = $numbDisplayed;
+            // $leadCount     = $numbDisplayed;
             $lastDisplayed = $entryResults['last'];
             if ( $start == 1 ) {
                 $prevStart = false;
@@ -342,12 +361,12 @@ class GlmMembersAdmin_travel_members extends GlmDataTravelLeads
             if ( $entryResults['returned'] == $limit ) {
                 $nextStart = $start + $limit;
             }
-            $entry = $entryResults;//$entryResults['list'];
+            $entry = $entryResults['list'];
             if ( count( $entry ) > 0 ) {
                 $haveLeads = true;
             }
 
-            $leadCount = count( $entry );
+            $leadCount = $stats;
 
             $view = 'members.html';
 

diff --git a/setup/databaseScripts/create_database_V0.0.5.sql b/setup/databaseScripts/create_database_V0.0.5.sql
index 863163c..d95b09f 100644 (file)
--- a/setup/databaseScripts/create_database_V0.0.5.sql
+++ b/setup/databaseScripts/create_database_V0.0.5.sql
@@ -106,5 +106,7 @@ CREATE TABLE {prefix}search_reports (
   id INT NOT NULL AUTO_INCREMENT,
   member_id INT NOT NULL,               -- Member Id
   search_date DATETIME NOT NULL,        -- date time of the search
-  PRIMARY KEY (id)
+  PRIMARY KEY (id),
+  INDEX(member_id),
+  INDEX(search_date)
 );

diff --git a/views/admin/travel/members.html b/views/admin/travel/members.html
index 2933d4d..1e51cf2 100644 (file)
--- a/views/admin/travel/members.html
+++ b/views/admin/travel/members.html
@@ -37,7 +37,29 @@
         <input type="submit" value="Download all in CSV file">
     </form>
 
+    <form action="{$thisUrl}">
+        <input type="hidden" name="page" value="{$thisPage}" />
+        <input type="hidden" name="search" value="1" />
+        <input type="hidden" name="glm_action" value="members" />
+        <input type="hidden" name="prevStart" value="{$prevStart}">
+        <input type="hidden" name="nextStart" value="{$nextStart}">
+        <input type="hidden" name="limit" value="{$limit}">
+    <br clear="all">
     <p><b>Total found:</b> {$leadCount}&nbsp;&nbsp;</p>
+    {if $paging}
+        <input type="hidden" name="search" value="1">
+        {if isset($smarty.request.company)}<input type="hidden" name="company" value="{$smarty.request.company}">{/if}
+        {if isset($smarty.request.contact)}<input type="hidden" name="contact" value="{$smarty.request.contact}">{/if}
+        {if isset($smarty.request.from_date)}<input type="hidden" name="from_date" value="{$smarty.request.from_date}">{/if}
+        {if isset($smarty.request.to_date)}<input type="hidden" name="to_date" value="{$smarty.request.to_date}">{/if}
+        {if isset($smarty.request.state)}
+            {foreach $smarty.request.state as $rState}
+                <input type="hidden" name="state[]" value="{$rState}" />
+            {/foreach}
+        {/if}
+        <input type="Submit" name="pageSelect" value="Previous {$limit} Leads" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+        <input type="Submit" name="pageSelect" value="Next {$limit} Leads" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
+    {/if}
 
     <table id="dataGrid" class="dataGrid">
         <thead>
@@ -72,6 +94,11 @@
         </tbody>
     </table>
 
+        {if $paging}
+            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
+        {/if}
+    </form>
 {else}
     <table>
         <tr>