Merge branch 'master' into uat

diff --git a/lib/constants.php b/lib/constants.php
index dcffda2..83d93e5 100644 (file)
--- a/lib/constants.php
+++ b/lib/constants.php
@@ -1,6 +1,9 @@
 <?php
 
-/* Area days of week. */
+  /* Pagination. */
+  $default_page_size = 50;
+
+  /* Area days of week. */
   $week = array("Sun", "Mon", "Tues", "Wed", "Thu", "Fri", "Sat");
 
   /* Contact roles. */

diff --git a/lib/functions.php b/lib/functions.php
index 6a39ddd..424d340 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -21,6 +21,48 @@
     return array($name, $id, $args);
   }
 
+  function pagination() {
+    $offset = 0;
+    $per_page = $GLOBALS['default_page_size'];
+
+    parse_str($_SERVER['QUERY_STRING'], $params);
+    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'] - 1;
+    if (array_key_exists('size', $params)) if (is_numeric($params['size'])) $per_page = $params['size'];
+
+    return array($offset, $per_page);
+  }
+
+  function page_link($alt, $n, $cur, $max, $size) {
+    $links = array();
+    if ($n < 1 || $n == $cur || $n > $max) return $alt;
+    $params = array('page' => $n);
+    if ($size != $GLOBALS['default_page_size']) $params['size'] = $size;
+    $url = http_build_query($params);
+    return "<a href=\"?$url\">$alt</a> ";
+  }
+
+  function show_pagination($pager, $n = 5) {
+    if (! $pager->haveToPaginate()) return;
+
+    list($offset, $per_page) = pagination();
+    $offset++;
+
+    $links = array();
+
+    $pages = ceil($pager->getNbResults() / $per_page);
+    $pages++;
+
+    $links[] = page_link('First', 1, $offset, $pages, $per_page);
+    $links[] = page_link('Previous', $offset - 1, $offset, $pages, $per_page);
+    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $offset, $pages, $per_page);
+    $links[] = page_link('Next', $offset + 1, $offset, $pages, $per_page);
+    $links[] = page_link('Last', $pages, $offset, $pages, $per_page);
+
+    echo "<p>Page: ";
+    echo implode(' / ', $links);
+    echo "</p>\n";
+  }
+
   function get_city_by_name($name, $postcode_area = null, $verbose = true) {
     $q = new CityQuery;
 

diff --git a/lib/order.php b/lib/order.php
index ac3cdfe..6a242e7 100644 (file)
--- a/lib/order.php
+++ b/lib/order.php
@@ -43,6 +43,7 @@
   }
 
   function show_orders($offset, $per_page, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+    list($offset, $per_page) = pagination();
     /* XXX: Use Propel methods. */
     if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
     $q = new OrderQuery;
@@ -51,11 +52,12 @@
     # XXX: Doesn't work.
     #if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
     if (isset($state_mask)) $q->filterById($order_ids);
-    $orders = $q->orderByDate()->find();
+    $orders = $q->orderByDate('desc')->paginate($offset, $per_page);
     if (count($orders)) {
       foreach ($orders as $order) {
         echo "<br>\n" . get_order_summary($order) . "<br>\n";
       }
+      show_pagination($orders);
     }
     else echo " none";
   }