X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=3727a65d5aa414e21a4271b920a7bb2e66c73d26;hb=5f50c624101d671ec4147b3ad974c15178c6ebe5;hp=b019e93f62caf3b058034aa5907387a01ceac65e;hpb=6fdbfe32798452ec1c0fdbda57edabb892518409;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index b019e93..3727a65 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -196,11 +196,30 @@
   }
 
   function get_donation_displayname($donation) {
-    return $donation->getQuantity() . "kg on " . $donation->getDate();
+    return sprintf("%0.2fkg on %s", $donation->getQuantity() / 1000, $donation->getDate());
+  }
+
+  function get_order_parcel_string($order) {
+    global $parcel_sizes, $parcel_contents;
+
+    $parcel_size = "";
+    for ($i = 0 ; $i < count($parcel_sizes); $i++) {
+      if ($order->getParcel() & (1 << $i)) {
+        $parcel_size = $parcel_sizes[$i];
+        break;
+      }
+    }
+
+    $selected = array();
+    for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+      if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
+    }
+
+    return implode(": ", array($parcel_size, implode(", ", $selected)));
   }
 
   function get_order_displayname($order) {
-    return $order->getQuantity() . "kg on " . $order->getDate();
+    return sprintf("<span class=\"small\">%s</span> on %s", get_order_parcel_string($order), $order->getDate());
   }
 
   function get_address_area($address) {
@@ -285,10 +304,8 @@
     return get_city_contacts($city_id, $GLOBALS['ROLE_DRIVER']);
   }
 
-  function get_contact_role_string($contact) {
-    global $roles;
-
-    $role = $contact->getRole();
+  function get_role_string($object, $roles) {
+    $role = $object->getRole();
 
     $selected = array();
 
@@ -299,6 +316,22 @@
     return implode(", ", $selected);
   }
 
+  function get_contact_role_string($contact) {
+    return get_role_string($contact, $GLOBALS['contact_roles']);
+  }
+
+  function get_hub_role_string($hub) {
+    return get_role_string($hub, $GLOBALS['hub_roles']);
+  }
+
+  function show_role_form($role, $roles) {
+    for ($i = 0; $i < count($roles); $i++) {
+      echo " <input type=\"checkbox\" name=\"role_$i\"";
+      if ($role & (1 << $i)) echo " checked";
+      echo ">$roles[$i]\n";
+    }
+  }
+
   function get_area_hubs($area_id = null) {
     $q = new HubQuery;
     if (isset($area_id)) $q->useAddressQuery()->filterByAreaId($area_id)->endUse();