X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Freport.php;h=5ed0fae69aba30974005c206cb060df333faf324;hb=refs%2Ftags%2F2022-10-31;hp=d8699d22691eedb88e5e6feac975652d3e34155d;hpb=d2336ce5f06b0e2762149edce0d7253437914f2b;p=readifood.git diff --git a/lib/report.php b/lib/report.php index d8699d2..5ed0fae 100644 --- a/lib/report.php +++ b/lib/report.php @@ -29,61 +29,44 @@ $oldest = date('Y-m-d', $date); $then = $date; - echo " to \n"; + datepicker("from", $from, true, null, false, "to"); + echo " to "; + datepicker("to", $to, true, "from", false); submit("show_reports", "Show"); end_form(); } - function check_report_dates($from, $to) { - list($y, $m, $d) = explode('-', $from); - if (! checkdate($m, $d, $y)) { - echo "
Invalid report start date!
\n"; - return false; - } - $start = mktime(0, 0, 0, $m, $d, $y); - - list($y, $m, $d) = explode('-', $to); - if (! checkdate($m, $d, $y)) { - echo "Invalid report end date!
\n"; - return false; - } - $end = mktime(0, 0, 0, $m, $d, $y); - - if ($end < $start) { - echo "Report end date is earlier than start date!
\n"; - return false; - } - - return true; - } - - function show_order_report(&$order_state_ids) { + function show_order_report($from, &$order_state_ids) { echo "%d | %s | \n", $row->getCount(), htmlspecialchars($parcel_sizes[$row->getSize() >> 1])); + if ($row->getSize() > 1) { + echo "
%d | individuals%s | \n", $count, $row->getSize() > 2 ? ' (estimated)' : ''); + echo "
$total | Total individuals (estimated) | \n"; + echo "
Showing reports for the period $from to $to.
\n"; @@ -225,9 +239,12 @@ $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); + $dups = array(); foreach ($order_states as $order_state) { - $order_ids[] = $order_state->getOrderId(); - $order_state_ids[] = $order_state->getId(); + $order_id = $order_state->getOrderId(); + $order_ids[] = $order_id; + if (! $dups[$order_id]) $order_state_ids[] = $order_state->getId(); + $dups[$order_id] = true; } $q = new OrderQuery; $q->filterById($order_ids); @@ -237,9 +254,10 @@ return; } - show_order_report($order_state_ids); + show_order_report($from, $order_state_ids); show_postcode_report($order_ids); show_parcel_report($order_ids); + show_beneficiary_report($order_ids); show_requester_report($order_ids); }