--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -99,7 +99,9 @@
}
function show_stats($stats) {
- echo "
";
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($stats['total_value']) , 2);
+ echo "
{$stats['total']} contracts, total value $$value
";
if ($stats['consultancy'] > 0) {
echo "Consultancies: {$stats['consultancy']} contracts, ".percent($stats['consultancy'],$stats['total']);
echo "%
";
@@ -136,13 +138,17 @@
$supplier = filter_var($_REQUEST['supplier'], FILTER_SANITIZE_STRING);
if ($supplier != "") {
+ if ($supplier[0] !== '-') {
$supplierParts = explode("-", $supplier);
- $supplierName = "%" . $supplierParts[1] . "%";
- $supplierABN = $supplierParts[0];
- if ($supplierParts[0] > 0)
- $supplierQ = ' "supplierABN" = :supplierABN AND ';
- else
- $supplierQ = ' "supplierName" ILIKE :supplierName AND ';
+
+ $supplierABN = array_shift($supplierParts);
+ $supplierName = "%" . implode('-',$supplierParts) . "%";
+
+ $supplierQ = ' "supplierABN" = :supplierABN AND ';
+ } else {
+ $supplierName = "%" . substr($supplier,1) . "%";
+ $supplierQ = ' "supplierName" ILIKE :supplierName AND ';
+ }
}
$startYear = 2007;
@@ -184,7 +190,7 @@
pcdt: http://purl.org/procurement/public-contracts-datatypes#">
<?php echo $title; ?> - Contract Dashboard
-
+