--- a/displayAgency.php
+++ b/displayAgency.php
@@ -6,9 +6,62 @@
$agency = htmlentities(strip_tags($_REQUEST['agency']));
include_header($agency);
echo '
'.$agency.'
';
- agencySuppliersGraph($agency);
+ $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice
+ WHERE "agencyName" like :agency AND '. " " . $standardQ . ' GROUP BY category order by count(*) desc limit 10';
+ $query = $conn->prepare($query);
+ $query->bindParam(":agency", $agency);
+ $query->execute();
+ databaseError($conn->errorInfo());
+
+
+ echo "Categories
+
+ Category |
+ Contracts Count |
+ Total Contract Value |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ $category = urlencode($row['category']);
+ echo("
+ {$row['category']} |
+ {$row['count']} |
+ \$$value |
+
");
+ }
+ echo "
";
+ $query = 'SELECT SUM(value) as value, count(*), text_mode("supplierName") "supplierName", min("supplierABN") as "supplierABN", (
+ case when "supplierABN" != 0 THEN "supplierABN"::text ELSE lower("supplierName") END) as "supplierID" FROM contractnotice
+WHERE ' .$yearQ . " " . $standardQ . ' AND "agencyName" like :agency
+GROUP BY "supplierID" ORDER BY "value" DESC';
+ $query = $conn->prepare($query);
+ $query->bindParam(":agency", $agency);
+ $query->execute();
+ databaseError($conn->errorInfo());
+ echo "Suppliers
+
+ Supplier |
+ Contracts Count |
+ Total Contract Value |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+$supplierID = $row['supplierABN'].'-'. urlencode($row['supplierName']);
+ echo("
+ {$row['supplierName']} |
+ {$row['count']} |
+ \$$value |
+
");
+ }
+ echo "
";
/*
- * * Common categories and uncommon categories
+ * Categories table
+ * SONs/Panels used table
+ * Replace pie chart with percent count/count/percent value/value table
* Procurement method in text, seperate Open via SON from Open
* Consultancies, Confidentialities percentage
Compliance statistics: amendments, delay in reporting average and number completely late */
@@ -23,7 +76,7 @@
$query->execute();
databaseError($conn->errorInfo());
- echo "
+ echo "Contracts
Contract Notice Number |
Contract Description |