Skip to content

Commit

Permalink
Merge pull request #1390 from open-contracting/remove-deprecated-fiel…
Browse files Browse the repository at this point in the history 
…ds-and-codes-from-examples

Remove deprecated fields from examples
  • Loading branch information
@yolile
yolile authored Aug 24, 2021
2 parents 9201edd + 9e204b0 commit 091e41e
Show file tree
Hide file tree
Showing 54 changed files with 219 additions and 388 deletions.
14 changes: 5 additions & 9 deletions docs/_static/json/amendments/amendments-contract-example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
"publishedDate": "2019-02-17T00:00:00Z",
"license": "https://creativecommons.org/licenses/by/3.0/au/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
"https://standard.open-contracting.org/examples/releases/ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5"
],
"records": [
{
"ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856",
Expand Down Expand Up @@ -72,7 +68,7 @@
],
"address": {
"postalCode": "4870",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "QLD",
"locality": "PORTSMITH"
},
Expand Down Expand Up @@ -157,7 +153,7 @@
],
"address": {
"postalCode": "4870",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "QLD",
"locality": "PORTSMITH"
},
Expand Down Expand Up @@ -262,7 +258,7 @@
],
"address": {
"postalCode": "4870",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "QLD",
"locality": "PORTSMITH"
},
Expand Down Expand Up @@ -647,14 +643,14 @@
"value": "4870"
}
],
"countryName": [
"country": [
{
"releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
"releaseDate": "2019-02-15T01:00:58Z",
"releaseTag": [
"contract"
],
"value": "AUSTRALIA"
"value": "AU"
}
],
"region": [
Expand Down
13 changes: 5 additions & 8 deletions docs/_static/json/amendments/amendments-easy-releases-example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"publishedDate": "",
"license": "https://creativecommons.org/licenses/by/3.0/au/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/release-packages/ocds-d2phr6-1000035663"
],
"records": [
{
"ocid": "ocds-d2phr6-1000035663",
Expand All @@ -32,7 +29,7 @@
],
"address": {
"postalCode": "2600",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "ACT",
"streetAddress": "JOHN GORTON BUILDING, KING EDWARD TERRACE, PARKES",
"locality": "CANBERRA"
Expand Down Expand Up @@ -111,7 +108,7 @@
],
"address": {
"postalCode": "2600",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "ACT",
"streetAddress": "JOHN GORTON BUILDING, KING EDWARD TERRACE, PARKES",
"locality": "CANBERRA"
Expand Down Expand Up @@ -192,7 +189,7 @@
],
"address": {
"postalCode": "2600",
"countryName": "AUSTRALIA",
"country": "AU",
"region": "ACT",
"streetAddress": "JOHN GORTON BUILDING, KING EDWARD TERRACE, PARKES",
"locality": "CANBERRA"
Expand Down Expand Up @@ -342,14 +339,14 @@
"value": "2600"
}
],
"countryName": [
"country": [
{
"releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z",
"releaseDate": "2015-04-04T00:00:00Z",
"releaseTag": [
"tender"
],
"value": "AUSTRALIA"
"value": "AU"
}
],
"region": [
Expand Down
29 changes: 0 additions & 29 deletions docs/_static/json/amendments/amendments-tender-example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00002",
Expand Down Expand Up @@ -57,9 +52,6 @@
},
"procurementMethod": "open",
"awardCriteria": "bestProposal",
"submissionMethod": [
"electronicSubmission"
],
"tenderPeriod": {
"startDate": "2016-01-31T09:00:00Z",
"endDate": "2016-02-15T18:00:00Z"
Expand Down Expand Up @@ -108,9 +100,6 @@
},
"procurementMethod": "open",
"awardCriteria": "bestProposal",
"submissionMethod": [
"electronicSubmission"
],
"tenderPeriod": {
"startDate": "2016-01-31T09:00:00Z",
"endDate": "2016-02-15T18:00:00Z"
Expand Down Expand Up @@ -159,9 +148,6 @@
},
"procurementMethod": "open",
"awardCriteria": "bestProposal",
"submissionMethod": [
"electronicSubmission"
],
"tenderPeriod": {
"startDate": "2016-01-31T09:00:00Z",
"endDate": "2016-02-20T18:00:00Z"
Expand Down Expand Up @@ -220,9 +206,6 @@
},
"procurementMethod": "open",
"awardCriteria": "bestProposal",
"submissionMethod": [
"electronicSubmission"
],
"tenderPeriod": {
"startDate": "2016-01-31T09:00:00Z",
"endDate": "2016-02-20T18:00:00Z"
Expand Down Expand Up @@ -444,18 +427,6 @@
"value": "bestProposal"
}
],
"submissionMethod": [
{
"releaseID": "ocds-213czf-000-00002-01-tender",
"releaseDate": "2016-01-01T09:30:00Z",
"releaseTag": [
"tender"
],
"value": [
"electronicSubmission"
]
}
],
"tenderPeriod": {
"startDate": [
{
Expand Down
7 changes: 2 additions & 5 deletions docs/examples/award.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"locality": "London",
"region": "London",
"postalCode": "N11 1NP",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Procurement Team",
Expand Down Expand Up @@ -67,7 +67,7 @@
"locality": "London",
"region": "London",
"postalCode": "E14 5HU",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Contracts Team",
Expand Down Expand Up @@ -130,9 +130,6 @@
"procurementMethodRationale": "An open competitive tender is required by EU Rules",
"awardCriteria": "bestProposal",
"awardCriteriaDetails": "The best proposal, subject to value for money requirements, will be accepted.",
"submissionMethod": [
"electronicSubmission"
],
"submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/",
"enquiryPeriod": {
"startDate": "2010-03-01T09:00:00Z",
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/contract.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"locality": "London",
"region": "London",
"postalCode": "N11 1NP",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Procurement Team",
Expand Down Expand Up @@ -67,7 +67,7 @@
"locality": "London",
"region": "London",
"postalCode": "E14 5HU",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Contracts Team",
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/contractAmendment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"locality": "London",
"region": "London",
"postalCode": "N11 1NP",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Procurement Team",
Expand Down Expand Up @@ -67,7 +67,7 @@
"locality": "London",
"region": "London",
"postalCode": "E14 5HU",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Contracts Team",
Expand Down
5 changes: 1 addition & 4 deletions docs/examples/extended.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"locality": "London",
"region": "London",
"postalCode": "N11 1NP",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Procurement Team",
Expand Down Expand Up @@ -123,9 +123,6 @@
"procurementMethodRationale": "An open competitive tender is required by EU Rules",
"awardCriteria": "bestProposal",
"awardCriteriaDetails": "The best proposal, subject to value for money requirements, will be accepted.",
"submissionMethod": [
"electronicSubmission"
],
"submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/",
"enquiryPeriod": {
"startDate": "2010-03-01T09:00:00Z",
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/implementation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"locality": "London",
"region": "London",
"postalCode": "N11 1NP",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Procurement Team",
Expand Down Expand Up @@ -67,7 +67,7 @@
"locality": "London",
"region": "London",
"postalCode": "E14 5HU",
"countryName": "United Kingdom"
"country": "GB"
},
"contactPoint": {
"name": "Contracts Team",
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/merging/example02-field-planning.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"buyer"
],
"address": {
"countryName": "COLOMBIA",
"country": "CO",
"region": "Bogotá D.C.",
"streetAddress": "Calle 26 No. 27-48",
"locality": "Bogotá D.C."
Expand Down
29 changes: 5 additions & 24 deletions docs/examples/merging/example02-field-record.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"buyer"
],
"address": {
"countryName": "COLOMBIA",
"country": "CO",
"region": "Bogotá D.C.",
"streetAddress": "Calle 26 No. 27-48",
"locality": "Bogotá D.C."
Expand Down Expand Up @@ -86,7 +86,7 @@
"buyer"
],
"address": {
"countryName": "COLOMBIA",
"country": "CO",
"region": "Bogotá D.C.",
"streetAddress": "Calle 26 No. 27-48",
"locality": "Bogotá D.C."
Expand Down Expand Up @@ -127,9 +127,6 @@
"value": {
"amount": 6725000
},
"submissionMethod": [
"inPerson"
],
"submissionMethodDetails": "Municipio obtención: Guayabal Municipio entrega: Guayabal Municipio ejecución: No definido Lugar aclaraciones: No definido",
"procuringEntity": {
"id": "800215546",
Expand All @@ -156,7 +153,7 @@
"buyer"
],
"address": {
"countryName": "COLOMBIA",
"country": "CO",
"region": "Bogotá D.C.",
"streetAddress": "Calle 26 No. 27-48",
"locality": "Bogotá D.C."
Expand Down Expand Up @@ -200,9 +197,6 @@
"value": {
"amount": 6725000
},
"submissionMethod": [
"inPerson"
],
"submissionMethodDetails": "Municipio obtención: Guayabal Municipio entrega: Guayabal Municipio ejecución: No definido Lugar aclaraciones: No definido"
}
},
Expand Down Expand Up @@ -245,14 +239,14 @@
}
],
"address": {
"countryName": [
"country": [
{
"releaseID": "13-9-368828-planning",
"releaseDate": "2013-07-17T16:36:56.000Z",
"releaseTag": [
"planning"
],
"value": "COLOMBIA"
"value": "CO"
}
],
"region": [
Expand Down Expand Up @@ -535,19 +529,6 @@
}
]
},
"submissionMethod": [
{
"releaseID": "13-9-368828-tender",
"releaseDate": "2013-07-17T16:36:56.000Z",
"releaseTag": [
"planningUpdate",
"tender"
],
"value": [
"inPerson"
]
}
],
"submissionMethodDetails": [
{
"releaseID": "13-9-368828-tender",
Expand Down
5 changes: 1 addition & 4 deletions docs/examples/merging/example02-field-tender.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"buyer"
],
"address": {
"countryName": "COLOMBIA",
"country": "CO",
"region": "Bogotá D.C.",
"streetAddress": "Calle 26 No. 27-48",
"locality": "Bogotá D.C."
Expand Down Expand Up @@ -68,9 +68,6 @@
"startDate": "2013-08-01T09:00:00.000Z",
"durationInDays": 15
},
"submissionMethod": [
"inPerson"
],
"submissionMethodDetails": "Municipio obtención: Guayabal Municipio entrega: Guayabal Municipio ejecución: No definido Lugar aclaraciones: No definido",
"procuringEntity": {
"id": "800215546",
Expand Down
Loading

0 comments on commit 091e41e

Please sign in to comment.