X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Freport.php;h=b2bc16d2d4aa759974569439a498687c5b2f3797;hb=e4e05bf5dad3c8e514c5a939867758170ba36dd7;hp=05ca904ce99fd06196722c3f7e3e5c0f210180d9;hpb=ea8e72aabd56f371b4f54b6e464d8bceb049cfb5;p=readifood.git

diff --git a/lib/report.php b/lib/report.php
index 05ca904..b2bc16d 100644
--- a/lib/report.php
+++ b/lib/report.php
@@ -29,15 +29,9 @@
     $oldest = date('Y-m-d', $date);
     $then = $date;
 
-    echo "<select name=\"from\">\n";
-    for ($date = $then; $date <= $now; $date += 86400) {
-      option("from", date('Y-m-d', $date), date('j F Y', $date), $from);
-    }
-    echo "</select> to <select name=\"to\">\n";
-    for ($date = $then; $date <= $now; $date += 86400) {
-      option("to", date('Y-m-d', $date), date('j F Y', $date), $to);
-    }
-    echo "</select>\n";
+    datepicker("from", $from, true, null, false, "to");
+    echo " to ";
+    datepicker("to", $to, true, "from", false);
 
     submit("show_reports", "Show");
     end_form();
@@ -75,36 +69,108 @@
     $q->withColumn('count(*)', 'count');
     $q->addGroupByColumn('week')->orderByUpdated();
     $rows = $q->find();
+    $year_offset = 0;
     $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;
+      /*
+        Convert week of year to date range.
+        Beware that week 201401 comes after 201352.
+      */
+      $yearweek = $row->getWeek();
+      if (! $week_offset) {
+        $year_offset = substr($yearweek, 0, 4);
+        $week_offset = substr($yearweek, 4, 2) - 1;
+      }
+      else {
+        $y = substr($yearweek, 0, 4);
+        $w = substr($yearweek, 4, 2);
+        $week = (($y - $year_offset) * 52) + ($w - $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);
+        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_postcode_report(&$order_ids) {
+    echo "<h3>Orders by postcode</h3>\n";
+
+    /*
+      No regex replace support in MySQL so we'll have to retrieve all records
+      and group the postcodes ourselves.
+    */
+    $q = new OrderQuery;
+    $q->filterById($order_ids);
+    $q->join("Beneficiary");
+    /* No foreign key so we need to list the two tables. */
+    $q->join("Beneficiary.Address");
+    /* Not a FoodOrder column so we need to ask for it explicitly. */
+    $q->withColumn('upper(postcode)', 'postcode');
+    $rows = $q->find();
+
+    $total = 0;
+    $postcodes = array();
+    foreach ($rows as $row) {
+      $postcode = preg_replace('/\s*[0-9][A-Z]+$/', '', trim($row->getPostcode()));
+      if (! $postcode) $postcode = "Unknown";
+      $postcodes[$postcode]++;
+      $total++;
+    }
+    ksort($postcodes);
+
+    echo "<table class=\"report\">\n";
+    foreach ($postcodes as $postcode => $count) {
+      echo "<tr>\n";
+      printf("  <td align=\"right\">%d</td><td>%s</td>\n", $count, htmlspecialchars($postcode));
+      echo "</tr>\n";
+    }
+    echo "<tr>\n";
+    echo "  <td align=\"right\" class=\"strong\">$total</td><td class=\"strong\">Total</td>\n";
     echo "</tr>\n";
     echo "</table>\n";
   }
 
-  function show_size_report(&$order_ids) {
+  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 size</h3>\n";
+    echo "<h3>Orders by parcel type</h3>\n";
 
     $q = new OrderQuery;
     $q->filterById($order_ids);
@@ -117,12 +183,13 @@
     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($parcel_sizes[$row->getSize() >> 1]));
+      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 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";
   }
@@ -141,12 +208,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";
   }
@@ -177,7 +244,8 @@
     }
 
     show_order_report($order_state_ids);
-    show_size_report($order_ids);
+    show_postcode_report($order_ids);
+    show_parcel_report($order_ids);
     show_requester_report($order_ids);
   }