--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -6,7 +6,7 @@
$supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
include_header(str_replace("%","",$supplierName));
echo '
'.str_replace("%","",$supplierName).'
';
-
+ agenciesGraph();
// MethodCountGraph($supplierS);
// CnCGraph($supplierS);
// MethodValueGraph($supplierS);
@@ -23,7 +23,7 @@
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';
@@ -68,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';