--- a/displayAgency.php +++ b/displayAgency.php @@ -6,12 +6,6 @@ $agency = htmlentities(strip_tags($_REQUEST['agency'])); include_header($agency); echo '

' . $agency . '

'; - $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice - WHERE "agencyName" LIKE :agency AND ' . " " . $standardQ . ' ' . $yearQ . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10'; - $query = $conn->prepare($query); - $query->bindParam(":agency", $agency); - $query->execute(); - databaseError($conn->errorInfo()); $query = ' SELECT @@ -22,16 +16,27 @@ sum((("procurementMethod" = \'Open\' OR "procurementMethod" = \'Open tender\') AND "SONID" IS NOT null)::int) AS "openSON", sum(("procurementMethod" = \'Prequalified tender\' OR "procurementMethod" = \'Select\')::INT) AS prequalified, sum(("procurementMethod" = \'Direct\' OR "procurementMethod" = \'Limited tender\')::int) AS limited, +sum("value") as total_value, COUNT(*) AS total FROM contractnotice -WHERE "supplierABN" = \'51194660183\' - '; + WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " ; + $query = $conn->prepare($query); + $query->bindParam(":agency", $agency); + $query->execute(); + databaseError($conn->errorInfo()); + + $stats = reset($query->fetchAll()); + show_stats($stats); /* - * Procurement method in text, seperate Open via SON from Open - * Consultancies, Confidentialities percentage + Compliance statistics: amendments, delay in reporting average and number completely late */ - + $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice + WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10'; + $query = $conn->prepare($query); + $query->bindParam(":agency", $agency); + $query->execute(); + databaseError($conn->errorInfo()); echo "

Categories

@@ -52,7 +57,7 @@ echo "
Category

"; $query = 'SELECT contractnotice."SONID", min(title) AS title, count(*), sum(value) AS value FROM contractnotice INNER JOIN standingoffers ON contractnotice."SONID" = standingoffers."SONID" -WHERE "agencyName" LIKE :agency AND ' . " " . $standardQ . ' ' . $yearQ . 'AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"'; +WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " . 'AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"'; $query = $conn->prepare($query); $query->bindParam(":agency", $agency); $query->execute(); @@ -108,12 +113,16 @@ "contractStart", "supplierName" FROM contractnotice WHERE ' . $yearQ . ' "agencyName" LIKE :agency AND "childCN" IS NULL - ORDER BY "value" DESC LIMIT 100'; + ORDER BY "value" DESC'; +if ($yearQ == '') $query .=' LIMIT 1000'; $query = $conn->prepare($query); $query->bindParam(":agency", $agency); $query->execute(); databaseError($conn->errorInfo()); - +if ($query->rowCount() > 999 && $yearQ == '') { +// if 1000 records warn too many results +print " More than 1000 results found so only first 1000 shown. Please filter by year to see all results "; +} echo "

Contracts

Contract Notice Number