--- a/lib/graphs.inc.php
+++ b/lib/graphs.inc.php
@@ -6,6 +6,8 @@
+
+
';
$includedFlot = true;
@@ -18,11 +20,13 @@
?>
prepare($query);
$query->execute();
@@ -117,8 +191,8 @@
function agencySuppliersGraph($agency) {
$agency = "AusAid";
$topX = 15;
-$query = "SELECT SUM(value) as val, supplierName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND childCN = 0 AND agencyName = '$agency'
-GROUP BY lower(supplierName) ORDER BY val DESC limit $topX";
+$query = 'SELECT SUM(value) as val, supplierName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND "childCN" is null AND agencyName = \'$agency\'
+GROUP BY lower(supplierName) ORDER BY val DESC limit $topX';
$result = mysql_query($query);
$suppliers = Array();
$values = Array();
@@ -128,8 +202,8 @@
}
mysql_free_result($result);
-$query = "SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, supplierName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND childCN = 0 and agencyName = '$agency'
-GROUP BY lower(supplierName) ORDER BY val DESC LIMIT 18446744073709551610 OFFSET $topX) as a";
+$query = 'SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, supplierName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND "childCN" is null and agencyName = \'$agency\'
+GROUP BY lower(supplierName) ORDER BY val DESC LIMIT 18446744073709551610 OFFSET $topX) as a';
$result = mysql_query($query);
while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
if ($row['count'] > 0) {
@@ -180,11 +254,11 @@
"Consultancies",
"Confidentialities"
);
-$query = "SELECT 'consultancy', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ consultancy='Yes' AND childCN = 0;";
+$query = 'SELECT \'consultancy\', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ consultancy=\'Yes\' AND "childCN" is null;';
$result = mysql_query($query);
$row = mysql_fetch_array($result, MYSQL_BOTH);
$attributes[0] = $row[1];
-$query = "SELECT 'confidentiality', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ (confidentialityContract='Yes' OR confidentialityOutputs='Yes') AND childCN = 0;";
+$query = 'SELECT \'confidentiality\', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ (confidentialityContract=\'Yes\' OR confidentialityOutputs=\'Yes\') AND "childCN" is null;';
$result = mysql_query($query);
$row = mysql_fetch_array($result, MYSQL_BOTH);
$attributes[1] = $row[1];
@@ -192,12 +266,12 @@
}
function ContractPublishedGraph() {
- $query = "SELECT YEAR(publishDate), MONTH(publishDate),
+ $query = 'SELECT YEAR(publishDate), MONTH(publishDate),
SUM(value) as val, count(1) as count FROM `contractnotice`
WHERE (YEAR(publishDate) >= 2008)
-AND childCN = 0
+AND "childCN" is null
GROUP BY MONTH(publishDate), YEAR(publishDate)
-ORDER BY YEAR(publishDate), MONTH(publishDate)";
+ORDER BY YEAR(publishDate), MONTH(publishDate)';
$result = mysql_query($query);
$dates = Array();
@@ -214,12 +288,12 @@
}
function ContractStartingGraph() {
- $query = "SELECT YEAR(contractStart), MONTH(contractStart),
+ $query = 'SELECT YEAR(contractStart), MONTH(contractStart),
SUM(value) as val, count(1) as count FROM `contractnotice`
WHERE (YEAR(contractStart) >= 2008)
-AND childCN = 0
+AND "childCN" is null
GROUP BY MONTH(contractStart), YEAR(contractStart)
-ORDER BY YEAR(contractStart), MONTH(contractStart)";
+ORDER BY YEAR(contractStart), MONTH(contractStart)';
$result = mysql_query($query);
$dates = Array();
@@ -235,8 +309,8 @@
mysql_free_result($result);
}
function MethodCountGraph() {
- $query = "select procurementMethod, count(1) as count, SUM(value) as value, MONTH(contractStart) as month, YEAR(contractStart) as year from `contractnotice`
-where $agencyQ $supplierQ $standardQ group by procurementMethod,year,month order by procurementMethod,year,month";
+ $query = 'select procurementMethod, count(1) as count, SUM(value) as value, MONTH(contractStart) as month, YEAR(contractStart) as year from `contractnotice`
+where $agencyQ $supplierQ $standardQ group by procurementMethod,year,month order by procurementMethod,year,month';
$result = mysql_query($query);
$methods = Array("Direct","Open","Select");
$dates = Array();
@@ -307,7 +381,7 @@
$query = 'SELECT SUM("value") as value, MAX("supplierName") as supplierName, (
case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID
FROM contractnotice
-WHERE "childCN" = 0
+WHERE "childCN" is null
GROUP BY supplierID
ORDER BY value DESC
LIMIT '.$topX;
@@ -324,7 +398,7 @@
}
$query = 'SELECT sum(a.svalue) as val, suppliercountry from (SELECT sum("value") as svalue, max("supplierCountry") as suppliercountry
-FROM contractnotice WHERE "childCN" = 0 and "supplierCountry" NOT ILIKE \'Australia\'
+FROM contractnotice WHERE "childCN" is null and "supplierCountry" NOT ILIKE \'Australia\'
GROUP BY "supplierName" ORDER BY svalue LIMIT 18446744073 OFFSET 10) as a group by suppliercountry order by val DESC limit 10 ';
$query = $conn->prepare($query);
$query->execute();
@@ -340,7 +414,7 @@
$query = 'SELECT sum(a.value) as val, substring(
supplierpostcode from 0 for 2) as postcode from (SELECT sum(value) as value, max("supplierPostcode") as supplierpostcode, max("supplierCountry") as suppliercountry
-FROM contractnotice WHERE "childCN" = 0
+FROM contractnotice WHERE "childCN" is null
GROUP BY "supplierABN" ORDER BY sum(value) LIMIT 1844674 OFFSET 10) as a
WHERE (suppliercountry ILIKE \'Australia\')
group by substring(
@@ -428,3 +502,4 @@
}
?>
+