--- a/displayAgency.php
+++ b/displayAgency.php
@@ -1,89 +1,130 @@
-prepare($query);
- $query->bindParam(":agency", $agency);
- $query->execute();
- databaseError($conn->errorInfo());
-
- echo "
-
- Contract Notice Number |
- Contract Description |
- Total Contract Value |
- Agency |
- Contract Start Date |
- Supplier |
-
- ";
- foreach ($query->fetchAll() as $row) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row['value']), 2);
- echo ("
- {$row['CNID']} |
- {$row['description']} |
- \$$value | {$row['agencyName']} |
- {$row['contractStart']} |
- {$row['supplierName']} |
-
");
- }
- echo "
";
-} else {
- /*
- split by portfolio
- */
- include_header("Agencies");
- agenciesGraph();
- $query = 'SELECT SUM("value"), "agencyName"
-FROM contractnotice
-WHERE "childCN" is null
-GROUP BY "agencyName" ';
- $query = $conn->prepare($query);
- $query->execute();
- databaseError($conn->errorInfo());
- echo "
-
- Agency |
- Total Contracts Value |
-
- ";
- foreach ($query->fetchAll() as $row) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row[0]), 2);
- $agency = stripslashes($row[1]);
- echo ("{$agency} | \$$value |
\n");
- }
- echo "
";
-}
-include_footer();
-?>
+'.$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 "
";
+/*
+ * 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 */
+
+ $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 |
+ Total Contract Value |
+ Agency |
+ Contract Start Date |
+ Supplier |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ echo ("
+ {$row['CNID']} |
+ {$row['description']} |
+ \$$value | {$row['agencyName']} |
+ {$row['contractStart']} |
+ {$row['supplierName']} |
+
");
+ }
+ echo "
";
+} else {
+ /*
+ split by portfolio
+ */
+ include_header("Agencies");
+ agenciesGraph();
+ $query = 'SELECT SUM("value"), "agencyName"
+FROM contractnotice
+WHERE ' .$yearQ . ' "childCN" is null
+GROUP BY "agencyName" ';
+ $query = $conn->prepare($query);
+ $query->execute();
+ databaseError($conn->errorInfo());
+ echo "
+
+ Agency |
+ Total Contracts Value |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row[0]), 2);
+ $agency = stripslashes($row[1]);
+ echo ("{$agency} | \$$value |
\n");
+ }
+ echo "
";
+}
+include_footer();
+?>
+