X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdonation.php;h=a5036f312a4bd1e58d3a43c72ca2a185d3929b21;hb=eeeda82e51f5b591d78b45a039ea0046bc641d8f;hp=4d928fb109a201e18d4c5a4c9c3ccd9ed87bf35f;hpb=37d4290c9eae09546c22b257c589c7e66ad3a1f3;p=readifood.git

diff --git a/lib/donation.php b/lib/donation.php
index 4d928fb..a5036f3 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -1,10 +1,12 @@
 <?php
 
   if (isset($_POST['show_add_donation'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $area_id = $_POST['area_id'];
     show_new_donation_form($area_id);
   }
   else if (isset($_POST['add_donation'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_donation();
     if ($id !== false) {
       echo "<p>Donation recorded.</p>\n";
@@ -25,25 +27,28 @@
       echo "<p>No such contact!</p>\n";
     }
   }
-  else if ($_POST['area_id']) {
+  else if ($_POST['show_in_area']) {
+    set_last_selected("area_id", $_POST['area_id']);
     $q = new AreaQuery;
     $area = $q->findOneById($_POST['area_id']);
     /* XXX: Function to build URL because we need to set a class in links. */
     header(sprintf("Location: http%s://%s/%s/in/area/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id']));
     exit;
   }
-  else if ($_POST['city_id']) {
+  else if ($_POST['show_in_city']) {
+    set_last_selected("city_id", $_POST['city_id']);
     $q = new CityQuery;
     $city = $q->findOneById($_POST['city_id']);
     header(sprintf("Location: http%s://%s/%s/in/city/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id']));
     exit;
   }
 
-  function show_donations($offset, $per_page, $contact_ids = null, $hub_ids = null) {
+  function show_donations($contact_ids = null, $hub_ids = null) {
+    list($first_page, $per_page) = pagination();
     $q = new DonationQuery;
     if (isset($contact_ids)) $q->filterByContactId($contact_ids);
     if (isset($hub_ids)) $q->filterByHubId($hub_ids);
-    $donations = $q->find();
+    $donations = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
     if (count($donations)) {
       foreach ($donations as $donation) {
         echo "<br>\nDonation " . $donation->getStrongLink($donation->getId()) . ": " . get_donation_displayname($donation);
@@ -68,11 +73,12 @@
           echo " " . $donation->getDeleteLink();
         }
       }
+      show_pagination($donations);
     }
     else echo " none";
   }
 
-  function show_city_donations($offset, $per_page, $city_name, $city_id = null) {
+  function show_city_donations($city_name, $city_id = null) {
     if (isset($city_id)) $city = get_city_by_id($city_id);
     else if ($city_name) $city = get_city_by_name($city_name);
     if ($city) {
@@ -81,32 +87,32 @@
       foreach ($hubs as $hub) $hub_ids[] = $hub->getId();
 
       echo "<p>Donations in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_donations($offset, $per_page, null, $hub_ids);
+      return show_donations(null, $hub_ids);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_contact_donations($offset, $per_page, $contact_name, $contact_id = null) {
+  function show_contact_donations($contact_name, $contact_id = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Donations from contact " . $contact->getLink() . ":";
-      return show_donations($offset, $per_page, $contact->getId());
+      return show_donations($contact->getId());
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_hub_donations($offset, $per_page, $hub_name, $hub_id = null) {
+  function show_hub_donations($hub_name, $hub_id = null) {
     if (isset($hub_id)) $hub = get_hub_by_id($hub_id);
     else if ($hub_name) $hub = get_hub_by_name($hub_name);
     if ($hub) {
       echo "<p>Donations to hub " . $hub->getLink() . ":";
-      return show_donations($offset, $per_page, null, $hub->getId());
+      return show_donations(null, $hub->getId());
     }
     else echo "<p>No such hub!</p>\n";
   }
 
-  function show_area_donations($offset, $per_page, $area_name, $area_id = null) {
+  function show_area_donations($area_name, $area_id = null) {
     if (isset($area_id)) $area = get_area_by_id($area_id);
     else if ($area_name) $area = get_area_by_name($area_name);
     if ($area) {
@@ -115,7 +121,7 @@
       foreach ($hubs as $hub) $hub_ids[] = $hub->getId();
 
       echo "<p>Donations in area " . $area->getLink() . ":";
-      return show_donations($offset, $per_page, null, $hub_ids);
+      return show_donations(null, $hub_ids);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -141,7 +147,7 @@
       option("area_id", $area->getId(), get_area_displayname($area));
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
+    submit("show_in_area", "Show");
   }
 
   function show_donation_cities_form($city_id = null) {
@@ -166,7 +172,7 @@
       option("city_id", $city->getId(), get_city_displayname($city), $city_id);
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
+    submit("show_in_city", "Show");
   }
 
   function show_donation_forms($city_id) {
@@ -236,6 +242,31 @@
     end_form();
   }
 
+  function show_hub_donation_form($hub) {
+    if (! check_admin(1)) return;
+
+    $area = get_hub_area($hub);
+    if (! $area) {
+      echo "<p>No such <a href=\"/area\">area</a>!</p>\n";
+      return;
+    }
+
+    $donation = new Donation;
+    $donation->setHubId($hub->getId());
+
+    form();
+    echo "<p>Record a donation:</p>\n";
+
+    echo "<table>\n";
+    show_donation_form($donation, $area->getId());
+
+    echo "<tr>\n";
+    echo "  <td colspan=2>"; submit("add_donation", "Record"); echo "</td></tr>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+    end_form();
+  }
+
   function show_add_new_donation_form() {
     if (! check_admin(1)) return;
 
@@ -258,7 +289,6 @@
   }
 
   function update_donation(&$donation, $new = false) {
-    #$date = ymd_to_iso8601("date");
     $date = $_POST['date'];
     $contact_id = $_POST['contact_id'];
     $hub_id = $_POST['hub_id'];
@@ -375,7 +405,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_donations(0, 10, $parameters[2], $area_id);
+          show_area_donations($parameters[2], $area_id);
         break;
 
         case "city":
@@ -383,7 +413,7 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_donations(0, 10, $parameters[2], $city_id);
+          show_city_donations($parameters[2], $city_id);
         break;
       }
     }
@@ -394,7 +424,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $contact = $q->findOneById($contact_id);
-          show_contact_donations(0, 10, $parameters[2], $contact_id);
+          show_contact_donations($parameters[2], $contact_id);
         break;
       }
     }
@@ -405,10 +435,19 @@
           $hub_id = $parameters[3];
           $q = new HubQuery;
           $hub = $q->findOneById($hub_id);
-          show_hub_donations(0, 10, $parameters[2], $hub_id);
+          show_hub_donations($parameters[2], $hub_id);
         break;
       }
     }
+    else if ($parameters[0] == "record") {
+      if ($parameters[1] == "to") {
+        if ($parameters[2] == "hub") {
+          if ($parameters[4]) $hub = get_hub_by_id($parameters[4]);
+          if (! $hub) $hub = get_hub_by_name(urldecode($parameters[3]));
+          if ($hub) show_hub_donation_form($hub);
+        }
+      }
+    }
   }
   list($ignored, $id, $args) = parse_parameters($parameters);
   //echo "<p>$name($id) " . print_r($args, true) . "</p>\n";