Fix more graphs
--- a/admin/import.php
+++ b/admin/import.php
@@ -1,271 +1,258 @@
<?php
+
include_once ("../lib/common.inc.php");
-function processFile($fpath, $tablename)
-{
- global $conn;
- $row = 1;
- $handle = fopen($fpath, "r");
- //"t" mode string translates windows line breaks to unix
- $datamapping0711 = array(
- "Agency" => "agencyName",
- "Parent CN ID" => "parentCN",
- "CN ID" => "CNID",
- "Publish Date" => "publishDate",
- "Amendment Date" => "amendDate",
- "Status" => "",
- "StartDate" => "contractStart",
- "EndDate" => "contractEnd",
- "Value" => "value",
- "Description" => "description",
- "Agency Ref Id" => "agencyID",
- "Category" => "category",
- "Procurement Method" => "procurementMethod",
- "ATM ID" => "atmID",
- "SON ID" => "SONID",
- "Confidentiality - Contract" => "confidentialityContract",
- "Confidentiality - Contract Reason(s)" => "confidentialityContractReason",
- "Confidentiality - Outputs" => "confidentialityOutputs",
- "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason",
- "Consultancy" => "consultancy",
- "Consultancy Reason(s)" => "consultancyReason",
- "Amendment Reason" => "amendmentReason",
- "Supplier Name" => "supplierName",
- "Supplier Address" => "supplierAddress",
- "Supplier City" => "supplierCity",
- "Supplier Postcode" => "supplierPostcode",
- "Supplier Country" => "supplierCountry",
- "Supplier ABNExempt" => "supplierABNExempt",
- "Supplier ABN" => "supplierABN",
- "Agency Branch" => "contactBranch",
- "Agency Divison" => "contactDivision",
- "Agency Postcode" => "contactPostcode",
- "" => ""
- );
- $headers;
- $contractNoticeFields = array(
- "importFile",
- "agencyName",
- "parentCN",
- "CNID",
- "publishDate",
- "amendDate",
- "contractStart",
- "contractEnd",
- "value",
- "description",
- "agencyID",
- "category",
- "procurementMethod",
- "atmID",
- "SONID",
- "confidentialityContract",
- "confidentialityContractReason",
- "confidentialityOutputs",
- "confidentialityOutputsReason",
- "consultancy",
- "consultancyReason",
- "amendmentReason",
- "supplierName",
- "supplierAddress",
- "supplierCity",
- "supplierPostcode",
- "supplierCountry",
- "supplierABNExempt",
- "supplierABN",
- "contactBranch",
- "contactDivision",
- "contactPostcode"
- );
- $agencyFields = array(
- "agencyName"
- );
- $supplierFields = array(
- "supplierName",
- "supplierAddress",
- "supplierCity",
- "supplierPostcode",
- "supplierCountry",
- "supplierABNExempt",
- "supplierABN"
- );
- if ($tablename == "contractnotice") {
- $contractNoticeInsertQ = 'INSERT INTO contractnotice ("' . implode('" , "', $contractNoticeFields) . '") VALUES ( ';
- foreach ($contractNoticeFields as $key => $f) {
- $contractNoticeInsertQ.= ($key == 0 ? "" : ", ") . "?";
- }
- $contractNoticeInsertQ.= ");";
- $contractNoticeInsertQ = $conn->prepare($contractNoticeInsertQ);
- }
- else if ($tablename == "supplierdetails") {
- $supplierInsertQ = 'INSERT INTO supplierdetails ("' . implode('" , "', $supplierFields) . '") VALUES ( ';
- foreach ($supplierFields as $key => $f) {
- $supplierInsertQ.= ($key == 0 ? "" : ", ") . "?";
- }
- $supplierInsertQ.= ");";
- $supplierInsertQ = $conn->prepare($supplierInsertQ);
- }
- else if ($tablename == "agency") {
- $agencyInsertQ = 'INSERT INTO agency ("' . implode('" , "', $agencyFields) . '") VALUES ( ';
- foreach ($agencyFields as $key => $f) {
- $agencyInsertQ.= ($key == 0 ? "" : ", ") . "?";
- }
- $agencyInsertQ.= ");";
- $agencyInsertQ = $conn->prepare($agencyInsertQ);
- }
- while (($data = fgetcsv($handle, 1000, "\t")) !== false) {
- $num = count($data);
- if ($row == 3) {
- $headers = $data;
- }
- elseif ($row > 3) {
- if ($num > count($datamapping0711)) {
- die("<font color=red>Error in data import; data mapping fields out of bounds or changed</font><br>" . $fname . print_r($data));
- }
- $contractNoticeInsert = Array();
- $supplierInsert = Array();
- $agencyInsert = Array();
- $contractNoticeInsert[] = $fpath;
- $keys = array_keys($datamapping0711);
- for ($c = 0; $c < $num; $c++) {
- $data[$c] = trim($data[$c], "=");
- $data[$c] = trim($data[$c], "\"");
- if ($tablename == "contractnotice") {
- if (in_array(($datamapping0711[$headers[$c]]) , $contractNoticeFields)) {
- if (($datamapping0711[$headers[$c]]) == "parentCN" || ($datamapping0711[$headers[$c]]) == "CNID") {
- $data[$c] = substr($data[$c], 2); // take off the "CN" prefix
- if ($data[$c] > 0) {
- $contractNoticeInsert[] = $data[$c];
- }
- else {
- $contractNoticeInsert[] = 0;
- }
- }
- elseif (($datamapping0711[$headers[$c]]) == "supplierABN") {
- if ($data[$c] > 0) {
- $contractNoticeInsert[] = $data[$c];
- }
- else {
- $contractNoticeInsert[] = null;
- }
- }
- elseif (($datamapping0711[$headers[$c]]) == "amendDate" || ($datamapping0711[$headers[$c]]) == "publishDate" || ($datamapping0711[$headers[$c]]) == "contractStart" || ($datamapping0711[$headers[$c]]) == "contractEnd") {
- $contractNoticeInsert[] = date('Y-m-d H:i:s', strtotime($data[$c]));
- }
- else {
- if (strstr("\" =", $data[$c] > 0)) {
- die("Invalid Description field" . $contractNoticeInsert);
- }
-$colvalue = preg_replace( '/[^[:print:]]/', '',utf8_encode( $data[$c]));
-
- $contractNoticeInsert[] = $colvalue;
- }
- }
- }
- else if ($tablename == "supplierdetails") {
- if (in_array(($datamapping0711[$headers[$c]]) , $supplierFields)) {
- if (($datamapping0711[$headers[$c]]) == "supplierABN") {
- if ($data[$c] > 0) {
- $contractNoticeInsert[] = $data[$c];
- }
- else {
- $contractNoticeInsert[] = 0;
- }
- }
- else {
- $supplierInsert[] = $data[$c];
- }
- }
- }
- else if ($tablename == "agency") {
- if (in_array(($datamapping0711[$headers[$c]]) , $agencyFields)) {
- $agencyInsert[] = $data[$c];
- }
- }
- }
- flush();
- if ($tablename == "contractnotice") {
- $contractNoticeInsertQ->execute($contractNoticeInsert);
- $errors = $conn->errorInfo();
- if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
- }
- elseif ($errors[1] == 0) {
- $success++;
- }
- else {
- foreach ($contractNoticeFields as $key => $cnf) {
- echo var_dump($contractNoticeInsert[$key]) . $cnf . "<br>";
- }
- echo $data[2] . " failed CN insert.<br>" . print_r($errors, true) . "<br> row $row <br><br>\n";
- }
- }
- else if ($tablename == "supplierdetails") {
- $supplierInsertQ->execute($supplierInsert);
- $errors = $conn->errorInfo();
- if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
- }
- elseif ($errors[1] == 0) {
- $success++;
- }
- else {
- echo $data[2] . " failed supplier insert.<br>" . print_r($errors, true) . " <br> " . print_r($supplierInsert, true) . "<br> $row <br><br>\n";
- }
- }
- else if ($tablename == "agency") {
- $agencyInsertQ->execute($agencyInsert);
- $errors = $conn->errorInfo();
- if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
- }
- elseif ($errors[1] == 0) {
- $success++;
- }
- else {
- echo $data[2] . " failed agency insert.<br>" . print_r($errors, true) . " <br> " . print_r($agencyInsert, true) . "<br> $row <br><br>\n";
- }
- }
- flush();
- //echo "<hr>\n";
-
- }
- $row++;
- }
- fclose($handle);
- // run post import data processing
+
+$contractNoticeFields = array(
+ "importFile",
+ "agencyName",
+ "parentCN",
+ "CNID",
+ "publishDate",
+ "amendDate",
+ "contractStart",
+ "contractEnd",
+ "value",
+ "description",
+ "agencyID",
+ "category",
+ "procurementMethod",
+ "atmID",
+ "SONID",
+ "confidentialityContract",
+ "confidentialityContractReason",
+ "confidentialityOutputs",
+ "confidentialityOutputsReason",
+ "consultancy",
+ "consultancyReason",
+ "amendmentReason",
+ "supplierName",
+ "supplierAddress",
+ "supplierCity",
+ "supplierPostcode",
+ "supplierCountry",
+ "supplierABNExempt",
+ "supplierABN",
+ "contactBranch",
+ "contactDivision",
+ "contactPostcode"
+);
+$agencyFields = array(
+ "agencyName"
+);
+$supplierFields = array(
+ "supplierName",
+ "supplierAddress",
+ "supplierCity",
+ "supplierPostcode",
+ "supplierCountry",
+ "supplierABNExempt",
+ "supplierABN"
+);
+$contractNoticeInsertQ = 'INSERT INTO contractnotice ("' . implode('" , "', $contractNoticeFields) . '") VALUES ( ';
+foreach ($contractNoticeFields as $key => $f) {
+ $contractNoticeInsertQ.= ($key == 0 ? "" : ", ") . "?";
+}
+$contractNoticeInsertQ.= ");";
+$contractNoticeInsertQ = $conn->prepare($contractNoticeInsertQ);
+
+$supplierInsertQ = 'INSERT INTO supplierdetails ("' . implode('" , "', $supplierFields) . '") VALUES ( ';
+foreach ($supplierFields as $key => $f) {
+ $supplierInsertQ.= ($key == 0 ? "" : ", ") . "?";
+}
+$supplierInsertQ.= ");";
+$supplierInsertQ = $conn->prepare($supplierInsertQ);
+
+$agencyInsertQ = 'INSERT INTO agency_nametoabn ("' . implode('" , "', $agencyFields) . '") VALUES ( ';
+foreach ($agencyFields as $key => $f) {
+ $agencyInsertQ.= ($key == 0 ? "" : ", ") . "?";
+}
+$agencyInsertQ.= ");";
+$agencyInsertQ = $conn->prepare($agencyInsertQ);
+
+function processFile($fpath, $tablename) {
+ global $conn, $contractNoticeQ, $supplierInsertQ, $agencyInsertQ;
+ $row = 1;
+ $handle = fopen($fpath, "r");
+ //"t" mode string translates windows line breaks to unix
+ $datamapping0711 = array(
+ "Agency" => "agencyName",
+ "Parent CN ID" => "parentCN",
+ "CN ID" => "CNID",
+ "Publish Date" => "publishDate",
+ "Amendment Date" => "amendDate",
+ "Status" => "",
+ "StartDate" => "contractStart",
+ "EndDate" => "contractEnd",
+ "Value" => "value",
+ "Description" => "description",
+ "Agency Ref Id" => "agencyID",
+ "Category" => "category",
+ "Procurement Method" => "procurementMethod",
+ "ATM ID" => "atmID",
+ "SON ID" => "SONID",
+ "Confidentiality - Contract" => "confidentialityContract",
+ "Confidentiality - Contract Reason(s)" => "confidentialityContractReason",
+ "Confidentiality - Outputs" => "confidentialityOutputs",
+ "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason",
+ "Consultancy" => "consultancy",
+ "Consultancy Reason(s)" => "consultancyReason",
+ "Amendment Reason" => "amendmentReason",
+ "Supplier Name" => "supplierName",
+ "Supplier Address" => "supplierAddress",
+ "Supplier City" => "supplierCity",
+ "Supplier Postcode" => "supplierPostcode",
+ "Supplier Country" => "supplierCountry",
+ "Supplier ABNExempt" => "supplierABNExempt",
+ "Supplier ABN" => "supplierABN",
+ "Agency Branch" => "contactBranch",
+ "Agency Divison" => "contactDivision",
+ "Agency Postcode" => "contactPostcode",
+ "" => ""
+ );
+ $headers;
+
+ while (($data = fgetcsv($handle, 1000, "\t")) !== false) {
+ $num = count($data);
+ if ($row == 3) {
+ $headers = $data;
+ } elseif ($row > 3) {
+ if ($num > count($datamapping0711)) {
+ die("<font color=red>Error in data import; data mapping fields out of bounds or changed</font><br>" . $fname . print_r($data));
+ }
+ $contractNoticeInsert = Array();
+ $supplierInsert = Array();
+ $agencyInsert = Array();
+ $contractNoticeInsert[] = $fpath;
+ $keys = array_keys($datamapping0711);
+ for ($c = 0; $c < $num; $c++) {
+ $data[$c] = trim($data[$c], "=");
+ $data[$c] = trim($data[$c], "\"");
+ if ($tablename == "contractnotice") {
+ if (in_array(($datamapping0711[$headers[$c]]), $contractNoticeFields)) {
+ if (($datamapping0711[$headers[$c]]) == "parentCN" || ($datamapping0711[$headers[$c]]) == "CNID") {
+ $data[$c] = substr($data[$c], 2); // take off the "CN" prefix
+ if ($data[$c] > 0) {
+ $contractNoticeInsert[] = $data[$c];
+ } else {
+ $contractNoticeInsert[] = 0;
+ }
+ } elseif (($datamapping0711[$headers[$c]]) == "supplierABN") {
+ if ($data[$c] > 0) {
+ $contractNoticeInsert[] = $data[$c];
+ } else {
+ $contractNoticeInsert[] = null;
+ }
+ } elseif (($datamapping0711[$headers[$c]]) == "amendDate" || ($datamapping0711[$headers[$c]]) == "publishDate" || ($datamapping0711[$headers[$c]]) == "contractStart" || ($datamapping0711[$headers[$c]]) == "contractEnd") {
+ $contractNoticeInsert[] = date('Y-m-d H:i:s', strtotime($data[$c]));
+ } else {
+ if (strstr("\" =", $data[$c] > 0)) {
+ die("Invalid Description field" . $contractNoticeInsert);
+ }
+ $colvalue = preg_replace('/[^[:print:]]/', '', utf8_encode($data[$c]));
+
+ $contractNoticeInsert[] = $colvalue;
+ }
+ }
+ } else if ($tablename == "supplierdetails") {
+ if (in_array(($datamapping0711[$headers[$c]]), $supplierFields)) {
+ if (($datamapping0711[$headers[$c]]) == "supplierABN") {
+ if ($data[$c] > 0) {
+ $contractNoticeInsert[] = $data[$c];
+ } else {
+ $contractNoticeInsert[] = 0;
+ }
+ } else {
+ $supplierInsert[] = $data[$c];
+ }
+ }
+ } else if ($tablename == "agency") {
+ if (in_array(($datamapping0711[$headers[$c]]), $agencyFields)) {
+ $agencyInsert[] = $data[$c];
+ }
+ }
+ }
+ flush();
+ if ($tablename == "contractnotice") {
+ $contractNoticeInsertQ->execute($contractNoticeInsert);
+ $errors = $conn->errorInfo();
+ if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
+
+ } elseif ($errors[1] == 0) {
+ $success++;
+ } else {
+ foreach ($contractNoticeFields as $key => $cnf) {
+ echo var_dump($contractNoticeInsert[$key]) . $cnf . "<br>";
+ }
+ echo $data[2] . " failed CN insert.<br>" . print_r($errors, true) . "<br> row $row <br><br>\n";
+ }
+ } else if ($tablename == "supplierdetails") {
+ $supplierInsertQ->execute($supplierInsert);
+ $errors = $conn->errorInfo();
+ if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
+
+ } elseif ($errors[1] == 0) {
+ $success++;
+ } else {
+ echo $data[2] . " failed supplier insert.<br>" . print_r($errors, true) . " <br> " . print_r($supplierInsert, true) . "<br> $row <br><br>\n";
+ }
+ } else if ($tablename == "agency") {
+ $agencyInsertQ->execute($agencyInsert);
+ $errors = $conn->errorInfo();
+ if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) {
+
+ } elseif ($errors[1] == 0) {
+ $success++;
+ } else {
+ echo $data[2] . " failed agency insert.<br>" . print_r($errors, true) . " <br> " . print_r($agencyInsert, true) . "<br> $row <br><br>\n";
+ }
+ }
+ flush();
+ //echo "<hr>\n";
+ }
+ $row++;
+ }
+ fclose($handle);
+ $contractNoticeInsertQ->closeCursor();
+ $supplierInsertQ->closeCursor();
+ $agencyInsertQ->closeCursor();
+
+ return $success;
+}
+
+$path = 'data/';
+if ($_REQUEST["fname"] == "") {
+ echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list<br>";
+ $dhandle = opendir($path);
+ // define an array to hold the files
+ $files = array();
+ if ($dhandle) {
+ // loop through all of the files
+ while (false !== ($fname = readdir($dhandle))) {
+ if (($fname != '.') && ($fname != '..')) {
+ echo "<a href=\"import.php?fname=$fname\">$fname</a> " . filesize($path . $fname) . " " . date("c", filemtime($path . $fname)) . "<br/>";
+ }
+ }
+ }
+} else {
+ $success = 0;
+ $fname = $_REQUEST["fname"];
+ echo " ============== $fname ============== <br>";
+ flush();
+ $success+= processFile($path . $fname, "contractnotice");
+ $success+= processFile($path . $fname, "agency");
+ $success+= processFile($path . $fname, "supplier");
+ echo "<br> $success records successfully created";
+
+ flush();
+ // run post import data processing
// cn
-echo "link amend<br>";
-include ("linkAmendments.php");
-echo "update UNSPSC<br>";
-include ("updateUNSPSC.php");
+ echo "link amend<br>";
+ include ("linkAmendments.php");
+ echo "update UNSPSC<br>";
+ include ("updateUNSPSC.php");
// agency
//include ("setAgencyStatus.php");
//include ("setAgencyURLABN.php");
- return $success;
-}
-$path = 'data/';
-if ($_REQUEST["fname"] == "") {
- echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list<br>";
- $dhandle = opendir($path);
- // define an array to hold the files
- $files = array();
- if ($dhandle) {
- // loop through all of the files
- while (false !== ($fname = readdir($dhandle))) {
- if (($fname != '.') && ($fname != '..')) {
- echo "<a href=\"import.php?fname=$fname\">$fname</a> " . filesize($path . $fname) . " " . date("c", filemtime($path . $fname)) . "<br/>";
- }
- }
- }
-}
-else {
- $success = 0;
- $fname = $_REQUEST["fname"];
- echo " ============== $fname ============== <br>";
- flush();
- $success+= processFile($path . $fname, "contractnotice");
- $success+= processFile($path . $fname, "agency");
- $success+= processFile($path . $fname, "supplier");
- echo "<br> $success records successfully created";
- flush();
-}
-
+}
?>
--- a/admin/neo4jimporter/pom.xml
+++ b/admin/neo4jimporter/pom.xml
@@ -7,7 +7,7 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
- <version>1.5</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
--- a/admin/neo4jimporter/src/main/java/Importer.java
+++ b/admin/neo4jimporter/src/main/java/Importer.java
@@ -88,26 +88,26 @@
+ " AND contractnotice.\"agencyName\" != 'Defence Materiel Organisation' GROUP BY contractnotice.\"agencyName\", "
+ " contractnotice.\"supplierABN\",contractnotice.\"supplierName\"");
String previousAgency = "";
-GraphDatabaseService gds = inserter.getGraphDbService();
-HashMap<String,Long> supplierIDs = new HashMap<String,Long>();
-HashMap<String,Long> agencyIDs = new HashMap<String,Long>();
-
+ GraphDatabaseService gds = inserter.getGraphDbService();
+ HashMap<String, Long> supplierIDs = new HashMap<String, Long>();
+ HashMap<String, Long> agencyIDs = new HashMap<String, Long>();
+
// Loop through the result set
while (rs.next()) {
long supplierID, agencyID;
String supplierKey;
- if (agencyIDs.get(rs.getString("agencyName")) == null) {
- Node myNode = gds.createNode();
- myNode.setProperty("Label", rs.getString("agencyName"));
- myNode.setProperty("type", "agency");
- agencyIDs.put(rs.getString("agencyName"), myNode.getId());
- if (myNode.getId() %100 == 0) {
- System.out.println("Agency "+myNode.getId());
-}
- }
- agencyID = agencyIDs.get(rs.getString("agencyName"));
-
-
+ if (agencyIDs.get(rs.getString("agencyName")) == null) {
+ Node myNode = gds.createNode();
+ myNode.setProperty("Label", rs.getString("agencyName"));
+ myNode.setProperty("type", "agency");
+ agencyIDs.put(rs.getString("agencyName"), myNode.getId());
+ if (myNode.getId() % 100 == 0) {
+ System.out.println("Agency " + myNode.getId());
+ }
+ }
+ agencyID = agencyIDs.get(rs.getString("agencyName"));
+
+
if (rs.getString("supplierABN") != "0" && rs.getString("supplierABN") != "") {
supplierKey = rs.getString("supplierABN");
} else {
@@ -115,19 +115,19 @@
}
// inject some data
if (supplierIDs.get(supplierKey) == null) {
- Node myNode = gds.createNode();
- myNode.setProperty("Label", rs.getString("supplierName"));
- myNode.setProperty("type", "supplier");
+ Node myNode = gds.createNode();
+ myNode.setProperty("Label", rs.getString("supplierName"));
+ myNode.setProperty("type", "supplier");
supplierIDs.put(supplierKey, myNode.getId());
- if (myNode.getId() %1000 == 0) {
- System.out.println("Supplier "+myNode.getId());
-}
+ if (myNode.getId() % 1000 == 0) {
+ System.out.println("Supplier " + myNode.getId());
+ }
}
supplierID = supplierIDs.get(supplierKey);
long rel = inserter.createRelationship(agencyID, supplierID,
- DynamicRelationshipType.withName("KNOWS"), null);
+ DynamicRelationshipType.withName("KNOWS"), null);
inserter.setRelationshipProperty(rel, "Weight", rs.getDouble("sum"));
}
@@ -154,6 +154,4 @@
indexProvider.shutdown();
inserter.shutdown();
}
-
-
}
Binary files a/admin/neo4jimporter/target/classes/Importer.class and b/admin/neo4jimporter/target/classes/Importer.class differ
--- a/australian_federal_government_contract_spending.json
+++ b/australian_federal_government_contract_spending.json
@@ -1,125 +1,164 @@
{
- "dataset":{
- "name":"australian_federal_government_contract_spending",
- "label":"Australian Federal Government Contract Spending",
- "description":"Spending by Australian Federal Government agencies on goods and services from 2007 onwards.",
- "currency":"AUD",
- "unique_keys":[
- "id"
- ],
- "temporal_granularity":"year"
- },
- "mapping":{
- "category": {
- "fields": [ {
- "column": "category",
- "datatype": "string",
- "name": "label"
- } ],
-
- "type": "classifier",
- "description": "",
- "taxonomy": "unspsc",
- "label": "Contract Goods/Services Category"
+ "dataset": {
+ "languages": [
+ "en"
+ ],
+ "currency": "AUD",
+ "name": "australian_federal_government_contract_spending",
+ "territories": [],
+ "default_time": null,
+ "description": "Spending by Australian Federal Government agencies on goods and services from 2007 onwards.",
+ "schema_version": "2011-12-07",
+ "label": "Australian Federal Government Contract Spending"
},
- "from":{
- "fields":[
- {
- "column":"agencyABN",
- "datatype":"string",
- "name":"id"
- },
- {
- "column":"agencyName",
- "datatype":"string",
- "name":"label"
- }
- ],
- "type":"entity",
- "description":"",
- "label":"Government Agency Australian Business Number"
- },
- "description":{
- "column":"description",
- "datatype":"string",
- "type":"value",
- "description":"Contract as described by agency",
- "label":"Contract Description"
- },
- "to":{
- "fields":[
- {
- "column":"supplierName",
- "datatype":"string",
- "name":"label"
- },
- {
- "column":"supplierID",
- "datatype":"string",
- "name":"id"
- }
- ],
- "type":"entity",
- "description":"Government Supplier",
- "label":"Supplier Name"
- },
- "currency":{
- "default_value":"AUD",
- "description":"All entries in AUD, foreign transactions are converted at the time of their payment",
- "column":"",
- "label":"",
- "datatype":"currency",
- "type":"value"
- },
- "amount":{
- "column":"value",
- "datatype":"float",
- "type":"value",
- "description":"The total value of the contract including all variations/amendments/extensions",
- "label":"Contract Value"
- },
- "time":{
- "column":"contractStart",
- "datatype":"date",
- "type":"value",
- "description":"Start of the contract period (goods or services being received)",
- "label":"Contract Start Date"
- },
- "id":{
-"column": "CNID",
- "datatype": "string",
- "name": "label",
- "type": "value",
- "description": "",
- "label": "Contract Notice ID"
- }
- },
-
-"views": [
+ "mapping": {
+ "category": {
+ "description": "Contract Goods/Services Category",
+ "datatype": "string",
+ "label": "category",
+ "column": "cat1",
+ "type": "attribute",
+ "dimension": "category"
+ },
+ "sourceurl": {
+ "description": "Source Document URL",
+ "datatype": "string",
+ "label": "sourceurl",
+ "column": "sourceurl",
+ "type": "attribute",
+ "dimension": "sourceurl"
+ },
+ "from": {
+ "attributes": {
+ "name": {
+ "column": "agencyABN",
+ "datatype": "id",
+ "type": "id",
+ "description": null
+ },
+ "label": {
+ "column": "agencyName",
+ "datatype": "string",
+ "type": "attribute",
+ "description": null
+ }
+ },
+ "label": "Government Agency",
+ "type": "compound",
+ "dimension": "from",
+ "description": "Government Agency"
+ },
+ "description": {
+ "description": null,
+ "datatype": "string",
+ "label": "description",
+ "column": "description",
+ "type": "attribute",
+ "dimension": "description"
+ },
+ "publishdate": {
+ "description": null,
+ "format": null,
+ "datatype": "date",
+ "label": "publishDate",
+ "column": "publishDate",
+ "type": "date",
+ "dimension": "publishdate"
+ },
+ "to": {
+ "attributes": {
+ "name": {
+ "column": "supplierid",
+ "datatype": "id",
+ "type": "id"
+ },
+ "label": {
+ "column": "supplierName",
+ "datatype": "string",
+ "type": "attribute"
+ }
+ },
+ "label": "Supplier Name",
+ "type": "compound",
+ "dimension": "to",
+ "description": "Government Supplier"
+ },
+ "amount": {
+ "description": "The total value of the contract including all variations/amendments/extensions",
+ "datatype": "float",
+ "label": "value",
+ "column": "value",
+ "type": "measure",
+ "dimension": "amount"
+ },
+ "cnid": {
+ "description": "Contract Notice ID",
+ "datatype": "string",
+ "label": "CNID",
+ "column": "CNID",
+ "key": true,
+ "type": "attribute",
+ "dimension": "cnid"
+ },
+ "contractend": {
+ "description": "End of the contract period (goods or services being received)",
+ "format": null,
+ "datatype": "date",
+ "label": "contractEnd",
+ "column": "contractEnd",
+ "type": "date",
+ "dimension": "contractend"
+ },
+ "time": {
+ "description": "Start of the contract period (goods or services being received)",
+ "format": null,
+ "datatype": "date",
+ "label": "contractStart",
+ "column": "contractStart",
+ "type": "date",
+ "dimension": "time"
+ }
+ },
+ "views": [
{
- "name": "default",
- "entity": "dataset",
- "label": "Default breakdown by Category",
- "dimension": "dataset",
- "breakdown": "category",
- "filters" : {"name": "australian_federal_government_contract_spending" }
- },
- {
- "name":"default",
- "entity": "classifier",
- "label":"Breakdown of Spending Areas by Supplier Company",
- "dimension": "category",
- "breakdown": "to",
- "filters": {"taxonomy": "unspsc"}
- },
- {
- "name":"default",
- "entity": "classifier",
- "label":"Breakdown of Spending Areas by Government Agency",
- "dimension": "category",
- "breakdown": "from",
- "filters": {"taxonomy": "unspsc"}
- }
-]
+ "name": "default",
+ "label": "Breakdown by Category",
+ "cuts": {},
+ "drilldown": "category",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "by_supplier",
+ "label": "Breakdown by Supplier",
+ "cuts": {},
+ "drilldown": "to",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "by_agency",
+ "label": "Breakdown by Agency",
+ "cuts": {},
+ "drilldown": "from",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "default",
+ "label": "Agency spending breakdown by supplier",
+ "cuts": {},
+ "drilldown": "to",
+ "entity": "dimension",
+ "dimension": "from"
+ },
+ {
+ "name": "default",
+ "label": "Supplier contracts breakdown by procuring agency",
+ "cuts": {},
+ "drilldown": "from",
+ "entity": "dimension",
+ "dimension": "to"
+ }
+ ]
}
-
--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -20,8 +20,8 @@
$query->execute();
databaseError($conn->errorInfo());
- MethodCountGraph($supplier);
- CnCGraph($supplier);
+ //MethodCountGraph($supplier);
+ //CnCGraph($supplier);
echo "<table> <thead>
<tr>
--- a/exportData.csv.php
+++ b/exportData.csv.php
@@ -10,26 +10,20 @@
foreach ($unspscresult->fetchAll() as $row) {
$unspsc[$row['UNSPSC']] = $row['Title'];
}
-
+/*SELECT count(*), extract("week" from "publishDate") as week,extract("year" from "publishDate") as year
+FROM contractnotice
+where "childCN" is null group by week, year order by year, week*/
$query = $conn->prepare('
-SELECT "CNID",contractnotice."agencyName",agency.abn as "agencyABN",
+SELECT "CNID",contractnotice."agencyName",agency_nametoabn.abn as "agencyABN",
EXTRACT(EPOCH FROM "publishDate") as "publishDate",
EXTRACT(EPOCH FROM "contractStart") as "contractStart",
EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",
-value,description,"procurementMethod",category,"categoryUNSPSC",
-(substr( "categoryUNSPSC"::text, 0, 2 ) || \'000000\'::text) as "cat1",
- (substr( "categoryUNSPSC"::text, 0, 4 ) || \'0000\'::text) as "cat2",
- (substr( "categoryUNSPSC"::text, 0, 6 ) || \'00\'::text) as "cat3",
- "supplierABN","supplierName",
-(
- case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
-
+value,description,category,
+"supplierName",(case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
(\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as sourceURL
-FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName"
+FROM contractnotice join agency_nametoabn on contractnotice."agencyName"=agency_nametoabn."agencyName"
where "childCN" is null'
, array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
-// "supplierCity","supplierPostcode","supplierCountry","contactPostcode",
-//
$query->execute();
$errors = $conn->errorInfo();
if ($errors[2] != "") {
@@ -57,6 +51,9 @@
|| $headers[$key] == "contractEnd") {
$colvalue = date("Y-m-d", $colvalue);
}
+ /* if ($headers[$key] == "CNID") {
+ $colvalue = str_replace("A","", $colvalue);
+}*/
if ($headers[$key] == "cat1" || $headers[$key] == "cat2"
|| $headers[$key] == "cat3") {
$colvalue = $unspsc[$colvalue];
--- /dev/null
+++ b/exportOverview.csv.php
@@ -1,1 +1,49 @@
+<?php
+include_once("./lib/common.inc.php");
+setlocale(LC_CTYPE, 'C');
+// source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
+
+$unspsc = Array();
+$unspscresult = $conn->prepare('select * from "UNSPSCcategories" where "UNSPSC"::text like \'%00000\';');
+$unspscresult->execute();
+foreach ($unspscresult->fetchAll() as $row) {
+ $unspsc[$row['UNSPSC']] = $row['Title'];
+}
+
+$query = $conn->prepare('
+SELECT "CNID" as uid, description as text,
+(\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as url from "contractnotice"
+where "childCN" is null'
+ , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
+$query->execute();
+$errors = $conn->errorInfo();
+if ($errors[2] != "") {
+ die("Export terminated, db error" . print_r($errors, true));
+}
+
+$num_fields = $query->columnCount();
+$headers = Array();
+for ($i = 0; $i < $num_fields; $i++) { // for each column in query, make a CSV header
+ $meta = $query->getColumnMeta($i);
+ $headers[] = $meta['name'];
+}
+$fp = fopen('php://output', 'w');
+if ($fp && $query) {
+ header('Content-Type: text/csv');
+ header('Content-Disposition: attachment; filename="export.' . date("c") . '.csv"');
+ header('Pragma: no-cache');
+ header('Expires: 0');
+ fputcsv($fp, $headers);
+ while ($row = $query->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) {
+ foreach ($row as $key => &$colvalue) {
+
+ $colvalue = preg_replace('/[^[:print:]]/', '', utf8_encode($colvalue));
+
+ }
+ fputcsv($fp, array_values($row));
+ }
+ die;
+}
+?>
+
--- /dev/null
+++ b/lib/csscolor.php
@@ -1,1 +1,423 @@
-
+<?php
+/*
+ csscolor.php
+ Copyright 2004 Patrick Fitzgerald
+ http://www.barelyfitz.com/projects/csscolor/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+
+define('CSS_COLOR_ERROR', 100);
+
+class CSS_Color
+{
+ //==================================================
+ //==PARAMETERS======================================
+ //==================================================
+
+ // $this->bg = array of CSS color values
+ // $this->bg[0] is the bg color
+ // $this->bg['+1'..'+5'] are lighter colors
+ // $this->bg['-1'..'-5'] are darker colors
+ var $bg = array();
+
+ // $this->fg = array of foreground colors.
+ // Each color corresponds to a background color.
+ var $fg = array();
+
+ // brightDiff is the minimum brightness difference
+ // between the background and the foreground.
+ // Note: you should not change this directly,
+ // instead use setBrightDiff() and getBrightDiff()
+ var $minBrightDiff = 126;
+
+ // colorDiff is the minimum color difference
+ // between the background and the foreground.
+ // Note: you should not change this directly,
+ // instead use setColorDiff() and getColorDiff()
+ var $minColorDiff = 500;
+
+ //==================================================
+ //==CONSTRUCTOR=====================================
+ //==================================================
+
+ function CSS_Color($bgHex, $fgHex='')
+ {
+ // This is the constructor method for the class,
+ // which is called when a new object is created.
+
+
+ // Initialize the palette
+ $this->setPalette($bgHex, $fgHex);
+ }
+
+ //==================================================
+ //==METHODS=========================================
+ //==================================================
+
+ //--------------------------------------------------
+ function setPalette($bgHex, $fgHex = '')
+ {
+ // Initialize the color palettes
+
+ // If a foreground color was not specified,
+ // just use the background color.
+ if (!$fgHex) {
+ $fgHex = $bgHex;
+ }
+
+ // Clear the existing palette
+ $this->bg = array();
+ $this->fg = array();
+
+ // Make sure we got a valid hex value
+ if (!$this->isHex($bgHex)) {
+ $this->raiseError("background color '$bgHex' is not a hex color value",
+ __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ // Set the bg color
+ $this->bg[0] = $bgHex;
+
+ $this->bg['+1'] = $this->lighten($bgHex, .85);
+ $this->bg['+2'] = $this->lighten($bgHex, .75);
+ $this->bg['+3'] = $this->lighten($bgHex, .5);
+ $this->bg['+4'] = $this->lighten($bgHex, .25);
+ $this->bg['+5'] = $this->lighten($bgHex, .1);
+
+ $this->bg['-1'] = $this->darken($bgHex, .85);
+ $this->bg['-2'] = $this->darken($bgHex, .75);
+ $this->bg['-3'] = $this->darken($bgHex, .5);
+ $this->bg['-4'] = $this->darken($bgHex, .25);
+ $this->bg['-5'] = $this->darken($bgHex, .1);
+
+ // Make sure we got a valid hex value
+ if (!$this->isHex($fgHex)) {
+ $this->raiseError("background color '$bgHex' is not a hex color value",
+ __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ // Set up the foreground colors
+ $this->fg[0] = $this->calcFG( $this->bg[0], $fgHex);
+ $this->fg['+1'] = $this->calcFG( $this->bg['+1'], $fgHex);
+ $this->fg['+2'] = $this->calcFG( $this->bg['+2'], $fgHex);
+ $this->fg['+3'] = $this->calcFG( $this->bg['+3'], $fgHex);
+ $this->fg['+4'] = $this->calcFG( $this->bg['+4'], $fgHex);
+ $this->fg['+5'] = $this->calcFG( $this->bg['+5'], $fgHex);
+ $this->fg['-1'] = $this->calcFG( $this->bg['-1'], $fgHex);
+ $this->fg['-2'] = $this->calcFG( $this->bg['-2'], $fgHex);
+ $this->fg['-3'] = $this->calcFG( $this->bg['-3'], $fgHex);
+ $this->fg['-4'] = $this->calcFG( $this->bg['-4'], $fgHex);
+ $this->fg['-5'] = $this->calcFG( $this->bg['-5'], $fgHex);
+ }
+
+ //--------------------------------------------------
+ function lighten($hex, $percent)
+ {
+ return $this->mix($hex, $percent, 255);
+ }
+
+ //--------------------------------------------------
+ function darken($hex, $percent)
+ {
+ return $this->mix($hex, $percent, 0);
+ }
+
+ //--------------------------------------------------
+ function mix($hex, $percent, $mask)
+ {
+
+ // Make sure inputs are valid
+ if (!is_numeric($percent) || $percent < 0 || $percent > 1) {
+ $this->raiseError("percent=$percent is not valid",
+ __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ if (!is_int($mask) || $mask < 0 || $mask > 255) {
+ $this->raiseError("mask=$mask is not valid",
+ __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ $rgb = $this->hex2RGB($hex);
+ if (!is_array($rgb)) {
+ // hex2RGB will raise an error
+ return false;
+ }
+
+ for ($i=0; $i<3; $i++) {
+ $rgb[$i] = round($rgb[$i] * $percent) + round($mask * (1-$percent));
+
+ // In case rounding up causes us to go to 256
+ if ($rgb[$i] > 255) {
+ $rgb[$i] = 255;
+ }
+
+ }
+ return $this->RGB2Hex($rgb);
+ }
+
+ //--------------------------------------------------
+ function hex2RGB($hex)
+ {
+ //
+ // Given a hex color (rrggbb or rgb),
+ // returns an array (r, g, b) with decimal values
+ // If $hex is not the correct format,
+ // returns false.
+ //
+ // example:
+ // $d = hex2RGB('#abc');
+ // if (!$d) { error }
+
+ // Regexp for a valid hex digit
+ $d = '[a-fA-F0-9]';
+
+ // Make sure $hex is valid
+ if (preg_match("/^($d$d)($d$d)($d$d)\$/", $hex, $rgb)) {
+
+ return array(
+ hexdec($rgb[1]),
+ hexdec($rgb[2]),
+ hexdec($rgb[3])
+ );
+ }
+ if (preg_match("/^($d)($d)($d)$/", $hex, $rgb)) {
+
+ return array(
+ hexdec($rgb[1] . $rgb[1]),
+ hexdec($rgb[2] . $rgb[2]),
+ hexdec($rgb[3] . $rgb[3])
+ );
+ }
+
+ $this->raiseError("cannot convert hex '$hex' to RGB", __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ //--------------------------------------------------
+ function RGB2Hex($rgb)
+ {
+ // Given an array(rval,gval,bval) consisting of
+ // decimal color values (0-255), returns a hex string
+ // suitable for use with CSS.
+ // Returns false if the input is not in the correct format.
+ // Example:
+ // $h = RGB2Hex(array(255,0,255));
+ // if (!$h) { error };
+
+ // Make sure the input is valid
+ if(!$this->isRGB($rgb)) {
+ $this->raiseError("RGB value is not valid", __FUNCTION__, __LINE__);
+ return false;
+ }
+
+ $hex = "";
+ for($i=0; $i < 3; $i++) {
+
+ // Convert the decimal digit to hex
+ $hexDigit = dechex($rgb[$i]);
+
+ // Add a leading zero if necessary
+ if(strlen($hexDigit) == 1) {
+ $hexDigit = "0" . $hexDigit;
+ }
+
+ // Append to the hex string
+ $hex .= $hexDigit;
+ }
+
+ // Return the complete hex string
+ return $hex;
+ }
+
+ //--------------------------------------------------
+ function isHex($hex)
+ {
+ // Returns true if $hex is a valid CSS hex color.
+ // The "#" character at the start is optional.
+
+ // Regexp for a valid hex digit
+ $d = '[a-fA-F0-9]';
+
+ // Make sure $hex is valid
+ if (preg_match("/^#?$d$d$d$d$d$d\$/", $hex) ||
+ preg_match("/^#?$d$d$d\$/", $hex)) {
+ return true;
+ }
+ return false;
+ }
+
+ //--------------------------------------------------
+ function isRGB($rgb)
+ {
+ // Returns true if $rgb is an array with three valid
+ // decimal color digits.
+
+ if (!is_array($rgb) || count($rgb) != 3) {
+ return false;
+ }
+
+ for($i=0; $i < 3; $i++) {
+
+ // Get the decimal digit
+ $dec = intval($rgb[$i]);
+
+ // Make sure the decimal digit is between 0 and 255
+ if (!is_int($dec) || $dec < 0 || $dec > 255) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ //--------------------------------------------------
+ function calcFG($bgHex, $fgHex)
+ {
+ // Given a background color $bgHex and a foreground color $fgHex,
+ // modifies the foreground color so it will have enough contrast
+ // to be seen against the background color.
+ //
+ // The following parameters are used:
+ // $this->minBrightDiff
+ // $this->minColorDiff
+
+ // Loop through brighter and darker versions
+ // of the foreground color.
+ // The numbers here represent the amount of
+ // foreground color to mix with black and white.
+ foreach (array(1, 0.75, 0.5, 0.25, 0) as $percent) {
+
+ $darker = $this->darken($fgHex, $percent);
+ $lighter = $this->lighten($fgHex, $percent);
+
+ $darkerBrightDiff = $this->brightnessDiff($bgHex, $darker);
+ $lighterBrightDiff = $this->brightnessDiff($bgHex, $lighter);
+
+ if ($lighterBrightDiff > $darkerBrightDiff) {
+ $newFG = $lighter;
+ $newFGBrightDiff = $lighterBrightDiff;
+ } else {
+ $newFG = $darker;
+ $newFGBrightDiff = $darkerBrightDiff;
+ }
+ $newFGColorDiff = $this->colorDiff($bgHex, $newFG);
+
+ if ($newFGBrightDiff >= $this->minBrightDiff &&
+ $newFGColorDiff >= $this->minColorDiff) {
+ break;
+ }
+ }
+
+ return $newFG;
+ }
+
+ //--------------------------------------------------
+ function getMinBrightDiff()
+ {
+ return $this->minBrightDiff;
+ }
+ function setMinBrightDiff($b, $resetPalette = true)
+ {
+ $this->minBrightDiff = $b;
+ if ($resetPalette) {
+ $this->setPalette($this->bg[0],$this->fg[0]);
+ }
+ }
+
+ //--------------------------------------------------
+ function getMinColorDiff()
+ {
+ return $this->minColorDiff;
+ }
+ function setMinColorDiff($d, $resetPalette = true)
+ {
+ $this->minColorDiff = $d;
+ if ($resetPalette) {
+ $this->setPalette($this->bg[0],$this->fg[0]);
+ }
+ }
+
+ //--------------------------------------------------
+ function brightness($hex)
+ {
+ // Returns the brightness value for a color,
+ // a number between zero and 178.
+ // To allow for maximum readability, the difference between
+ // the background brightness and the foreground brightness
+ // should be greater than 125.
+
+ $rgb = $this->hex2RGB($hex);
+ if (!is_array($rgb)) {
+ // hex2RGB will raise an error
+ return false;
+ }
+
+ return( (($rgb[0] * 299) + ($rgb[1] * 587) + ($rgb[2] * 114)) / 1000 );
+ }
+
+ //--------------------------------------------------
+ function brightnessDiff($hex1, $hex2)
+ {
+ // Returns the brightness value for a color,
+ // a number between zero and 178.
+ // To allow for maximum readability, the difference between
+ // the background brightness and the foreground brightness
+ // should be greater than 125.
+
+ $b1 = $this->brightness($hex1);
+ $b2 = $this->brightness($hex2);
+ if (is_bool($b1) || is_bool($b2)) {
+ return false;
+ }
+ return abs($b1 - $b2);
+ }
+
+ //--------------------------------------------------
+ function colorDiff($hex1, $hex2)
+ {
+ // Returns the contrast between two colors,
+ // an integer between 0 and 675.
+ // To allow for maximum readability, the difference between
+ // the background and the foreground color should be > 500.
+
+ $rgb1 = $this->hex2RGB($hex1);
+ $rgb2 = $this->hex2RGB($hex2);
+
+ if (!is_array($rgb1) || !is_array($rgb2)) {
+ // hex2RGB will raise an error
+ return -1;
+ }
+
+ $r1 = $rgb1[0];
+ $g1 = $rgb1[1];
+ $b1 = $rgb1[2];
+
+ $r2 = $rgb2[0];
+ $g2 = $rgb2[1];
+ $b2 = $rgb2[2];
+
+ return(abs($r1-$r2) + abs($g1-$g2) + abs($b1-$b2));
+ }
+
+}
+
+?>
+
--- /dev/null
+++ b/lib/csscolor.test.php
@@ -1,1 +1,37 @@
+<?php
+// Tell the browser that this is CSS instead of HTML
+header("Content-type: text/css");
+
+// Get the color generating code
+include_once("csscolor.php");
+
+// Set the error handing for csscolor.
+// If an error occurs, print the error
+// within a CSS comment so we can see
+// it in the CSS file.
+
+
+// Define a couple color palettes
+$base = new CSS_Color('C9E3A6');
+$highlight = new CSS_Color('746B8E');
+
+// Trigger an error just to see what happens
+// $trigger = new CSS_Color('');
+
+?>
+
+
+.box {
+
+ /* Use the base color, two shades darker */
+ background:#<?php echo $base->bg['-2'] ?>;
+
+ /* Use the corresponding foreground color */
+ color:#<?php echo $base->fg['-2'] ?>;
+
+ /* Use the highlight color as a border */
+ border:5px solid #<?php echo $highlight->bg['0'] ?>
+
+}
+
--- a/lib/graphs.inc.php
+++ b/lib/graphs.inc.php
@@ -136,7 +136,7 @@
global $conn;
includeFlot();
- $query = 'SELECT SUM("value") as val, MAX(contractnotice."agencyName") as agencyname FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName" WHERE "childCN" is null
+ $query = 'SELECT SUM("value") as val, MAX(contractnotice."agencyName") as agencyname FROM contractnotice join agency_nametoabn on contractnotice."agencyName"=agency_nametoabn."agencyName" WHERE "childCN" is null
GROUP BY abn ORDER BY SUM("value") DESC';
$query = $conn->prepare($query);
$query->execute();
@@ -195,11 +195,15 @@
;
function agencySuppliersGraph($agency) {
+
+ global $conn;
$agency = "AusAid";
$topX = 15;
- $query = 'SELECT SUM(value) as val, supplierName FROM `contractnotice` WHERE (YEAR(contractStart) >= $startYear) AND "childCN" is null AND agencyName = \'$agency\'
+ $query = 'SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE (extract ("YEAR" from "contractStart") >= :startYear) AND "childCN" is null AND "agencyName" = :agency
GROUP BY lower(supplierName) ORDER BY val DESC limit $topX';
$query = $conn->prepare($query);
+ $query->bindParam(":startYear",$startYear);
+ $query->bindParam(":agency",$agency);
$query->execute();
databaseError($conn->errorInfo());
$suppliers = Array();
@@ -210,9 +214,11 @@
}
- $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';
- $query = $conn->prepare($query);
+ $query = 'SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE (extract ("YEAR" from "contractStart") >= :startYear) AND "childCN" is null and "agencyName" = :agency
+GROUP BY lower("supplierName") ORDER BY val DESC LIMIT 18446744073709551610 OFFSET $topX) as a';
+ $query = $conn->prepare($query);
+ $query->bindParam(":startYear",$startYear);
+ $query->bindParam(":agency",$agency);
$query->execute();
databaseError($conn->errorInfo());
foreach ($query->fetchAll() as $row) {
@@ -224,8 +230,10 @@
}
function CnCGraph() {
- $query = "select procurementMethod, count(1) as count, SUM(value) as val, MONTH(contractStart) as month, YEAR(contractStart) as year from `contractnotice`
-where $agencyQ $supplierQ $standardQ group by procurementMethod,year,month order by procurementMethod,year,month";
+
+ global $conn;
+ $query = 'select procurementMethod, count(1) as count, SUM(value) as val, 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 = $conn->prepare($query);
$query->execute();
databaseError($conn->errorInfo());
@@ -267,19 +275,21 @@
"Consultancies",
"Confidentialities"
);
- $query = 'SELECT \'consultancy\', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ consultancy=\'Yes\' AND "childCN" is null;';
+ $query = 'SELECT \'consultancy\', count(1) FROM contractnotice WHERE $agencyQ $supplierQ consultancy=\'Yes\' AND "childCN" is null;';
$result = $conn->query($query);
$row = $result->fetch(PDO::FETCH_ASSOC);
$attributes[0] = $row[1];
- $query = 'SELECT \'confidentiality\', count(1) FROM `contractnotice` WHERE $agencyQ $supplierQ (confidentialityContract=\'Yes\' OR confidentialityOutputs=\'Yes\') AND "childCN" is null;';
+ $query = 'SELECT \'confidentiality\', count(1) FROM contractnotice WHERE $agencyQ $supplierQ (confidentialityContract=\'Yes\' OR confidentialityOutputs=\'Yes\') AND "childCN" is null;';
$result = $conn->query($query);
$row = $result->fetch(PDO::FETCH_ASSOC);
$attributes[1] = $row[1];
}
function ContractPublishedGraph() {
+
+ global $conn;
$query = 'SELECT YEAR(publishDate), MONTH(publishDate),
-SUM(value) as val, count(1) as count FROM `contractnotice`
+SUM(value) as val, count(1) as count FROM contractnotice
WHERE (YEAR(publishDate) >= 2008)
AND "childCN" is null
GROUP BY MONTH(publishDate), YEAR(publishDate)
@@ -302,8 +312,10 @@
}
function ContractStartingGraph() {
+
+ global $conn;
$query = 'SELECT YEAR(contractStart), MONTH(contractStart),
-SUM(value) as val, count(1) as count FROM `contractnotice`
+SUM(value) as val, count(1) as count FROM contractnotice
WHERE (YEAR(contractStart) >= 2008)
AND "childCN" is null
GROUP BY MONTH(contractStart), YEAR(contractStart)
@@ -326,7 +338,9 @@
}
function MethodCountGraph() {
- $query = 'select procurementMethod, count(1) as count, SUM(value) as value, MONTH(contractStart) as month, YEAR(contractStart) as year from `contractnotice`
+
+ global $conn;
+ $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';
$methods = Array("Direct", "Open", "Select");
$dates = Array();
@@ -361,7 +375,9 @@
}
function MethodValueGraph() {
- $query = "select procurementMethod, SUM(value) as value, MONTH(contractStart) as month, YEAR(contractStart) as year from `contractnotice`
+
+ global $conn;
+ $query = "select procurementMethod, 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";
$methods = Array("Direct", "Open", "Select");
$dates = Array();