--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -2,28 +2,68 @@
include_once ("./lib/common.inc.php");
if ($_REQUEST['supplier']) {
+ $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
+$title = $supplierName;
+if ($supplierABN) {
+ $query = 'SELECT text_mode("supplierName") as "supplierName" from contractnotice where "supplierABN" = :supplierABN group by "supplierABN"';
+$query = $conn->prepare($query);
+$query->bindParam(":supplierABN", $supplierABN);
+ $query->execute();
+ databaseError($conn->errorInfo());
+ $title = reset($query->fetchAll())['supplierName'];
+}
+ include_header(str_replace("%","",$title));
+echo '
'.str_replace("%","",$title).'
';
+ agenciesGraph();
+ /*
+ * Make supplier name the most common name for this ABN
+ * Common names and uncommon names
+ * Common categories and uncommon categories
+ * Procurement method in text, seperate Open via SON from Open
+ * Consultancies, Confidentialities percentage
+ */
+$query = 'select contractnotice."SONID", min(title) as title, count(*), sum(value) as value from contractnotice inner join standingoffers on contractnotice."SONID" = standingoffers."SONID" WHERE ' .$yearQ . ' ' .
+ $supplierQ . ' ' . $standardQ
+ . ' and contractnotice."SONID" != \'\' group by contractnotice."SONID"';
+$query = $conn->prepare($query);
- $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
- include_header(str_replace("%","",$supplierName));
-echo ''.str_replace("%","",$supplierName).'
';
- // MethodCountGraph($supplierS);
- // CnCGraph($supplierS);
- // MethodValueGraph($supplierS);
- /* lobbyist ties
-
- links to ABR/ASIC/Google News/ASX/Court records
-
- total value to various agencies (bar graph)
-
- spread procurement methods + percent consultancies + percent confidential (bar graph)
-
- spread of contract values
-
- spread of industries (textual?) */
+ if ($supplierParts[0] > 0) {
+ $query->bindParam(":supplierABN", $supplierABN);
+ } else {
+ $query->bindParam(":supplierName", $supplierName);
+ }
+ $query->execute();
+ databaseError($conn->errorInfo());
+echo "Standing Offers/Panels
+
+ Standing Offer |
+ Contracts Count |
+ Total Contract Value |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ echo ("
+ {$row['title']} |
+ {$row['count']} |
+ \$$value |
+
");
+ }
+ echo "
Contracts
+
+ Contract Notice Number |
+ Contract Description |
+ Total Contract Value |
+ Agency |
+ Contract Start Date |
+ Supplier |
+
+ ";
$query = 'SELECT "CNID", "description", "value", "agencyName", "category",
"contractStart", "supplierName"
- FROM contractnotice WHERE ' .
+ FROM contractnotice WHERE ' .$yearQ . ' ' .
$supplierQ . ' ' . $standardQ
. ' ORDER BY value DESC';
@@ -37,19 +77,6 @@
}
$query->execute();
databaseError($conn->errorInfo());
- // echo '';
- // echo '';
-
- 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);
@@ -68,10 +95,10 @@
*/
include_header("Suppliers");
suppliersGraph();
- $query = 'SELECT SUM("value") as val, MAX("supplierName") as supplierName, "supplierABN",(
- case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID
+ $query = 'SELECT SUM("value") as val, text_mode("supplierName") as supplierName, "supplierABN",(
+ case when "supplierABN" != 0 THEN lower("supplierABN"::text) ELSE lower("supplierName") END) as supplierID
FROM contractnotice
-WHERE "childCN" is null
+WHERE ' .$yearQ . ' "childCN" is null
GROUP BY supplierID,"supplierABN"
ORDER BY val DESC
LIMIT 100';