X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Freport.php;h=b268440f6d5d0eb901ef45840ddb4a5faf8a5a3b;hb=b0347297ea5b4b7a8a4a5c2124c074b53539da6c;hp=4a632f873373e4070356dff0be2b892cd27e13f1;hpb=fe9ea062f81d87aa972dfddcd70762108ead2cce;p=readifood.git

diff --git a/lib/report.php b/lib/report.php
index 4a632f8..b268440 100644
--- a/lib/report.php
+++ b/lib/report.php
@@ -66,6 +66,42 @@
     return true;
   }
 
+  function show_order_report(&$order_state_ids) {
+    echo "<h3>Orders by week</h3>\n";
+
+    $q = new OrderStateQuery;
+    $q->filterById($order_state_ids);
+    $q->withColumn('yearweek(updated)', 'week');
+    $q->withColumn('count(*)', 'count');
+    $q->addGroupByColumn('week')->orderByUpdated();
+    $rows = $q->find();
+    $week_offset = 0;
+    $week = 1;
+    $last_week = 0;
+    $total = 0;
+    echo "<table class=\"report\">\n";
+    foreach ($rows as $row) {
+      /* Convert week of year to date range. */
+      if (! $week_offset) $week_offset = $row->getWeek() - 1;
+      else $week = $row->getWeek() - $week_offset;
+      $total += $row->getCount();
+      /* Fill in missing weeks. XXX */
+      for ($missing_week = $last_week + 1; $missing_week < $week; $missing_week++) {
+        echo "<tr>\n";
+        printf("  <td>0</td><td>Week %d</td>\n", $missing_week);
+        echo "</tr>\n";
+      }
+      echo "<tr>\n";
+      printf("  <td>%d</td><td>Week %d</td>\n", $row->getCount(), $week);
+      echo "</tr>\n";
+      $last_week = $week;
+    }
+    echo "<tr>\n";
+    echo "  <td class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+  }
+
   function show_requester_report(&$order_ids) {
     echo "<h3>Orders by referrer</h3>\n";
 
@@ -74,14 +110,19 @@
     $q->withColumn('count(*)', 'count');
     $q->groupByRequesterId()->addDescendingOrderByColumn('count');
     $rows = $q->find();
-    echo "<table>\n";
+    $total = 0;
+    echo "<table class=\"report\">\n";
     /* XXX Join! */
     foreach ($rows as $row) {
       echo "<tr>\n";
       $requester = get_contact_by_id($row->getRequesterId());
-      printf("  <td>%d</td><td>&nbsp;</td><td>%s</td>\n", $row->getCount(), htmlspecialchars($requester->getDisplayname()));
+      printf("  <td>%d</td><td>%s</td>\n", $row->getCount(), htmlspecialchars($requester->getDisplayname()));
+      $total += $row->getCount();
       echo "</tr>\n";
     }
+    echo "<tr>\n";
+    echo "  <td class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
+    echo "</tr>\n";
     echo "</table>\n";
   }
 
@@ -92,12 +133,16 @@
 
     /* Get orders. */
     $order_ids = array();
+    $order_state_ids = array();
     /* XXX: Order 51 changed to state delivered in May then updated in June. */
     $dbh = Propel::getConnection();
     $sth = $dbh->prepare("select * from OrderState o where updated=(select min(updated) from OrderState where order_id=o.order_id and state & " . $GLOBALS['STATE_DELIVERED'] . ") and updated between '$from' and '$to'");
     $sth->execute();
     $order_states = OrderStatePeer::populateObjects($sth);
-    foreach ($order_states as $order_state) $order_ids[] = $order_state->getOrderId();
+    foreach ($order_states as $order_state) {
+      $order_ids[] = $order_state->getOrderId();
+      $order_state_ids[] = $order_state->getId();
+    }
     $q = new OrderQuery;
     $q->filterById($order_ids);
 
@@ -106,6 +151,7 @@
       return;
     }
 
+    show_order_report($order_state_ids);
     show_requester_report($order_ids);
   }