--- a/displayAgency.php
+++ b/displayAgency.php
@@ -1,13 +1,13 @@
'.$agency.'
';
+ echo '' . $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';
+ WHERE "agencyName" LIKE :agency AND ' . " " . $standardQ . ' ' . $yearQ . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10';
$query = $conn->prepare($query);
$query->bindParam(":agency", $agency);
$query->execute();
@@ -32,9 +32,36 @@
");
}
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
+
+ $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 ' . " " . $standardQ . ' ' . $yearQ . '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);
@@ -50,7 +77,7 @@
foreach ($query->fetchAll() as $row) {
setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row['value']), 2);
-$supplierID = $row['supplierABN'].'-'. urlencode($row['supplierName']);
+ $supplierID = $row['supplierABN'] . '-' . urlencode($row['supplierName']);
echo("
{$row['supplierName']} |
{$row['count']} |
@@ -58,19 +85,16 @@
");
}
echo "
";
-/*
- * 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 */
+ /*
+ * Procurement method in text, seperate Open via SON from Open
+ * Consultancies, Confidentialities percentage
+ 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 and "childCN" is null
- ORDER BY "value" DESC limit 100';
+ 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();
@@ -89,7 +113,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']} |
@@ -106,7 +130,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();
@@ -121,7 +145,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 "";
}