--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -3,11 +3,13 @@
include_once ("./lib/common.inc.php");
if ($_REQUEST['supplier']) {
- include_header("Supplier");
$supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
- MethodCountGraph($supplierS);
- CnCGraph($supplierS);
- MethodValueGraph($supplierS);
+ include_header(str_replace("%","",$supplierName));
+echo '
'.str_replace("%","",$supplierName).'
';
+ agenciesGraph();
+ // MethodCountGraph($supplierS);
+ // CnCGraph($supplierS);
+ // MethodValueGraph($supplierS);
/* lobbyist ties
links to ABR/ASIC/Google News/ASX/Court records
@@ -21,18 +23,22 @@
spread of industries (textual?) */
$query = 'SELECT "CNID", "description", "value", "agencyName", "category",
"contractStart", "supplierName"
- FROM contractnotice WHERE ' .
+ FROM contractnotice WHERE ' .$yearQ . ' ' .
$supplierQ . ' ' . $standardQ
. ' ORDER BY value DESC';
- echo $query;
+
$query = $conn->prepare($query);
-//$query->bindParam(":supplierName", $supplierName);
+
+ if ($supplierParts[0] > 0) {
$query->bindParam(":supplierABN", $supplierABN);
+ } else {
+ $query->bindParam(":supplierName", $supplierName);
+ }
$query->execute();
databaseError($conn->errorInfo());
- echo '';
- echo '';
+ // echo '';
+ // echo '';
echo "
@@ -62,10 +68,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, 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';