X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=inline;f=lib%2Freport.php;h=05ca904ce99fd06196722c3f7e3e5c0f210180d9;hb=ea8e72aabd56f371b4f54b6e464d8bceb049cfb5;hp=2fabab43be17fff3cf048e2349ebfe467f4bb8ed;hpb=524fe78f250d75cc54dba1dfb482ea4cdf574768;p=readifood.git
diff --git a/lib/report.php b/lib/report.php
index 2fabab4..05ca904 100644
--- a/lib/report.php
+++ b/lib/report.php
@@ -79,7 +79,7 @@
$week = 1;
$last_week = 0;
$total = 0;
- echo "
\n";
+ echo "\n";
foreach ($rows as $row) {
/* Convert week of year to date range. */
if (! $week_offset) $week_offset = $row->getWeek() - 1;
@@ -102,6 +102,31 @@
echo "
\n";
}
+ function show_size_report(&$order_ids) {
+ global $parcel_sizes;
+ echo "Orders by parcel size
\n";
+
+ $q = new OrderQuery;
+ $q->filterById($order_ids);
+ $q->withColumn(sprintf("parcel & %d", (1 << count($parcel_sizes)) - 1), 'size');
+ $q->withColumn('count(*)', 'count');
+ $q->addGroupByColumn('size')->addAscendingOrderByColumn('size');
+ $rows = $q->find();
+ $total = 0;
+ echo "\n";
+ foreach ($rows as $row) {
+ echo "\n";
+ $requester = get_contact_by_id($row->getRequesterId());
+ printf(" %d | %s | \n", $row->getCount(), htmlspecialchars($parcel_sizes[$row->getSize() >> 1]));
+ $total += $row->getCount();
+ echo "
\n";
+ }
+ echo "\n";
+ echo " $total | Total | \n";
+ echo "
\n";
+ echo "
\n";
+ }
+
function show_requester_report(&$order_ids) {
echo "Orders by referrer
\n";
@@ -111,7 +136,7 @@
$q->groupByRequesterId()->addDescendingOrderByColumn('count');
$rows = $q->find();
$total = 0;
- echo "\n";
+ echo "\n";
/* XXX Join! */
foreach ($rows as $row) {
echo "\n";
@@ -152,6 +177,7 @@
}
show_order_report($order_state_ids);
+ show_size_report($order_ids);
show_requester_report($order_ids);
}