--- a/displayAgency.php
+++ b/displayAgency.php
@@ -1,43 +1,124 @@
'.$agency.'
';
- agencySuppliersGraph($agency);
-// MethodCountGraph($agency);
- // CnCGraph($agency);
- // MethodValueGraph($agency);
- /* biggest contracts
- spending by year
- spending by industry/category
- spending by supplier
+ echo '' . $agency . '
';
- spread procurement methods (stacked bar graph)
- + percent consultancies + percent confidential (bar graph)
-
- Average value by procurement type
-
- --- info
- website, procurement plan, annual reports
- Breakdown of divisions/branches
- Breakdown percentage,number,value by procurement type
- Histograph, overlaying number value reported per week over X years
- Compliance statistics: amendments, delay in reporting average and number completely late */
-
- $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
- "contractStart", "supplierName"
- FROM contractnotice
- WHERE ' .$yearQ . ' "agencyName" like :agency
- ORDER BY "value" DESC limit 100';
+ $query = '
+ SELECT
+sum((consultancy = \'Yes\')::int) AS consultancy,
+sum(("confidentialityContract" = \'Yes\')::int) AS "confidentialityContract",
+sum(("confidentialityOutputs" = \'Yes\')::int) AS "confidentialityOutputs",
+sum((("procurementMethod" = \'Open\' OR "procurementMethod" = \'Open tender\') AND "SONID" IS null)::int) AS open,
+sum((("procurementMethod" = \'Open\' OR "procurementMethod" = \'Open tender\') AND "SONID" IS NOT null)::int) AS "openSON",
+sum(("procurementMethod" = \'Prequalified tender\' OR "procurementMethod" = \'Select\')::INT) AS prequalified,
+sum(("procurementMethod" = \'Direct\' OR "procurementMethod" = \'Limited tender\')::int) AS limited,
+COUNT(*) AS total
+FROM contractnotice
+ WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " ;
$query = $conn->prepare($query);
$query->bindParam(":agency", $agency);
$query->execute();
databaseError($conn->errorInfo());
- echo "
+ $stats = reset($query->fetchAll());
+ show_stats($stats);
+ /*
+
+ Compliance statistics: amendments, delay in reporting average and number completely late */
+
+ $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice
+ WHERE "agencyName" LIKE :agency AND ' . " $yearQ $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 contractnotice."SONID", min(title) AS title, count(*), sum(value) AS value FROM contractnotice INNER JOIN standingoffers ON contractnotice."SONID" = standingoffers."SONID"
+WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " . 'AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"';
+ $query = $conn->prepare($query);
+ $query->bindParam(":agency", $agency);
+ $query->execute();
+ databaseError($conn->errorInfo());
+ $sonrows = "";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ $sonrows .= "
+ {$row['title']} |
+ {$row['count']} |
+ \$$value |
+
";
+ }
+ if (strlen($sonrows) > 1) {
+ echo "Standing Offers/Panels
+
+ Standing Offer |
+ Contracts Count |
+ Total Contract Value |
+
+ $sonrows
";
+ }
+
+ $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 "
";
+
+ $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
+ "contractStart", "supplierName"
+ FROM contractnotice
+ WHERE ' . $yearQ . ' "agencyName" LIKE :agency AND "childCN" IS NULL
+ ORDER BY "value" DESC LIMIT 100';
+ $query = $conn->prepare($query);
+ $query->bindParam(":agency", $agency);
+ $query->execute();
+ databaseError($conn->errorInfo());
+
+ echo "Contracts
Contract Notice Number |
Contract Description |
@@ -50,7 +131,7 @@
foreach ($query->fetchAll() as $row) {
setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row['value']), 2);
- echo ("
+ echo("
{$row['CNID']} |
{$row['description']} |
\$$value | {$row['agencyName']} |
@@ -67,7 +148,7 @@
agenciesGraph();
$query = 'SELECT SUM("value"), "agencyName"
FROM contractnotice
-WHERE ' .$yearQ . ' "childCN" is null
+WHERE ' . $yearQ . ' "childCN" IS NULL
GROUP BY "agencyName" ';
$query = $conn->prepare($query);
$query->execute();
@@ -82,7 +163,7 @@
setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row[0]), 2);
$agency = stripslashes($row[1]);
- echo ("
{$agency} | \$$value |
\n");
+ echo("{$agency} | \$$value |
\n");
}
echo "
";
}