--- a/displaySupplier.php +++ b/displaySupplier.php @@ -2,27 +2,26 @@ include_once ("./lib/common.inc.php"); if ($_REQUEST['supplier']) { - $supplierS = htmlentities(strip_tags($_REQUEST['supplier'])); - include_header(str_replace("%","",$supplierName)); -echo '

'.str_replace("%","",$supplierName).'

'; +$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(); - // 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?) */ - // echo ''; - // echo ''; + /* + * 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"'; @@ -36,7 +35,7 @@ } $query->execute(); databaseError($conn->errorInfo()); -echo " +echo "

Standing Offers/Panels

@@ -52,7 +51,7 @@ "); } - echo "
Standing Offer Contracts Count\$$value
+ echo "

Contracts

@@ -96,7 +95,7 @@ */ include_header("Suppliers"); suppliersGraph(); - $query = 'SELECT SUM("value") as val, mode("supplierName") as supplierName, "supplierABN",( + $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 ' .$yearQ . ' "childCN" is null
Contract Notice Number Contract Description