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

diff --git a/lib/report.php b/lib/report.php
index b268440..2209d52 100644
--- a/lib/report.php
+++ b/lib/report.php
@@ -88,16 +88,64 @@
       /* 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);
+        printf("  <td align=\"right\">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);
+      printf("  <td align=\"right\">%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 "  <td align=\"right\" class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+  }
+
+  function show_contents_report(&$order_ids, $parcel_size, $grand_total) {
+    global $parcel_sizes, $parcel_contents;
+
+    $total = 0;
+    for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
+      $q = new OrderQuery;
+      $q->filterById($order_ids);
+      $q->where(sprintf("parcel & %d", $parcel_size));
+      $q->where(sprintf("parcel & %d", (1 << $i)));
+      $contents = $q->find();
+      $total += count($contents);
+      echo "<tr class=\"small\">\n";
+      printf("  <td align=\"right\">%d</td><td>%s</td>\n", count($contents), htmlspecialchars($parcel_contents[$i]));
+      echo "</tr>\n";
+    }
+
+    /* No special contents. */
+    echo "<tr class=\"small\">\n";
+    printf("  <td align=\"right\">%d</td><td>%s no special contents</td>\n", $grand_total - $total, htmlspecialchars($parcel_sizes[$parcel_size >> 1]));
+    echo "</tr>\n";
+  }
+
+  function show_parcel_report(&$order_ids) {
+    global $parcel_sizes;
+    echo "<h3>Orders by parcel type</h3>\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 "<table class=\"report\">\n";
+    foreach ($rows as $row) {
+      echo "<tr>\n";
+      $requester = get_contact_by_id($row->getRequesterId());
+      printf("  <td align=\"right\">%d</td><td>%s</td>\n", $row->getCount(), htmlspecialchars($parcel_sizes[$row->getSize() >> 1]));
+      $total += $row->getCount();
+      echo "</tr>\n";
+      show_contents_report($order_ids, $row->getSize(), $row->getCount());
+    }
+    echo "<tr>\n";
+    echo "  <td align=\"right\" class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
     echo "</tr>\n";
     echo "</table>\n";
   }
@@ -116,12 +164,12 @@
     foreach ($rows as $row) {
       echo "<tr>\n";
       $requester = get_contact_by_id($row->getRequesterId());
-      printf("  <td>%d</td><td>%s</td>\n", $row->getCount(), htmlspecialchars($requester->getDisplayname()));
+      printf("  <td align=\"right\">%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 "  <td align=\"right\" class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
     echo "</tr>\n";
     echo "</table>\n";
   }
@@ -152,6 +200,7 @@
     }
 
     show_order_report($order_state_ids);
+    show_parcel_report($order_ids);
     show_requester_report($order_ids);
   }