--- a/displaySupplier.php +++ b/displaySupplier.php @@ -34,7 +34,7 @@ sum(("procurementMethod" = \'Direct\' OR "procurementMethod" = \'Limited tender\')::int) AS limited, COUNT(*) AS total FROM contractnotice -WHERE' . $supplierQ . " " . $standardQ ; +WHERE' . $supplierQ . " " . $yearQ . " " .$standardQ ; $query = $conn->prepare($query); if ($supplierParts[0] > 0) { $query->bindParam(":supplierABN", $supplierABN); @@ -48,7 +48,7 @@ show_stats($stats); $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice - WHERE ' . $supplierQ . " " . $standardQ . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10'; + WHERE ' . $supplierQ . " $yearQ $standardQ ". ' GROUP BY category ORDER BY count(*) DESC LIMIT 10'; $query = $conn->prepare($query); if ($supplierParts[0] > 0) { $query->bindParam(":supplierABN", $supplierABN); @@ -79,7 +79,7 @@ echo "
"; - $query = 'SELECT SUM("value") AS "value", count(*), MAX(contractnotice."agencyName") AS agencyname FROM contractnotice JOIN agency_nametoabn ON contractnotice."agencyName"=agency_nametoabn."agencyName" + $query = 'SELECT SUM("value") AS "value", count(*), text_mode(contractnotice."agencyName") AS agencyname FROM contractnotice JOIN agency_nametoabn ON contractnotice."agencyName"=agency_nametoabn."agencyName" WHERE ' . $yearQ . ' ' . $supplierQ . ' "childCN" IS NULL GROUP BY abn ORDER BY SUM("value") DESC'; $query = $conn->prepare($query);