--- a/displaySupplier.php +++ b/displaySupplier.php @@ -4,8 +4,11 @@ if ($_REQUEST['supplier']) { $supplierS = htmlentities(strip_tags($_REQUEST['supplier'])); $title = $supplierName; - if ($supplierABN) { - $query = 'SELECT text_mode("supplierName") AS "supplierName" FROM contractnotice WHERE "supplierABN" = :supplierABN GROUP BY "supplierABN"'; + if (isset($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(); @@ -14,7 +17,7 @@ } include_header(str_replace("%", "", $title)); echo '

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

'; -if ($supplierABN) { +if (isset($supplierABN)) { $query = 'SELECT distinct on (lower("supplierName")) "supplierName" from contractnotice where "supplierABN" = :supplierABN'; $query = $conn->prepare($query); $query->bindParam(":supplierABN", $supplierABN); @@ -32,11 +35,12 @@ 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' . $supplierQ . " " . $yearQ . " " .$standardQ ; $query = $conn->prepare($query); - if ($supplierParts[0] > 0) { + if (isset($supplierABN)) { $query->bindParam(":supplierABN", $supplierABN); } else { $query->bindParam(":supplierName", $supplierName); @@ -50,7 +54,7 @@ $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice WHERE ' . $supplierQ . " $yearQ $standardQ ". ' GROUP BY category ORDER BY count(*) DESC LIMIT 10'; $query = $conn->prepare($query); - if ($supplierParts[0] > 0) { + if (isset($supplierABN)) { $query->bindParam(":supplierABN", $supplierABN); } else { $query->bindParam(":supplierName", $supplierName); @@ -84,7 +88,7 @@ GROUP BY abn ORDER BY SUM("value") DESC'; $query = $conn->prepare($query); if (count($supplierParts) > 0) { - if ($supplierParts[0] > 0) { + if (isset($supplierABN)) { $query->bindParam(":supplierABN", $supplierABN); } else { $query->bindParam(":supplierName", $supplierName); @@ -118,7 +122,7 @@ $query = $conn->prepare($query); - if ($supplierParts[0] > 0) { + if (isset($supplierABN)) { $query->bindParam(":supplierABN", $supplierABN); } else { $query->bindParam(":supplierName", $supplierName); @@ -163,7 +167,7 @@ $query = $conn->prepare($query); - if ($supplierParts[0] > 0) { + if (isset($supplierABN)) { $query->bindParam(":supplierABN", $supplierABN); } else { $query->bindParam(":supplierName", $supplierName);