--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -4,9 +4,9 @@
include_header("Supplier");
$supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
- echo '';
- echo '';
- echo '';
+ MethodCountGraph($supplierS);
+ CnCGraph($supplierS);
+ MethodValueGraph($supplierS);
/*lobbyist ties
links to ABR/ASIC/Google News/ASX/Court records
@@ -18,12 +18,20 @@
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";
+ $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
+ "contractStart", "supplierName"
+ FROM contractnotice WHERE '.
+ $supplierQ.' '.$standardQ
+ .' ORDER BY value DESC';
echo $query;
- $result = mysql_query($query);
+$query = $conn->prepare($query);
+
+//$query->bindParam(":supplierName", $supplierName);
+$query->bindParam(":supplierABN", $supplierABN);
+ $query->execute();
+ if (!$query) {
+ databaseError($conn->errorInfo());
+ }
echo '';
echo '';
@@ -37,7 +45,7 @@
Supplier |
";
- while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+ foreach ($query->fetchAll() as $row) {
setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row['value']) , 2);
echo ("
@@ -49,33 +57,41 @@
");
}
echo "";
- mysql_free_result($result);
} else {
/*
histograph of supplier size/value
*/
include_header("Suppliers");
- $query = "SELECT SUM(value) as val, supplierName, supplierABN
-FROM `contractnotice`
-WHERE childCN = 0
-GROUP BY supplierName
+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" = 0
+GROUP BY supplierID,"supplierABN"
ORDER BY val DESC
-LIMIT 100";
- $result = mysql_query($query);
+LIMIT 100';
+$query = $conn->prepare($query);
+ $query->execute();
+ if (!$query) {
+ databaseError($conn->errorInfo());
+ }
echo "
+ Position |
Supplier |
Total Contract Value |
";
- while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+$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 ("".ucsmart($row['supplierName'])." | \$$value |
\n");
+ $supplier = stripslashes($row['supplierABN'].'-'.$row['suppliername']);
+ echo ("$i | ".ucsmart($row['suppliername'])." | \$$value |
\n");
+ $i++;
}
echo "
";
- mysql_free_result($result);
}
include_footer();
?>
+