--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -1,33 +1,44 @@
';
- echo '';
- echo '';
- /*lobbyist ties
-
- links to ABR/ASIC/Google News/ASX/Court records
-
- total value to various agencies (bar graph)
-
- spread procurement methods + percent consultancies + percent confidential (bar graph)
-
- spread of contract values
-
- spread of industries (textual?)*/
- $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName
- FROM `contractnotice` WHERE
- $supplierQ $standardQ
- ORDER BY value DESC";
+
+ include_header("Supplier");
+ $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
+ // MethodCountGraph($supplierS);
+ // CnCGraph($supplierS);
+ // MethodValueGraph($supplierS);
+ /* lobbyist ties
+
+ links to ABR/ASIC/Google News/ASX/Court records
+
+ total value to various agencies (bar graph)
+
+ spread procurement methods + percent consultancies + percent confidential (bar graph)
+
+ spread of contract values
+
+ spread of industries (textual?) */
+ $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
+ "contractStart", "supplierName"
+ FROM contractnotice WHERE ' .
+ $supplierQ . ' ' . $standardQ
+ . ' ORDER BY value DESC';
echo $query;
- $result = mysql_query($query);
-echo '';
- echo '';
+ $query = $conn->prepare($query);
- echo "
+
+ if ($supplierParts[0] > 0) {
+ $query->bindParam(":supplierABN", $supplierABN);
+ } else {
+ $query->bindParam(":supplierName", $supplierName);
+ }
+ $query->execute();
+ databaseError($conn->errorInfo());
+ // echo '';
+ // echo '';
+
+ echo "
Contract Notice Number |
Contract Description |
@@ -37,45 +48,50 @@
Supplier |
";
- while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row['value']) , 2);
- echo ("
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ echo ("
{$row['CNID']} |
{$row['description']} |
\$$value | {$row['agencyName']} |
{$row['contractStart']} |
{$row['supplierName']} |
");
- }
- echo "
";
- mysql_free_result($result);
+ }
+ echo "
";
} else {
/*
- histograph of supplier size/value
- */
-include_header("Suppliers");
- $query = "SELECT SUM(value) as val, supplierName, supplierABN
-FROM `contractnotice`
-WHERE childCN = 0
-GROUP BY supplierABN
+ histograph of supplier size/value
+ */
+ 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
+FROM contractnotice
+WHERE "childCN" is null
+GROUP BY supplierID,"supplierABN"
ORDER BY val DESC
-LIMIT 100";
- $result = mysql_query($query);
- echo "
+LIMIT 100';
+ $query = $conn->prepare($query);
+ $query->execute();
+ databaseError($conn->errorInfo());
+ echo "
+ Position |
Supplier |
Total Contract Value |
";
- while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row['val']) , 2);
- $supplier = stripslashes($row['supplierABN'].'-'.$row['supplierName']);
- echo ("".ucsmart($row['supplierName'])." | \$$value |
\n");
- }
- echo "
";
- mysql_free_result($result);
+ $i = 1;
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['val']), 2);
+ $supplier = stripslashes($row['supplierABN'] . '-' . $row['suppliername']);
+ echo ("$i | " . ucsmart($row['suppliername']) . " | \$$value |
\n");
+ $i++;
+ }
+ echo "
";
}
include_footer();
?>