Fixed paging on pending documents list and error list

PT: 1799020 Committed by: Megan Watson

Fixed paging on pending documents list and error list
PT: 1799020 Committed by: Megan Watson
Megan Watson
1 parent c635afc3
Showing 4 changed files with 150 additions and 17 deletions
plugins/search2/reporting/IndexErrors.php
plugins/search2/reporting/PendingDocuments.php
templates/ktcore/search2/reporting/indexerrors.smarty
templates/ktcore/search2/reporting/pendingdocuments.smarty
@@ -5,7 +5,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -54,6 +54,11 @@ class IndexErrorsDispatcher extends KTAdminDispatcher {
  
 		//Number of items on a page
 		$itemsPerPage = 50;
+		$pageNum = 1;
+
+        if(isset($_REQUEST['itemsPerPage'])){
+            $itemsPerPage = $_REQUEST['itemsPerPage'];
+        }
  
         //registerTypes registers the mime types and populates the needed tables.
         $indexer = Indexer::get();
@@ -128,6 +133,11 @@ class IndexErrorsDispatcher extends KTAdminDispatcher {
 			if(isset($_REQUEST['pageValue']))
 			{
 				$pageNum = (int)$_REQUEST['pageValue'];
+
+                if($pageNum > $pages){
+                    $pageNum = $pages;
+                }
+
 				$start = (($pageNum-1)*$itemsPerPage)-1;
 				$limit = $start+$itemsPerPage;
 				for($i = $start; $i <= $limit; $i++){
@@ -145,13 +155,18 @@ class IndexErrorsDispatcher extends KTAdminDispatcher {
 			}
         }
  
+        $config = KTConfig::getSingleton();
+        $rootUrl = $config->get('KnowledgeTree/rootUrl');
+
         $oTemplate->setData(array(
             'context' => $this,
             'pageList' => $aPages,
             'pageCount' => $pages,
+            'pageNum' => $pageNum,
             'itemCount' => $items,
             'itemsPerPage' => $itemsPerPage,
-            'indexErrors' => $aIndexList
+            'indexErrors' => $aIndexList,
+            'root_url' => $rootUrl
  
         ));
         return $oTemplate;
@@ -5,7 +5,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -51,6 +51,14 @@ class PendingDocumentsDispatcher extends KTAdminDispatcher
  
     function do_main() {
  
+		//Number of items on a page
+		$itemsPerPage = 50;
+		$pageNum = 1;
+
+        if(isset($_REQUEST['itemsPerPage'])){
+            $itemsPerPage = $_REQUEST['itemsPerPage'];
+        }
+
         //registerTypes registers the mime types and populates the needed tables.
         $indexer = Indexer::get();
         $indexer->registerTypes();
@@ -68,6 +76,51 @@ class PendingDocumentsDispatcher extends KTAdminDispatcher
  			$aPendingDocs[$key] = $doc;
  		}
  
+		$aPendingList = array();
+
+		//creating page variables and loading the items for the current page
+		if(!empty($aPendingDocs)){
+        	$items = count($aPendingDocs);
+
+			if(fmod($items, $itemsPerPage) > 0){
+				$pages = floor($items/$itemsPerPage)+1;
+			}else{
+				$pages = ($items/$itemsPerPage);
+			}
+			for($i=1; $i<=$pages; $i++){
+				$aPages[] = $i;
+			}
+			if($items < $itemsPerPage){
+				$limit = $items-1;
+			}else{
+				$limit = $itemsPerPage-1;
+			}
+
+			if(isset($_REQUEST['pageValue']))
+			{
+				$pageNum = (int)$_REQUEST['pageValue'];
+
+                if($pageNum > $pages){
+                    $pageNum = $pages;
+                }
+
+				$start = (($pageNum-1)*$itemsPerPage)-1;
+				$limit = $start+$itemsPerPage;
+				for($i = $start; $i <= $limit; $i++){
+					if(isset($aPendingDocs[$i]))
+					{
+						$aPendingList[] = $aPendingDocs[$i];
+					}
+				}
+			}
+			else
+			{
+				for($i = 0; $i <= $limit; $i++){
+					$aPendingList[] = $aPendingDocs[$i];
+				}
+			}
+        }
+
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oTemplating->loadTemplate('ktcore/search2/reporting/pendingdocuments');
  
@@ -76,7 +129,12 @@ class PendingDocumentsDispatcher extends KTAdminDispatcher
  
         $oTemplate->setData(array(
             'context' => $this,
-            'pending_docs' => $aPendingDocs,
+            'pageList' => $aPages,
+            'pageCount' => $pages,
+            'pageNum' => $pageNum,
+            'itemCount' => $items,
+            'itemsPerPage' => $itemsPerPage,
+            'pending_docs' => $aPendingList,
             'root_url' => $rootUrl
         ));
         return $oTemplate;
@@ -40,7 +40,7 @@
 {foreach key=key from=$indexErrors item=indexError}
 <tr>
 	<td class="centered"><input type="checkbox" name="index_error[{$indexError.document_id}]" value="1"/></td>
-	<td><a href="/view.php?fDocumentId={$indexError.document_id}">{$indexError.filename|truncate:40:'...'}</a></td>
+	<td><a href="{$root_url}/view.php?fDocumentId={$indexError.document_id}">{$indexError.filename|truncate:40:'...'}</a></td>
 	<td>{if $indexError.extractor}{$indexError.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td>
 	<td>{$indexError.indexdate}</td>
  
@@ -57,18 +57,31 @@
 <tfoot>
 <tr>
 <td colspan="4">
-<div align="center">
-{foreach item=page from=$pageList}
-<a id="pageButton{$page}" href="#" onclick="nextSearchPage({$page});">{$page}</a>
-{/foreach}
-</div>
-</td>
-</tr>
-<tr>
-<td  colspan="4">
-<div> {$itemCount} items, {$itemsPerPage} items per page.</div>
+    <div align="center">
+        {foreach item=page from=$pageList}
+            {if $pageNum == $page}
+                {$page}&nbsp;
+            {else}
+                <a id="pageButton{$page}" href="#" onclick="nextSearchPage({$page});">{$page}</a>&nbsp;
+            {/if}
+        {/foreach}
+    </div>
 </td>
 </tr>
+    <tr>
+        <td  colspan="2">
+        <div> {$itemCount} {i18n}items{/i18n}, {$itemsPerPage} {i18n}items per page{/i18n}.</div>
+        </td>
+        <td align="right">
+                <select name="itemsPerPage">
+                    <option value='10' {if $itemsPerPage == 10}selected='true'{/if} onclick="nextSearchPage({$pageNum});" >10</option>
+                    <option value='20' {if $itemsPerPage == 20}selected='true'{/if} onclick="nextSearchPage({$pageNum});">20</option>
+                    <option value='50' {if $itemsPerPage == 50}selected='true'{/if} onclick="nextSearchPage({$pageNum});">50</option>
+                    <option value='100' {if $itemsPerPage == 100}selected='true'{/if} onclick="nextSearchPage({$pageNum});">100</option>
+                </select>
+                {i18n}items per page{/i18n}
+        </td>
+    </tr>
 </tfoot>
 </table>
  
+{literal}
+<script type="text/javascript">
+	function nextSearchPage(value)
+	{
+		var hiddenPageVal = document.getElementById("pageValue");
+		hiddenPageVal.value = value;
+		document.pendingQueueForm.submit();
+	}
+</script>
+{/literal}
 <h2>{i18n}Pending Documents Indexing Queue{/i18n}</h2>
-{i18n}This report lists documents that are waiting to be indexed.{/i18n}
-<br><br>
+<p class="descriptiveText">{i18n}This report lists documents that are waiting to be indexed.{/i18n}</p>
+<br>
 {i18n}If a document is not associated with an extractor, no content will be added to the index. These documents can be identified in the list by the extractor column reflecting n/a.{/i18n}
 <br><br>
  
@@ -11,6 +21,9 @@
 {else}
  
  
+<form name="pendingQueueForm" action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="pageValue" id="pageValue" value="" />
+
 <table class=kt_collection>
  
 <thead>
@@ -33,6 +46,40 @@
  
 </tbody>
  
+<tfoot>
+    <tr>
+        <td colspan="3">
+        <div align="center">
+        {foreach item=page from=$pageList}
+            {if $pageNum == $page}
+                {$page}&nbsp;
+            {else}
+                <a id="pageButton{$page}" href="#" onclick="nextSearchPage({$page});">{$page}</a>&nbsp;
+            {/if}
+        {/foreach}
+        </div>
+        </td>
+    </tr>
+        <tr>
+        <td  colspan="2">
+            <div> {$itemCount} {i18n}items{/i18n},
+                {$itemsPerPage} {i18n}items per page{/i18n}.
+            </div>
+        </td>
+        <td align="right">
+                <select name="itemsPerPage">
+                    <option value='10' {if $itemsPerPage == 10}selected='true'{/if} onclick="nextSearchPage({$pageNum});" >10</option>
+                    <option value='20' {if $itemsPerPage == 20}selected='true'{/if} onclick="nextSearchPage({$pageNum});">20</option>
+                    <option value='50' {if $itemsPerPage == 50}selected='true'{/if} onclick="nextSearchPage({$pageNum});">50</option>
+                    <option value='100' {if $itemsPerPage == 100}selected='true'{/if} onclick="nextSearchPage({$pageNum});">100</option>
+                </select>
+                {i18n}items per page{/i18n}
+        </td>
+    </tr>
+</tfoot>
+
 </table>
  
+</form>
+
 {/if}