--- 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/exportData.csv.php +++ b/exportData.csv.php @@ -16,18 +16,12 @@ EXTRACT(EPOCH FROM "publishDate") as "publishDate", EXTRACT(EPOCH FROM "contractStart") as "contractStart", EXTRACT(EPOCH FROM "contractEnd") as "contractEnd", -value,description,"procurementMethod",category as cat3, -(substr( "categoryUNSPSC"::text, 0, 3 ) || \'000000\'::text) as "cat1", -(substr( "categoryUNSPSC"::text, 0, 5 ) || \'0000\'::text) as "cat2", - "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" where "childCN" is null' , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT)); -// "supplierCity","supplierPostcode","supplierCountry","contactPostcode", $query->execute(); $errors = $conn->errorInfo(); if ($errors[2] != "") { @@ -55,9 +49,9 @@ || $headers[$key] == "contractEnd") { $colvalue = date("Y-m-d", $colvalue); } - if ($headers[$key] == "CNID") { + /* if ($headers[$key] == "CNID") { $colvalue = str_replace("A","", $colvalue); -} +}*/ if ($headers[$key] == "cat1" || $headers[$key] == "cat2" || $headers[$key] == "cat3") { $colvalue = $unspsc[$colvalue];