From 762a12bf1583fe02e6e62f296a607822d26acf38 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 23 Oct 2023 12:32:13 +0100 Subject: [PATCH 01/40] update buyers_suppliers, convert csv example to json --- .../organizations/consortia_simple.csv | 2 -- .../organizations/consortia_simple.json | 18 +++++++++++++ docs/guidance/map/buyers_suppliers.md | 26 +++++++++++++++---- 3 files changed, 39 insertions(+), 7 deletions(-) delete mode 100644 docs/examples/organizations/consortia_simple.csv create mode 100644 docs/examples/organizations/consortia_simple.json diff --git a/docs/examples/organizations/consortia_simple.csv b/docs/examples/organizations/consortia_simple.csv deleted file mode 100644 index 9318b76b3..000000000 --- a/docs/examples/organizations/consortia_simple.csv +++ /dev/null @@ -1,2 +0,0 @@ -awards/0/id,awards/0/title,awards/0/suppliers/0/name,awards/0/suppliers/0/identifier/scheme,awards/0/suppliers/0/identifier/id,awards/0/suppliers/1/name,awards/0/suppliers/1/identifier/scheme,awards/0/suppliers/1/identifier/id -DHSC-2019-A18074,Medical imaging device development,SIEMENS PUBLIC LIMITED COMPANY,GB-COH,727817,MICROSOFT LIMITED,GB-COH,1624297 diff --git a/docs/examples/organizations/consortia_simple.json b/docs/examples/organizations/consortia_simple.json new file mode 100644 index 000000000..0c174786e --- /dev/null +++ b/docs/examples/organizations/consortia_simple.json @@ -0,0 +1,18 @@ +{ + "awards": [ + { + "id": "DHSC-2019-A18074", + "title": "Medical imaging device development", + "suppliers": [ + { + "name": "SIEMENS PUBLIC LIMITED COMPANY", + "id": "GB-COH-727817" + }, + { + "name": "MICROSOFT LIMITED", + "id":"GB-COH-1624297" + } + ] + } + ] +} \ No newline at end of file diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md index f5603b867..8cf23ea22 100644 --- a/docs/guidance/map/buyers_suppliers.md +++ b/docs/guidance/map/buyers_suppliers.md @@ -42,9 +42,25 @@ Siemens and Microsoft bid as a consortium for a contract to develop a new medica The contract is awarded to the consortium; however, the legal entity for the consortium is not created until after the contract award. -Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with the respective legal entity identifiers for each organization: - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../../examples/organizations/consortia_simple.csv +Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with the respective ids for each organization that match their id in the `Parties` array: + +```json +{ + "awards": [ + { + "id": "DHSC-2019-A18074", + "title": "Medical imaging device development", + "suppliers": [ + { + "name": "SIEMENS PUBLIC LIMITED COMPANY", + "id": "GB-COH-727817" + }, + { + "name": "MICROSOFT LIMITED", + "id":"GB-COH-1624297" + } + ] + } + ] +} ``` From 87c2ac167cacb65b12f743bbea7accee41e28416 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 23 Oct 2023 12:37:14 +0100 Subject: [PATCH 02/40] consortia_simple.json fix indenting --- docs/examples/organizations/consortia_simple.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/organizations/consortia_simple.json b/docs/examples/organizations/consortia_simple.json index 0c174786e..85920d8a0 100644 --- a/docs/examples/organizations/consortia_simple.json +++ b/docs/examples/organizations/consortia_simple.json @@ -10,9 +10,9 @@ }, { "name": "MICROSOFT LIMITED", - "id":"GB-COH-1624297" + "id": "GB-COH-1624297" } ] } ] -} \ No newline at end of file +} From 26891a429b676e848c42be02eaeacb68072e3d9c Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 11:49:33 +0000 Subject: [PATCH 03/40] update primer/how.md and primer/releases_records.md --- docs/examples/primer/award_items.csv | 2 + docs/examples/primer/award_suppliers.csv | 2 + docs/examples/primer/awards.csv | 2 + .../primer/contract_implementation.csv | 2 + docs/examples/primer/contracts.csv | 2 + docs/examples/primer/documents.csv | 2 + docs/examples/primer/parties.csv | 3 + docs/examples/primer/primer.json | 196 ++++++++++++++++++ docs/examples/primer/releases.csv | 2 + docs/examples/primer/tender_items.csv | 2 + docs/guidance/build/change_history.md | 2 +- docs/guidance/map/milestones.md | 2 +- docs/guidance/map/organizational_units.md | 2 +- docs/guidance/map/pre-qualification.md | 2 +- docs/primer/how.md | 71 ++++++- docs/primer/releases_and_records.md | 4 + 16 files changed, 293 insertions(+), 5 deletions(-) create mode 100644 docs/examples/primer/award_items.csv create mode 100644 docs/examples/primer/award_suppliers.csv create mode 100644 docs/examples/primer/awards.csv create mode 100644 docs/examples/primer/contract_implementation.csv create mode 100644 docs/examples/primer/contracts.csv create mode 100644 docs/examples/primer/documents.csv create mode 100644 docs/examples/primer/parties.csv create mode 100644 docs/examples/primer/primer.json create mode 100644 docs/examples/primer/releases.csv create mode 100644 docs/examples/primer/tender_items.csv diff --git a/docs/examples/primer/award_items.csv b/docs/examples/primer/award_items.csv new file mode 100644 index 000000000..d6d21ec92 --- /dev/null +++ b/docs/examples/primer/award_items.csv @@ -0,0 +1,2 @@ +ocid,id,awards/0/id,awards/0/items/0/id,awards/0/items/0/description,awards/0/items/0/classification/id,awards/0/items/0/classification/scheme,awards/0/items/0/classification/description,awards/0/items/0/quantity,awards/0/items/0/unit/name +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,1,Procurement of Office Stationeries for Ministry of Works,100767,UNSPSC,Stationery,15,packs diff --git a/docs/examples/primer/award_suppliers.csv b/docs/examples/primer/award_suppliers.csv new file mode 100644 index 000000000..8eacd691e --- /dev/null +++ b/docs/examples/primer/award_suppliers.csv @@ -0,0 +1,2 @@ +ocid,id,awards/0/id,awards/0/suppliers/0/id,awards/0/suppliers/0/name +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES diff --git a/docs/examples/primer/awards.csv b/docs/examples/primer/awards.csv new file mode 100644 index 000000000..fb2acd3fa --- /dev/null +++ b/docs/examples/primer/awards.csv @@ -0,0 +1,2 @@ +ocid,id,awards/0/id,awards/0/title,awards/0/description,awards/0/status,awards/0/date,awards/0/value/amount,awards/0/value/currency,awards/0/contractPeriod/startDate,awards/0/contractPeriod/endDate,awards/0/contractPeriod/durationInDays +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,active,2022-06-25T13:00:00Z,299989.5,NGN,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365 diff --git a/docs/examples/primer/contract_implementation.csv b/docs/examples/primer/contract_implementation.csv new file mode 100644 index 000000000..e0cc6b3a5 --- /dev/null +++ b/docs/examples/primer/contract_implementation.csv @@ -0,0 +1,2 @@ +ocid,id,contracts/0/id,contracts/0/implementation/transactions/0/id,contracts/0/implementation/transactions/0/value/amount,contracts/0/implementation/transactions/0/value/currency,contracts/0/implementation/transactions/0/payer/id,contracts/0/implementation/transactions/0/payer/name,contracts/0/implementation/transactions/0/payee/id,contracts/0/implementation/transactions/0/payee/name +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-221-contract-1,ocds-zinqhl-0018553175,299990,NGN,NG-001,MINISTRY OF WORKS AND TRANSPORT,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES diff --git a/docs/examples/primer/contracts.csv b/docs/examples/primer/contracts.csv new file mode 100644 index 000000000..e673dc5ae --- /dev/null +++ b/docs/examples/primer/contracts.csv @@ -0,0 +1,2 @@ +ocid,id,contracts/0/id,contracts/0/awardID,contracts/0/title,contracts/0/description,contracts/0/status,contracts/0/period/startDate,contracts/0/period/endDate,contracts/0/period/durationInDays,contracts/0/value/amount,contracts/0/value/currency,contracts/0/dateSigned +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-221-contract-1,ocds-zinqhl-221,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,active,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365,299989.5,NGN,2022-06-27T09:04:00Z diff --git a/docs/examples/primer/documents.csv b/docs/examples/primer/documents.csv new file mode 100644 index 000000000..058435e78 --- /dev/null +++ b/docs/examples/primer/documents.csv @@ -0,0 +1,2 @@ +ocid,id,tender/id,tender/documents/0/id,tender/documents/0/documentType,tender/documents/0/title,tender/documents/0/description,tender/documents/0/url,tender/documents/0/datePublished,tender/documents/0/format,tender/documents/0/language +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-EB/WTR/EP002-NG,1.0,tenderNotice,Tender Notice,Official tender notice,https://www.ebonyieprocure.eb.gov.ng/admin/0,2022-05-27T16:31:21Z,pdf,en diff --git a/docs/examples/primer/parties.csv b/docs/examples/primer/parties.csv new file mode 100644 index 000000000..89e9d283f --- /dev/null +++ b/docs/examples/primer/parties.csv @@ -0,0 +1,3 @@ +ocid,id,parties/0/id,parties/0/name,parties/0/address/streetAddress,parties/0/address/locality,parties/0/address/region,parties/0/address/postalCode,parties/0/address/countryName,parties/0/contactPoint/name,parties/0/contactPoint/email,parties/0/contactPoint/url,parties/0/roles,parties/0/identifier/id,parties/0/identifier/scheme,parties/0/identifier/legalName,parties/0/contactPoint/telephone +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-001,MINISTRY OF WORKS AND TRANSPORT,"ABAKALIKI, EBONYI STATE",Abakaliki,Ebonyi East,480,Nigeria,"ENGR. OBASI, OGBONNAYA ABARA",works@ebonyieprocure.eb.gov.ng,http://www.mowt.eb.gov.ng/,buyer,,,, +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES,1 Nwankwo Street Abakaliki,Abakaliki,,,,Procurement Team,innocentakamc@gmail.com,,supplier,RC 3306867,NG-CAC,INNOAGY AGRO VENTURES,08035289029 diff --git a/docs/examples/primer/primer.json b/docs/examples/primer/primer.json new file mode 100644 index 000000000..d40a476e4 --- /dev/null +++ b/docs/examples/primer/primer.json @@ -0,0 +1,196 @@ +{ + "uri": "https://ebonyieprocure.eb.gov.ng/do_award_contract_details.php?id=ocds-zinqhl-014665-EB/WTR/EP002-NG", + "version": "1.1", + "publishedDate": "2022-05-27T10:00:00Z", + "releases": [ + { + "ocid": "ocds-zinqhl-014665-EB/WTR/EP002-NG", + "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG-award", + "date": "2022-05-27T16:31:21Z", + "tag": [ + "compiled" + ], + "initiationType": "tender", + "buyer": { + "id": "NG-001", + "name": "MINISTRY OF WORKS AND TRANSPORT" + }, + "language": "en", + "tender": { + "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "complete", + "numberOfTenderers": 3, + "procurementMethod": "open", + "mainProcurementCategory": "goods", + "procurementMethodDetails": "In open procedures, any interested economic operator may submit a tender in response to a contract notice", + "awardCriteriaDetails": "award to most responsive bid", + "submissionMethod": [ + "electronicSubmission" + ], + "submissionMethodDetails": "Submit through the online portal at https://ebonyieprocure.eb.gov.ng", + "tenderPeriod": { + "startDate": "2022-05-27T16:32:00Z", + "endDate": "2022-06-24T14:00:00Z" + }, + "contractPeriod": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "hasEnquiries": true, + "documents": [ + { + "id": "1.0", + "documentType": "tenderNotice", + "title": "Tender Notice", + "description": "Official tender notice", + "url": "https://www.ebonyieprocure.eb.gov.ng/admin/0", + "datePublished": "2022-05-27T16:31:21Z", + "format": "pdf", + "language": "en" + } + ], + "items": [ + { + "id": "1", + "classification": { + "scheme": "UNSPSC", + "id": "14111509", + "description": "Stationery" + }, + "quantity": 15, + "unit": { + "name": "packs" + } + } + ] + }, + "parties": [ + { + "name": "MINISTRY OF WORKS AND TRANSPORT", + "id": "NG-001", + "address": { + "streetAddress": "ABAKALIKI, EBONYI STATE", + "locality": "Abakaliki", + "region": "Ebonyi East", + "postalCode": "480", + "countryName": "Nigeria" + }, + "contactPoint": { + "name": "ENGR. OBASI, OGBONNAYA ABARA", + "email": "works@ebonyieprocure.eb.gov.ng", + "url": "http://www.mowt.eb.gov.ng/" + }, + "roles": [ + "buyer" + ] + }, + { + "id": "NG-CAC-RC 3306867", + "name": "INNOAGY AGRO VENTURES", + "identifier": { + "id": "RC 3306867", + "scheme": "NG-CAC", + "legalName": "INNOAGY AGRO VENTURES" + }, + "address": { + "streetAddress": "1 Nwankwo Street Abakaliki", + "locality": "Abakaliki" + }, + "contactPoint": { + "name": "Procurement Team", + "email": "innocentakamc@gmail.com", + "telephone": "08035289029" + }, + "roles": [ + "supplier" + ] + } + ], + "awards": [ + { + "id": "ocds-zinqhl-221", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "active", + "date": "2022-06-25T13:00:00Z", + "value": { + "amount": 299989.5, + "currency": "NGN" + }, + "items": [ + { + "id": "1", + "description": "Procurement of Office Stationeries for Ministry of Works", + "classification": { + "scheme": "UNSPSC", + "id": "100767", + "description": "Stationery" + }, + "quantity": 15, + "unit": { + "name": "packs" + } + } + ], + "contractPeriod": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "suppliers": [ + { + "id": "NG-CAC-RC 3306867", + "name": "INNOAGY AGRO VENTURES" + } + ] + } + ], + "contracts": [ + { + "id": "ocds-zinqhl-014665-221-contract-1", + "awardID": "ocds-zinqhl-221", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "active", + "period": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "value": { + "amount": 299989.5, + "currency": "NGN" + }, + "dateSigned": "2022-06-27T09:04:00Z", + "implementation": { + "transactions": [ + { + "id": "ocds-zinqhl-0018553175", + "value": { + "amount": 299990, + "currency": "NGN" + }, + "payer": { + "name": "MINISTRY OF WORKS AND TRANSPORT", + "id": "NG-001" + }, + "payee": { + "name": "INNOAGY AGRO VENTURES", + "id": "NG-CAC-RC 3306867" + } + } + ] + } + } + ] + } + ], + "publisher": { + "name": "Ebonyi State Council on Public Procurement" + }, + "license": "https://ebonyieprocure.eb.gov.ng/license.php", + "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php" +} \ No newline at end of file diff --git a/docs/examples/primer/releases.csv b/docs/examples/primer/releases.csv new file mode 100644 index 000000000..a1d3264c8 --- /dev/null +++ b/docs/examples/primer/releases.csv @@ -0,0 +1,2 @@ +ocid,id,date,tag,initiationType,buyer/id,buyer/name,language,tender/id,tender/title,tender/description,tender/status,tender/numberOfTenderers,tender/procurementMethod,tender/mainProcurementCategory,tender/procurementMethodDetails,tender/awardCriteriaDetails,tender/submissionMethod,tender/submissionMethodDetails,tender/tenderPeriod/startDate,tender/tenderPeriod/endDate,tender/contractPeriod/startDate,tender/contractPeriod/endDate,tender/contractPeriod/durationInDays,tender/hasEnquiries +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,2022-05-27T16:31:21Z,compiled,tender,NG-001,MINISTRY OF WORKS AND TRANSPORT,en,ocds-zinqhl-014665-EB/WTR/EP002-NG,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,complete,3,open,goods,"In open procedures, any interested economic operator may submit a tender in response to a contract notice",award to most responsive bid,electronicSubmission,Submit through the online portal at https://ebonyieprocure.eb.gov.ng,2022-05-27T16:32:00Z,2022-06-24T14:00:00Z,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365,TRUE diff --git a/docs/examples/primer/tender_items.csv b/docs/examples/primer/tender_items.csv new file mode 100644 index 000000000..e3dded1cf --- /dev/null +++ b/docs/examples/primer/tender_items.csv @@ -0,0 +1,2 @@ +ocid,id,tender/id,tender/items/0/id,tender/items/0/classification/id,tender/items/0/classification/scheme,tender/items/0/classification/description,tender/items/0/quantity,tender/items/0/unit/name +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-EB/WTR/EP002-NG,1,14111509,UNSPSC,Stationery,15,packs diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index 16c448e6f..ec4efb838 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -102,7 +102,7 @@ The record gets updated to include the new release. The compiled and versioned r ## Implementation -The supplier starts the construction work. After a while, the procuring entity makes the first payment to the supplier. The publisher creates a release to document this update in the process. +The supplier starts the construction work. After a while, the buyer makes the first payment to the supplier. The publisher creates a release to document this update in the process. So far, the council used a single procurement system to manage the process. The procurement system published the previous OCDS releases. diff --git a/docs/guidance/map/milestones.md b/docs/guidance/map/milestones.md index c2de80451..f45200447 100644 --- a/docs/guidance/map/milestones.md +++ b/docs/guidance/map/milestones.md @@ -18,7 +18,7 @@ populate the tender milestones block instead. ## Tender The tender milestones block is used to describe two types of milestone: - * Key dates in the tender and award stages which are not covered by other fields, for example, the date by which procuring entity will respond to enquiries. + * Key dates in the tender and award stages which are not covered by other fields, for example, the date by which buyer or procuring entity will respond to enquiries. * Anticipated milestones during the contract implementation stage, for example, the date by which goods need to be delivered. ## Contract diff --git a/docs/guidance/map/organizational_units.md b/docs/guidance/map/organizational_units.md index 1d5a276fc..d23a6c501 100644 --- a/docs/guidance/map/organizational_units.md +++ b/docs/guidance/map/organizational_units.md @@ -25,7 +25,7 @@ Some publishers use the [memberOf](https://github.com/open-contracting-extension In Honduras, the Ministry of Health is planning the procurement of food supplies for the San Felipe Hospital. For the purposes of the example, San Felipe Hospital is considered to be a unit belonging to the Ministry of Health, and it is not a legal entity of its own. -In the release below, the publisher adds the hospital name at the end of the procuring entity name. The main identifier for the organization (*Secretaría de Salud Pública*) is extracted from a local list in the "HonduCompras" platform, used to publish procurement information in the country. +In the release below, the publisher adds the hospital name at the end of the buyer and procuring entity names. The main identifier for the organization (*Secretaría de Salud Pública*) is extracted from a local list in the "HonduCompras" platform, used to publish procurement information in the country. An identifier for the hospital has been added using the "HN-ONCAE-UNIT" list code. The `address` and `contactPoint` information belongs to the hospital only. diff --git a/docs/guidance/map/pre-qualification.md b/docs/guidance/map/pre-qualification.md index 7361dec20..e12b18e2c 100644 --- a/docs/guidance/map/pre-qualification.md +++ b/docs/guidance/map/pre-qualification.md @@ -39,7 +39,7 @@ The UNCITRAL model law defines pre-selection as a procedure to: > ...identify, prior to solicitation, a **limited number** of suppliers or contractors that best meet the qualification criteria for the procurement concerned. -Pre-selection follows the same process as pre-qualification, with some additional requirements. The invitation to pre-qualify needs to specify how many potential suppliers the buyer or procuring entity will later request proposals from. The invitation also needs to specify how the procuring entity will select the potential suppliers to request proposals from. +Pre-selection follows the same process as pre-qualification, with some additional requirements. The invitation to pre-qualify needs to specify how many potential suppliers the buyer or procuring entity will later request proposals from. The invitation also needs to specify how the buyer or procuring entity will select the potential suppliers to request proposals from. ```{note} The European Union’s restricted procedure, competitive procedure with negotiation, competitive dialogue procedure and innovation partnership all permit the use of pre-selection (see Article 65, [Directive 2014/24/EU](https://eur-lex.europa.eu/eli/dir/2014/24/oj)). diff --git a/docs/primer/how.md b/docs/primer/how.md index 14537bef3..d10bae50b 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -108,13 +108,82 @@ Some schema fields refer to [codelists](../schema/codelists), to limit and stand In addition to the default format of JSON, you can convert and publish your OCDS data as Excel and CSV (comma-separated values) files. -```{admonition} Publication formats: JSON and Excel/CSV +````{admonition} Publication formats: JSON and Excel/CSV :class: hint While the OCDS schema is described using JSON Schema, OCDS data can be converted from its JSON format to tabular formats such as CSV files or spreadsheets. JSON is favored by developers because it uses human-readable text to exchange complex information, such as nested objects. It can contain large volumes of information and is particularly good at handling one-to-many relationships (such as multiple bids per tender notice). Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheets applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats as well both so that more users’ needs can be satisfied. + +## Example + +Ebonyi State in Nigeria publish OCDS data in JSON and tabular format. The JSON data is flattened into a series of CSV files which are combined into a single Excel spreadsheet. + +The following example does not contain all existing fields, and not all of the included fields are required. It has been edited for length and consistency, and is not identical to the data available on the Ebonyi State e-Procurement platform. + +**JSON** + +```{jsoninclude} ../../examples/primer/primer.json +:jsonpointer: +:expand: releases, items +``` + +**CSV** + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/releases.csv +:title: releases +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/parties.csv +:title: parties +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/tender_items.csv +:title: tender_items +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/documents.csv +:title: documents +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/awards.csv +:title: awards +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/award_suppliers.csv +:title: award_suppliers +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/award_items.csv +:title: award_items +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/contracts.csv +:title: contracts +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../examples/primer/contract_implementation.csv +:title: contract_implementation ``` +```` No matter what type of contracting data you are working with or format you publish in, following OCDS rules and guidance will help you and your users to: diff --git a/docs/primer/releases_and_records.md b/docs/primer/releases_and_records.md index 4a1b7b3d3..6c4b2e705 100644 --- a/docs/primer/releases_and_records.md +++ b/docs/primer/releases_and_records.md @@ -45,6 +45,10 @@ When you publish OCDS releases and records, you are encouraged to: * Publish each release and record at its own persistent URL * Produce bulk packages of releases and records for users to download +```{note} +For guidance on how to generate releases and records see the worked examples in [merging](../schema/merging.md) and [change history](../guidance/build/change_history.md). +``` + ```{note} **To learn more,** go to the next page in the Primer: [How can I implement the OCDS?](next) You can also review the further resources below to go deeper into the subjects introduced on this page. From eb37438c67a8acfe3b493bf3168a2d8fc437b4b0 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 12:29:06 +0000 Subject: [PATCH 04/40] primer/how.md: fix csv tables --- docs/primer/how.md | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/primer/how.md b/docs/primer/how.md index d10bae50b..e71d9cf33 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -130,58 +130,66 @@ The following example does not contain all existing fields, and not all of the i **CSV** +***releases*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/releases.csv -:title: releases ``` +***parties*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/parties.csv -:title: parties ``` +***tender_items*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/tender_items.csv -:title: tender_items ``` +***documents*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/documents.csv -:title: documents ``` +***awards*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/awards.csv -:title: awards ``` +***award_suppliers*** + ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/award_suppliers.csv -:title: award_suppliers ``` +***award_items*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/award_items.csv -:title: award_items ``` +***contracts*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/contracts.csv -:title: contracts ``` +***contract_implementation*** + ```{csv-table-no-translate} :header-rows: 1 :file: ../../examples/primer/contract_implementation.csv -:title: contract_implementation ``` ```` From 50f81f43cdf12b5536190e59b7338ea7a3363ae2 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 12:50:12 +0000 Subject: [PATCH 05/40] primer/how.md: fix paths for examples/ --- docs/primer/how.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/primer/how.md b/docs/primer/how.md index e71d9cf33..54f8a451f 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -123,7 +123,7 @@ The following example does not contain all existing fields, and not all of the i **JSON** -```{jsoninclude} ../../examples/primer/primer.json +```{jsoninclude} ../examples/primer/primer.json :jsonpointer: :expand: releases, items ``` @@ -134,62 +134,63 @@ The following example does not contain all existing fields, and not all of the i ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/releases.csv +:file: ../examples/primer/releases.csv ``` ***parties*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/parties.csv +:file: ../examples/primer/parties.csv ``` ***tender_items*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/tender_items.csv +:file: ../examples/primer/tender_items.csv ``` ***documents*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/documents.csv +:file: ../examples/primer/documents.csv ``` ***awards*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/awards.csv +:file: ../examples/primer/awards.csv ``` ***award_suppliers*** ```{csv-table-no-translate} :header-rows: 1 +:file: ../examples/primer/award_suppliers.csv ``` ***award_items*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/award_items.csv +:file: ../examples/primer/award_items.csv ``` ***contracts*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/contracts.csv +:file: ../examples/primer/contracts.csv ``` ***contract_implementation*** ```{csv-table-no-translate} :header-rows: 1 -:file: ../../examples/primer/contract_implementation.csv +:file: ../examples/primer/contract_implementation.csv ``` ```` From 36cf585885013a935bc4a9d1e105a97145613637 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 12:53:09 +0000 Subject: [PATCH 06/40] primer/how.md: remove nested header from admonition --- docs/primer/how.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/primer/how.md b/docs/primer/how.md index 54f8a451f..7aa3aa73e 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -115,7 +115,7 @@ While the OCDS schema is described using JSON Schema, OCDS data can be converted Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheets applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats as well both so that more users’ needs can be satisfied. -## Example +**Example** Ebonyi State in Nigeria publish OCDS data in JSON and tabular format. The JSON data is flattened into a series of CSV files which are combined into a single Excel spreadsheet. From b3ecff32e05bfce88586af9d131e693d6ee4cc1c Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 15:15:19 +0000 Subject: [PATCH 07/40] merging.md: update example using real example from Ghana --- docs/examples/merging/updates/award1.json | 46 - docs/examples/merging/updates/award2.json | 46 - .../merging/updates/ghana_tender1.json | 114 ++ .../merging/updates/ghana_tender2.json | 169 ++ .../merging/updates/ghana_tender3.json | 169 ++ .../merging/updates/ghana_versioned.json | 1421 +++++++++++++++++ docs/examples/merging/updates/tender1.json | 53 - docs/examples/merging/updates/tender2.json | 53 - docs/examples/merging/updates/tender3.json | 62 - docs/examples/merging/updates/versioned.json | 548 ------- docs/guidance/build/merging.md | 32 +- 11 files changed, 1883 insertions(+), 830 deletions(-) delete mode 100644 docs/examples/merging/updates/award1.json delete mode 100644 docs/examples/merging/updates/award2.json create mode 100644 docs/examples/merging/updates/ghana_tender1.json create mode 100644 docs/examples/merging/updates/ghana_tender2.json create mode 100644 docs/examples/merging/updates/ghana_tender3.json create mode 100644 docs/examples/merging/updates/ghana_versioned.json delete mode 100644 docs/examples/merging/updates/tender1.json delete mode 100644 docs/examples/merging/updates/tender2.json delete mode 100644 docs/examples/merging/updates/tender3.json delete mode 100644 docs/examples/merging/updates/versioned.json diff --git a/docs/examples/merging/updates/award1.json b/docs/examples/merging/updates/award1.json deleted file mode 100644 index 6c94c1d8f..000000000 --- a/docs/examples/merging/updates/award1.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-award1", - "date": "2016-03-01T09:30:00Z", - "tag": [ - "award" - ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "status": "active", - "date": "2016-03-01T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - } - ] - } - ] -} diff --git a/docs/examples/merging/updates/award2.json b/docs/examples/merging/updates/award2.json deleted file mode 100644 index aa5db86b2..000000000 --- a/docs/examples/merging/updates/award2.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-award2", - "date": "2016-03-03T09:30:00Z", - "tag": [ - "award" - ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "status": "active", - "date": "2016-03-03T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - } - ] - } - ] -} diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json new file mode 100644 index 000000000..5c96abee3 --- /dev/null +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -0,0 +1,114 @@ +{ + "version": "1.1", + "releases": [ + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 0, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "status": "active" + }, + "initiationType": "tender", + "date": "2020-10-21T13:02:26Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559", + "email": "" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + ], + "language": "en", + "tag": [ + "tender" + ], + "id": "ocds-uhveoc-144560-1601380494627-tender", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + } + ] +} \ No newline at end of file diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json new file mode 100644 index 000000000..ca9d04568 --- /dev/null +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -0,0 +1,169 @@ +{ + "version": "1.1", + "releases": [ + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "datePublished": "2020-10-21T13:02:27Z", + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 2, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "tenderers": [ + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "status": "active" + }, + "initiationType": "tender", + "date": "2020-11-05T14:36:54Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559", + "email": "" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + { + "identifier": { + "legalName": "GS INTERNATIONAL COMPANY LIMITED", + "scheme": "GH-RGD", + "id": "CS422592014" + }, + "address": { + "streetAddress": "Street 676", + "postalCode": "23321", + "locality": "Ga West Municipal", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "SALES.GSINT@GMAIL.COM" + }, + "roles": [ + "tenderer" + ], + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "identifier": { + "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "scheme": "GH-RGD", + "id": "CS362052014" + }, + "address": { + "streetAddress": "Street 21", + "postalCode": "23321", + "locality": "LA DADE-KOTOPON", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "INFO@NEXTCOMPUTERSGHANA.COM" + }, + "roles": [ + "tenderer" + ], + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "language": "en", + "tag": [ + "tenderUpdate" + ], + "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + } + ] +} \ No newline at end of file diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json new file mode 100644 index 000000000..e41dde8a1 --- /dev/null +++ b/docs/examples/merging/updates/ghana_tender3.json @@ -0,0 +1,169 @@ +{ + "version": "1.1", + "releases": [ + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "datePublished": "2020-10-21T13:02:27Z", + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 2, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "tenderers": [ + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "status": "cancelled" + }, + "initiationType": "tender", + "date": "2022-12-19T11:55:46Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559", + "email": "" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + { + "identifier": { + "legalName": "GS INTERNATIONAL COMPANY LIMITED", + "scheme": "GH-RGD", + "id": "CS422592014" + }, + "address": { + "streetAddress": "Street 676", + "postalCode": "23321", + "locality": "Ga West Municipal", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "SALES.GSINT@GMAIL.COM" + }, + "roles": [ + "tenderer" + ], + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "identifier": { + "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "scheme": "GH-RGD", + "id": "CS362052014" + }, + "address": { + "streetAddress": "Street 21", + "postalCode": "23321", + "locality": "LA DADE-KOTOPON", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "INFO@NEXTCOMPUTERSGHANA.COM" + }, + "roles": [ + "tenderer" + ], + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "language": "en", + "tag": [ + "tenderCancellation" + ], + "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + } + ] +} \ No newline at end of file diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json new file mode 100644 index 000000000..f7a77914e --- /dev/null +++ b/docs/examples/merging/updates/ghana_versioned.json @@ -0,0 +1,1421 @@ +{ + "version": "1.1", + "records": [ + { + "ocid": "ocds-uhveoc-144560", + "releases": [ + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 0, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "status": "active" + }, + "initiationType": "tender", + "date": "2020-10-21T13:02:26Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + ], + "language": "en", + "tag": [ + "tender" + ], + "id": "ocds-uhveoc-144560-1601380494627-tender", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + }, + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "datePublished": "2020-10-21T13:02:27Z", + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 2, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "tenderers": [ + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "status": "active" + }, + "initiationType": "tender", + "date": "2020-11-05T14:36:54Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + { + "identifier": { + "legalName": "GS INTERNATIONAL COMPANY LIMITED", + "scheme": "GH-RGD", + "id": "CS422592014" + }, + "address": { + "streetAddress": "Street 676", + "postalCode": "23321", + "locality": "Ga West Municipal", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "SALES.GSINT@GMAIL.COM" + }, + "roles": [ + "tenderer" + ], + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "identifier": { + "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "scheme": "GH-RGD", + "id": "CS362052014" + }, + "address": { + "streetAddress": "Street 21", + "postalCode": "23321", + "locality": "LA DADE-KOTOPON", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "INFO@NEXTCOMPUTERSGHANA.COM" + }, + "roles": [ + "tenderer" + ], + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "language": "en", + "tag": [ + "tenderUpdate" + ], + "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + }, + { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "datePublished": "2020-10-21T13:02:27Z", + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 2, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "tenderers": [ + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "status": "cancelled" + }, + "initiationType": "tender", + "date": "2022-12-19T11:55:46Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + { + "identifier": { + "legalName": "GS INTERNATIONAL COMPANY LIMITED", + "scheme": "GH-RGD", + "id": "CS422592014" + }, + "address": { + "streetAddress": "Street 676", + "postalCode": "23321", + "locality": "Ga West Municipal", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "SALES.GSINT@GMAIL.COM" + }, + "roles": [ + "tenderer" + ], + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "identifier": { + "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "scheme": "GH-RGD", + "id": "CS362052014" + }, + "address": { + "streetAddress": "Street 21", + "postalCode": "23321", + "locality": "LA DADE-KOTOPON", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "INFO@NEXTCOMPUTERSGHANA.COM" + }, + "roles": [ + "tenderer" + ], + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "language": "en", + "tag": [ + "tenderCancellation" + ], + "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + } + ], + "compiledRelease": { + "tender": { + "procuringEntity": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + "documents": [ + { + "datePublished": "2020-10-21T13:02:27Z", + "documentType": "biddingDocuments", + "format": "text/html", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "dateModified": "2020-10-21T12:50:12Z", + "language": "EN", + "id": "144610", + "title": " Toners", + "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ], + "awardPeriod": { + "startDate": "2020-10-30T16:30:00Z" + }, + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "mainProcurementCategory": "goods", + "title": "Toners", + "procurementMethodDetails": "Request for Quotation (RFQ)", + "submissionMethod": [ + "electronicSubmission" + ], + "hasEnquiries": false, + "numberOfTenderers": 2, + "procurementMethod": "limited", + "enquiryPeriod": { + "endDate": "2020-10-28T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "awardCriteria": "priceOnly", + "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + "id": "144560", + "value": { + "amount": 13000, + "currency": "GHS" + }, + "tenderPeriod": { + "endDate": "2020-10-30T16:00:00Z", + "startDate": "2020-10-21T13:02:21Z" + }, + "items": [ + { + "description": "Toner", + "id": "44103103", + "classification": { + "scheme": "UNSPSC", + "description": "Toner", + "id": "44103103", + "uri": "http://www.unspsc.org/codeset-downloads" + } + } + ], + "tenderers": [ + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "status": "cancelled" + }, + "initiationType": "tender", + "date": "2022-12-20T01:01:12Z", + "planning": { + "budget": { + "amount": { + "amount": 13000, + "currency": "GHS" + }, + "description": "Toners", + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", + "scheme": "X-Ghaneps", + "id": "EOCO" + }, + "address": { + "streetAddress": "BARNES ROAD", + "locality": "ACCRA", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "faxNumber": "0302 664786", + "telephone": "0302 665559" + }, + "roles": [ + "buyer", + "procuringEntity" + ], + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + }, + { + "identifier": { + "legalName": "GS INTERNATIONAL COMPANY LIMITED", + "scheme": "GH-RGD", + "id": "CS422592014" + }, + "address": { + "streetAddress": "Street 676", + "postalCode": "23321", + "locality": "Ga West Municipal", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "SALES.GSINT@GMAIL.COM" + }, + "roles": [ + "tenderer" + ], + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387" + }, + { + "identifier": { + "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "scheme": "GH-RGD", + "id": "CS362052014" + }, + "address": { + "streetAddress": "Street 21", + "postalCode": "23321", + "locality": "LA DADE-KOTOPON", + "countryName": "Ghana", + "region": "GH" + }, + "contactPoint": { + "email": "INFO@NEXTCOMPUTERSGHANA.COM" + }, + "roles": [ + "tenderer" + ], + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215" + } + ], + "language": "en", + "tag": [ + "compiled" + ], + "id": "compiled", + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957" + } + }, + "versionedRelease": { + "tender": { + "procuringEntity": { + "name": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "ECONOMIC AND ORGANISED CRIME OFFICE" + } + ], + "id": "14957" + }, + "documents": [ + { + "datePublished": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "2020-10-21T13:02:27Z" + } + ], + "documentType": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "biddingDocuments" + } + ], + "format": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "text/html" + } + ], + "description": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT." + } + ], + "dateModified": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-21T12:50:12Z" + } + ], + "language": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "EN" + } + ], + "id": "144610", + "title": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": " Toners" + } + ], + "url": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" + } + ] + } + ], + "awardPeriod": { + "startDate": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-30T16:30:00Z" + } + ] + }, + "description": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT." + } + ], + "mainProcurementCategory": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "goods" + } + ], + "title": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Toners" + } + ], + "procurementMethodDetails": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Request for Quotation (RFQ)" + } + ], + "submissionMethod": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": [ + "electronicSubmission" + ] + } + ], + "hasEnquiries": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": false + } + ], + "numberOfTenderers": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": 0 + }, + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": 2 + } + ], + "procurementMethod": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "limited" + } + ], + "enquiryPeriod": { + "endDate": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-28T16:00:00Z" + } + ], + "startDate": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-21T13:02:21Z" + } + ] + }, + "awardCriteria": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "priceOnly" + } + ], + "eligibilityCriteria": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n" + } + ], + "id": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "144560" + } + ], + "value": { + "amount": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": 13000 + } + ], + "currency": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "GHS" + } + ] + }, + "tenderPeriod": { + "endDate": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-30T16:00:00Z" + } + ], + "startDate": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "2020-10-21T13:02:21Z" + } + ] + }, + "items": [ + { + "description": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Toner" + } + ], + "id": "44103103", + "classification": { + "scheme": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "UNSPSC" + } + ], + "description": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Toner" + } + ], + "id": "44103103", + "uri": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "http://www.unspsc.org/codeset-downloads" + } + ] + } + } + ], + "tenderers": [ + { + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GS INTERNATIONAL COMPANY LIMITED" + } + ], + "id": "2387" + }, + { + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" + } + ], + "id": "1215" + } + ], + "status": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "active" + }, + { + "releaseTag": [ + "tenderCancellation" + ], + "releaseDate": "2022-12-19T11:55:46Z", + "releaseID": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "value": "cancelled" + } + ] + }, + "initiationType": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "tender" + } + ], + "planning": { + "budget": { + "amount": { + "amount": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": 13000 + } + ], + "currency": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "GHS" + } + ] + }, + "description": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Toners" + } + ], + "id": "GR/EOCO/GD/1410/2020" + } + }, + "parties": [ + { + "identifier": { + "legalName": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "ECONOMIC AND ORGANISED CRIME OFFICE" + } + ], + "scheme": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "X-Ghaneps" + } + ], + "id": "EOCO" + }, + "address": { + "streetAddress": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "BARNES ROAD" + } + ], + "locality": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "ACCRA" + } + ], + "countryName": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "Ghana" + } + ], + "region": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "GH" + } + ] + }, + "contactPoint": { + "faxNumber": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "0302 664786" + } + ], + "telephone": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "0302 665559" + } + ], + "email": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "" + } + ] + }, + "roles": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": [ + "buyer", + "procuringEntity" + ] + } + ], + "name": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "ECONOMIC AND ORGANISED CRIME OFFICE" + } + ], + "id": "14957" + }, + { + "identifier": { + "legalName": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GS INTERNATIONAL COMPANY LIMITED" + } + ], + "scheme": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GH-RGD" + } + ], + "id": "CS422592014" + }, + "address": { + "streetAddress": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "Street 676" + } + ], + "postalCode": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "23321" + } + ], + "locality": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "Ga West Municipal" + } + ], + "countryName": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "Ghana" + } + ], + "region": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GH" + } + ] + }, + "contactPoint": { + "email": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "SALES.GSINT@GMAIL.COM" + } + ] + }, + "roles": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": [ + "tenderer" + ] + } + ], + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GS INTERNATIONAL COMPANY LIMITED" + } + ], + "id": "2387" + }, + { + "identifier": { + "legalName": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" + } + ], + "scheme": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GH-RGD" + } + ], + "id": "CS362052014" + }, + "address": { + "streetAddress": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "Street 21" + } + ], + "postalCode": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "23321" + } + ], + "locality": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "LA DADE-KOTOPON" + } + ], + "countryName": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "Ghana" + } + ], + "region": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GH" + } + ] + }, + "contactPoint": { + "email": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "INFO@NEXTCOMPUTERSGHANA.COM" + } + ] + }, + "roles": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": [ + "tenderer" + ] + } + ], + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" + } + ], + "id": "1215" + } + ], + "language": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "en" + } + ], + "ocid": "ocds-uhveoc-144560", + "buyer": { + "name": [ + { + "releaseTag": [ + "tender" + ], + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "ECONOMIC AND ORGANISED CRIME OFFICE" + } + ], + "id": "14957" + } + } + } + ] +} \ No newline at end of file diff --git a/docs/examples/merging/updates/tender1.json b/docs/examples/merging/updates/tender1.json deleted file mode 100644 index 9ae8a1406..000000000 --- a/docs/examples/merging/updates/tender1.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender", - "date": "2016-01-01T09:30:00Z", - "tag": [ - "tender" - ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Data merge tool.", - "status": "active", - "value": { - "amount": 1000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-15T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - } - } - } - ] -} diff --git a/docs/examples/merging/updates/tender2.json b/docs/examples/merging/updates/tender2.json deleted file mode 100644 index cc9f44348..000000000 --- a/docs/examples/merging/updates/tender2.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender-update", - "date": "2016-01-31T09:30:00Z", - "tag": [ - "tenderUpdate" - ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", - "value": { - "amount": 1000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-15T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - } - } - } - ] -} diff --git a/docs/examples/merging/updates/tender3.json b/docs/examples/merging/updates/tender3.json deleted file mode 100644 index cb598e723..000000000 --- a/docs/examples/merging/updates/tender3.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender-amendment", - "date": "2016-02-05T10:30:00Z", - "tag": [ - "tenderAmendment" - ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", - "value": { - "amount": 2000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, - "amendments": [ - { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - } - } - ] -} diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json deleted file mode 100644 index 4d686b7ea..000000000 --- a/docs/examples/merging/updates/versioned.json +++ /dev/null @@ -1,548 +0,0 @@ -{ - "version": "1.1", - "records": [ - { - "ocid": "ocds-213czf-000-00002", - "releases": [ - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json#ocds-213czf-000-00002-01-award1", - "date": "2016-03-01T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json#ocds-213czf-000-00002-01-award2", - "date": "2016-03-03T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json#ocds-213czf-000-00002-01-tender", - "date": "2016-01-01T09:30:00Z", - "tag": [ - "tender" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json#ocds-213czf-000-00002-01-tender-update", - "date": "2016-01-31T09:30:00Z", - "tag": [ - "tenderUpdate" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json#ocds-213czf-000-00002-01-tender-amendment", - "date": "2016-02-05T10:30:00Z", - "tag": [ - "tenderAmendment" - ] - } - ], - "compiledRelease": { - "tag": [ - "compiled" - ], - "id": "ocds-213czf-000-00002-2016-03-03T09:30:00Z", - "date": "2016-03-03T09:30:00Z", - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ] - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", - "value": { - "amount": 2000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, - "amendments": [ - { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "status": "active", - "date": "2016-03-01T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - }, - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "status": "active", - "date": "2016-03-03T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - } - ] - }, - "versionedRelease": { - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ], - "identifier": { - "scheme": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH" - } - ], - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "09506232" - } - ], - "legalName": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services Co-operative" - } - ], - "uri": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "https://opencorporates.com/companies/gb/09506232" - } - ] - }, - "roles": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": [ - "buyer" - ] - } - ] - } - ], - "buyer": { - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH-09506232" - } - ], - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ] - }, - "tender": { - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "ocds-213czf-000-00002-01-tender" - } - ], - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Data merging tool" - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Data merge tool." - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-update", - "releaseDate": "2016-01-31T09:30:00Z", - "releaseTag": [ - "tenderUpdate" - ], - "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." - } - ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": 1000 - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": 2000 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "USD" - } - ] - }, - "procurementMethod": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "open" - } - ], - "awardCriteria": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "bestProposal" - } - ], - "tenderPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-01-31T09:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-02-15T18:00:00Z" - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "2016-02-20T18:00:00Z" - } - ] - }, - "awardPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-04-01T00:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-06-01T23:59:59Z" - } - ] - }, - "amendments": [ - { - "id": "amendment-1", - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "2016-02-04T09:30:00Z" - } - ], - "rationale": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended" - } - ], - "amendsReleaseID": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "ocds-213czf-000-00002-01-tender" - } - ], - "releaseID": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - } - ] - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Award of contract to create the data merging tool." - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation" - } - ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "active" - } - ], - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "2016-03-01T09:30:00Z" - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": 750 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "USD" - } - ] - } - }, - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Award of contract to create the data merging tool." - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool" - } - ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "active" - } - ], - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "2016-03-03T09:30:00Z" - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": 750 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "USD" - } - ] - } - } - ] - } - } - ] -} diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 76921a3fb..55c276a6e 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -12,50 +12,38 @@ The following examples show how updates and deletions are reflected in compiled ## Example 1: Updates -A public procurement agency publishes a release to announce an opportunity on January 1, 2016 in which the estimated value of the procurement is $1,000. On January 31, it publishes a release to expand the description of the procurement. On February 5, it publishes a release to amend the opportunity, in which the estimated value is increased to $2,000. +A government agency in Ghana publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 they publish an update containing the details of 2 parties that have submitted bids and the publication date of the bidding documents. -The agency decides to award the opportunity to two of the bidders. On March 1, the agency publishes a release to announce that Company A is awarded a contract of $750. On March 3, the agency publishes a release to announce that Company B is awarded a contract of $750. +The agency then decides to cancel the tender. On December 19, 2020 it publishes a third release announcing that the tender has been cancelled. Through these individual releases, the agency provides real-time data about the contracting (or planning) process. In each release, the agency also updates the record, which combines all the releases to date. In the final record: -* The compiled release contains all the information about the opportunity and awards, using the same schema as a release. -* The versioned release makes it easy to see how the description and estimated value changed over time. +* The compiled release contains all the information about the opportunity and the tenderers, using the same schema as a release. +* The versioned release makes it easy to see how the provided changed over time. -```{jsoninclude} ../../examples/merging/updates/tender1.json +```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json :jsonpointer: :expand: releases, tag, tender :title: tender ``` -```{jsoninclude} ../../examples/merging/updates/tender2.json +```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json :jsonpointer: :expand: releases, tag, tender :title: tenderUpdate ``` -```{jsoninclude} ../../examples/merging/updates/tender3.json +```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json :jsonpointer: :expand: releases, tag, tender -:title: tenderAmendment -``` - -```{jsoninclude} ../../examples/merging/updates/award1.json -:jsonpointer: -:expand: releases, tag, awards -:title: awardOne -``` - -```{jsoninclude} ../../examples/merging/updates/award2.json -:jsonpointer: -:expand: releases, tag, awards -:title: awardTwo +:title: tenderCancellation ``` -```{jsoninclude} ../../examples/merging/updates/versioned.json +```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json :jsonpointer: -:expand: records, compiledRelease, versionedRelease, tag, tender, awards +:expand: records, compiledRelease, versionedRelease, tag, tender :title: record ``` From cf172f0d93202f2ac2b3ede4b797d10b74e4567c Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 15:24:25 +0000 Subject: [PATCH 08/40] docs/examples: run ocdskit indent --- .../merging/updates/ghana_tender1.json | 2 +- .../merging/updates/ghana_tender2.json | 2 +- .../merging/updates/ghana_tender3.json | 2 +- .../merging/updates/ghana_versioned.json | 2 +- docs/examples/primer/primer.json | 392 +++++++++--------- 5 files changed, 200 insertions(+), 200 deletions(-) diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json index 5c96abee3..66855ae31 100644 --- a/docs/examples/merging/updates/ghana_tender1.json +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -111,4 +111,4 @@ } } ] -} \ No newline at end of file +} diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json index ca9d04568..a3817df0d 100644 --- a/docs/examples/merging/updates/ghana_tender2.json +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -166,4 +166,4 @@ } } ] -} \ No newline at end of file +} diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json index e41dde8a1..005e30e68 100644 --- a/docs/examples/merging/updates/ghana_tender3.json +++ b/docs/examples/merging/updates/ghana_tender3.json @@ -166,4 +166,4 @@ } } ] -} \ No newline at end of file +} diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json index f7a77914e..af36d7c81 100644 --- a/docs/examples/merging/updates/ghana_versioned.json +++ b/docs/examples/merging/updates/ghana_versioned.json @@ -1418,4 +1418,4 @@ } } ] -} \ No newline at end of file +} diff --git a/docs/examples/primer/primer.json b/docs/examples/primer/primer.json index d40a476e4..7c49a19e9 100644 --- a/docs/examples/primer/primer.json +++ b/docs/examples/primer/primer.json @@ -1,196 +1,196 @@ -{ - "uri": "https://ebonyieprocure.eb.gov.ng/do_award_contract_details.php?id=ocds-zinqhl-014665-EB/WTR/EP002-NG", - "version": "1.1", - "publishedDate": "2022-05-27T10:00:00Z", - "releases": [ - { - "ocid": "ocds-zinqhl-014665-EB/WTR/EP002-NG", - "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG-award", - "date": "2022-05-27T16:31:21Z", - "tag": [ - "compiled" - ], - "initiationType": "tender", - "buyer": { - "id": "NG-001", - "name": "MINISTRY OF WORKS AND TRANSPORT" - }, - "language": "en", - "tender": { - "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "complete", - "numberOfTenderers": 3, - "procurementMethod": "open", - "mainProcurementCategory": "goods", - "procurementMethodDetails": "In open procedures, any interested economic operator may submit a tender in response to a contract notice", - "awardCriteriaDetails": "award to most responsive bid", - "submissionMethod": [ - "electronicSubmission" - ], - "submissionMethodDetails": "Submit through the online portal at https://ebonyieprocure.eb.gov.ng", - "tenderPeriod": { - "startDate": "2022-05-27T16:32:00Z", - "endDate": "2022-06-24T14:00:00Z" - }, - "contractPeriod": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "hasEnquiries": true, - "documents": [ - { - "id": "1.0", - "documentType": "tenderNotice", - "title": "Tender Notice", - "description": "Official tender notice", - "url": "https://www.ebonyieprocure.eb.gov.ng/admin/0", - "datePublished": "2022-05-27T16:31:21Z", - "format": "pdf", - "language": "en" - } - ], - "items": [ - { - "id": "1", - "classification": { - "scheme": "UNSPSC", - "id": "14111509", - "description": "Stationery" - }, - "quantity": 15, - "unit": { - "name": "packs" - } - } - ] - }, - "parties": [ - { - "name": "MINISTRY OF WORKS AND TRANSPORT", - "id": "NG-001", - "address": { - "streetAddress": "ABAKALIKI, EBONYI STATE", - "locality": "Abakaliki", - "region": "Ebonyi East", - "postalCode": "480", - "countryName": "Nigeria" - }, - "contactPoint": { - "name": "ENGR. OBASI, OGBONNAYA ABARA", - "email": "works@ebonyieprocure.eb.gov.ng", - "url": "http://www.mowt.eb.gov.ng/" - }, - "roles": [ - "buyer" - ] - }, - { - "id": "NG-CAC-RC 3306867", - "name": "INNOAGY AGRO VENTURES", - "identifier": { - "id": "RC 3306867", - "scheme": "NG-CAC", - "legalName": "INNOAGY AGRO VENTURES" - }, - "address": { - "streetAddress": "1 Nwankwo Street Abakaliki", - "locality": "Abakaliki" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "innocentakamc@gmail.com", - "telephone": "08035289029" - }, - "roles": [ - "supplier" - ] - } - ], - "awards": [ - { - "id": "ocds-zinqhl-221", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "active", - "date": "2022-06-25T13:00:00Z", - "value": { - "amount": 299989.5, - "currency": "NGN" - }, - "items": [ - { - "id": "1", - "description": "Procurement of Office Stationeries for Ministry of Works", - "classification": { - "scheme": "UNSPSC", - "id": "100767", - "description": "Stationery" - }, - "quantity": 15, - "unit": { - "name": "packs" - } - } - ], - "contractPeriod": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "suppliers": [ - { - "id": "NG-CAC-RC 3306867", - "name": "INNOAGY AGRO VENTURES" - } - ] - } - ], - "contracts": [ - { - "id": "ocds-zinqhl-014665-221-contract-1", - "awardID": "ocds-zinqhl-221", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "active", - "period": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "value": { - "amount": 299989.5, - "currency": "NGN" - }, - "dateSigned": "2022-06-27T09:04:00Z", - "implementation": { - "transactions": [ - { - "id": "ocds-zinqhl-0018553175", - "value": { - "amount": 299990, - "currency": "NGN" - }, - "payer": { - "name": "MINISTRY OF WORKS AND TRANSPORT", - "id": "NG-001" - }, - "payee": { - "name": "INNOAGY AGRO VENTURES", - "id": "NG-CAC-RC 3306867" - } - } - ] - } - } - ] - } - ], - "publisher": { - "name": "Ebonyi State Council on Public Procurement" - }, - "license": "https://ebonyieprocure.eb.gov.ng/license.php", - "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php" -} \ No newline at end of file +{ + "uri": "https://ebonyieprocure.eb.gov.ng/do_award_contract_details.php?id=ocds-zinqhl-014665-EB/WTR/EP002-NG", + "version": "1.1", + "publishedDate": "2022-05-27T10:00:00Z", + "releases": [ + { + "ocid": "ocds-zinqhl-014665-EB/WTR/EP002-NG", + "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG-award", + "date": "2022-05-27T16:31:21Z", + "tag": [ + "compiled" + ], + "initiationType": "tender", + "buyer": { + "id": "NG-001", + "name": "MINISTRY OF WORKS AND TRANSPORT" + }, + "language": "en", + "tender": { + "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "complete", + "numberOfTenderers": 3, + "procurementMethod": "open", + "mainProcurementCategory": "goods", + "procurementMethodDetails": "In open procedures, any interested economic operator may submit a tender in response to a contract notice", + "awardCriteriaDetails": "award to most responsive bid", + "submissionMethod": [ + "electronicSubmission" + ], + "submissionMethodDetails": "Submit through the online portal at https://ebonyieprocure.eb.gov.ng", + "tenderPeriod": { + "startDate": "2022-05-27T16:32:00Z", + "endDate": "2022-06-24T14:00:00Z" + }, + "contractPeriod": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "hasEnquiries": true, + "documents": [ + { + "id": "1.0", + "documentType": "tenderNotice", + "title": "Tender Notice", + "description": "Official tender notice", + "url": "https://www.ebonyieprocure.eb.gov.ng/admin/0", + "datePublished": "2022-05-27T16:31:21Z", + "format": "pdf", + "language": "en" + } + ], + "items": [ + { + "id": "1", + "classification": { + "scheme": "UNSPSC", + "id": "14111509", + "description": "Stationery" + }, + "quantity": 15, + "unit": { + "name": "packs" + } + } + ] + }, + "parties": [ + { + "name": "MINISTRY OF WORKS AND TRANSPORT", + "id": "NG-001", + "address": { + "streetAddress": "ABAKALIKI, EBONYI STATE", + "locality": "Abakaliki", + "region": "Ebonyi East", + "postalCode": "480", + "countryName": "Nigeria" + }, + "contactPoint": { + "name": "ENGR. OBASI, OGBONNAYA ABARA", + "email": "works@ebonyieprocure.eb.gov.ng", + "url": "http://www.mowt.eb.gov.ng/" + }, + "roles": [ + "buyer" + ] + }, + { + "id": "NG-CAC-RC 3306867", + "name": "INNOAGY AGRO VENTURES", + "identifier": { + "id": "RC 3306867", + "scheme": "NG-CAC", + "legalName": "INNOAGY AGRO VENTURES" + }, + "address": { + "streetAddress": "1 Nwankwo Street Abakaliki", + "locality": "Abakaliki" + }, + "contactPoint": { + "name": "Procurement Team", + "email": "innocentakamc@gmail.com", + "telephone": "08035289029" + }, + "roles": [ + "supplier" + ] + } + ], + "awards": [ + { + "id": "ocds-zinqhl-221", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "active", + "date": "2022-06-25T13:00:00Z", + "value": { + "amount": 299989.5, + "currency": "NGN" + }, + "items": [ + { + "id": "1", + "description": "Procurement of Office Stationeries for Ministry of Works", + "classification": { + "scheme": "UNSPSC", + "id": "100767", + "description": "Stationery" + }, + "quantity": 15, + "unit": { + "name": "packs" + } + } + ], + "contractPeriod": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "suppliers": [ + { + "id": "NG-CAC-RC 3306867", + "name": "INNOAGY AGRO VENTURES" + } + ] + } + ], + "contracts": [ + { + "id": "ocds-zinqhl-014665-221-contract-1", + "awardID": "ocds-zinqhl-221", + "title": "Procurement of Office Stationeries for Ministry of Works", + "description": "Procurement of Office Stationeries for Ministry of Works", + "status": "active", + "period": { + "startDate": "2022-06-25T13:00:00Z", + "endDate": "2023-06-25T14:00:00Z", + "durationInDays": 365 + }, + "value": { + "amount": 299989.5, + "currency": "NGN" + }, + "dateSigned": "2022-06-27T09:04:00Z", + "implementation": { + "transactions": [ + { + "id": "ocds-zinqhl-0018553175", + "value": { + "amount": 299990, + "currency": "NGN" + }, + "payer": { + "name": "MINISTRY OF WORKS AND TRANSPORT", + "id": "NG-001" + }, + "payee": { + "name": "INNOAGY AGRO VENTURES", + "id": "NG-CAC-RC 3306867" + } + } + ] + } + } + ] + } + ], + "publisher": { + "name": "Ebonyi State Council on Public Procurement" + }, + "license": "https://ebonyieprocure.eb.gov.ng/license.php", + "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php" +} From fe6dc745c50b15978a0db3018bf9f723e3932b6c Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 15:28:35 +0000 Subject: [PATCH 09/40] add back versioned.json --- docs/examples/merging/updates/versioned.json | 548 +++++++++++++++++++ 1 file changed, 548 insertions(+) create mode 100644 docs/examples/merging/updates/versioned.json diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json new file mode 100644 index 000000000..4d686b7ea --- /dev/null +++ b/docs/examples/merging/updates/versioned.json @@ -0,0 +1,548 @@ +{ + "version": "1.1", + "records": [ + { + "ocid": "ocds-213czf-000-00002", + "releases": [ + { + "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json#ocds-213czf-000-00002-01-award1", + "date": "2016-03-01T09:30:00Z", + "tag": [ + "award" + ] + }, + { + "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json#ocds-213czf-000-00002-01-award2", + "date": "2016-03-03T09:30:00Z", + "tag": [ + "award" + ] + }, + { + "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json#ocds-213czf-000-00002-01-tender", + "date": "2016-01-01T09:30:00Z", + "tag": [ + "tender" + ] + }, + { + "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json#ocds-213czf-000-00002-01-tender-update", + "date": "2016-01-31T09:30:00Z", + "tag": [ + "tenderUpdate" + ] + }, + { + "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json#ocds-213czf-000-00002-01-tender-amendment", + "date": "2016-02-05T10:30:00Z", + "tag": [ + "tenderAmendment" + ] + } + ], + "compiledRelease": { + "tag": [ + "compiled" + ], + "id": "ocds-213czf-000-00002-2016-03-03T09:30:00Z", + "date": "2016-03-03T09:30:00Z", + "ocid": "ocds-213czf-000-00002", + "parties": [ + { + "id": "GB-COH-09506232", + "name": "Open Data Services", + "identifier": { + "scheme": "GB-COH", + "id": "09506232", + "legalName": "Open Data Services Co-operative", + "uri": "https://opencorporates.com/companies/gb/09506232" + }, + "roles": [ + "buyer" + ] + } + ], + "buyer": { + "id": "GB-COH-09506232", + "name": "Open Data Services" + }, + "tender": { + "id": "ocds-213czf-000-00002-01-tender", + "title": "Data merging tool", + "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", + "status": "active", + "value": { + "amount": 2000, + "currency": "USD" + }, + "procurementMethod": "open", + "awardCriteria": "bestProposal", + "tenderPeriod": { + "startDate": "2016-01-31T09:00:00Z", + "endDate": "2016-02-20T18:00:00Z" + }, + "awardPeriod": { + "startDate": "2016-04-01T00:00:00Z", + "endDate": "2016-06-01T23:59:59Z" + }, + "amendments": [ + { + "id": "amendment-1", + "date": "2016-02-04T09:30:00Z", + "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", + "amendsReleaseID": "ocds-213czf-000-00002-01-tender", + "releaseID": "ocds-213czf-000-00002-01-tender-amendment" + } + ] + }, + "awards": [ + { + "id": "ocds-213czf-000-00002-award-supplier-one", + "title": "Award of contract to create the data merging tool.", + "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", + "status": "active", + "date": "2016-03-01T09:30:00Z", + "value": { + "amount": 750, + "currency": "USD" + } + }, + { + "id": "ocds-213czf-000-00002-award-supplier-two", + "title": "Award of contract to create the data merging tool.", + "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", + "status": "active", + "date": "2016-03-03T09:30:00Z", + "value": { + "amount": 750, + "currency": "USD" + } + } + ] + }, + "versionedRelease": { + "ocid": "ocds-213czf-000-00002", + "parties": [ + { + "id": "GB-COH-09506232", + "name": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "Open Data Services" + } + ], + "identifier": { + "scheme": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "GB-COH" + } + ], + "id": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "09506232" + } + ], + "legalName": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "Open Data Services Co-operative" + } + ], + "uri": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "https://opencorporates.com/companies/gb/09506232" + } + ] + }, + "roles": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": [ + "buyer" + ] + } + ] + } + ], + "buyer": { + "id": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "GB-COH-09506232" + } + ], + "name": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "Open Data Services" + } + ] + }, + "tender": { + "id": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "ocds-213czf-000-00002-01-tender" + } + ], + "title": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "Data merging tool" + } + ], + "description": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "Data merge tool." + }, + { + "releaseID": "ocds-213czf-000-00002-01-tender-update", + "releaseDate": "2016-01-31T09:30:00Z", + "releaseTag": [ + "tenderUpdate" + ], + "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." + } + ], + "status": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "active" + } + ], + "value": { + "amount": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": 1000 + }, + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": 2000 + } + ], + "currency": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "USD" + } + ] + }, + "procurementMethod": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "open" + } + ], + "awardCriteria": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "bestProposal" + } + ], + "tenderPeriod": { + "startDate": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "2016-01-31T09:00:00Z" + } + ], + "endDate": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "2016-02-15T18:00:00Z" + }, + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": "2016-02-20T18:00:00Z" + } + ] + }, + "awardPeriod": { + "startDate": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "2016-04-01T00:00:00Z" + } + ], + "endDate": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender", + "releaseDate": "2016-01-01T09:30:00Z", + "releaseTag": [ + "tender" + ], + "value": "2016-06-01T23:59:59Z" + } + ] + }, + "amendments": [ + { + "id": "amendment-1", + "date": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": "2016-02-04T09:30:00Z" + } + ], + "rationale": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended" + } + ], + "amendsReleaseID": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": "ocds-213czf-000-00002-01-tender" + } + ], + "releaseID": [ + { + "releaseID": "ocds-213czf-000-00002-01-tender-amendment", + "releaseDate": "2016-02-05T10:30:00Z", + "releaseTag": [ + "tenderAmendment" + ], + "value": "ocds-213czf-000-00002-01-tender-amendment" + } + ] + } + ] + }, + "awards": [ + { + "id": "ocds-213czf-000-00002-award-supplier-one", + "title": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "Award of contract to create the data merging tool." + } + ], + "description": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation" + } + ], + "status": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "active" + } + ], + "date": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "2016-03-01T09:30:00Z" + } + ], + "value": { + "amount": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": 750 + } + ], + "currency": [ + { + "releaseID": "ocds-213czf-000-00002-01-award1", + "releaseDate": "2016-03-01T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "USD" + } + ] + } + }, + { + "id": "ocds-213czf-000-00002-award-supplier-two", + "title": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "Award of contract to create the data merging tool." + } + ], + "description": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool" + } + ], + "status": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "active" + } + ], + "date": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "2016-03-03T09:30:00Z" + } + ], + "value": { + "amount": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": 750 + } + ], + "currency": [ + { + "releaseID": "ocds-213czf-000-00002-01-award2", + "releaseDate": "2016-03-03T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "USD" + } + ] + } + } + ] + } + } + ] +} From aaa066d332bfc6f2607715670fbc898c46e798e0 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 20 Nov 2023 16:42:32 +0000 Subject: [PATCH 10/40] build/merging.md: correct typos --- docs/guidance/build/merging.md | 2 +- docs/schema/merging.md | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 55c276a6e..270ebff3e 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -21,7 +21,7 @@ Through these individual releases, the agency provides real-time data about the In each release, the agency also updates the record, which combines all the releases to date. In the final record: * The compiled release contains all the information about the opportunity and the tenderers, using the same schema as a release. -* The versioned release makes it easy to see how the provided changed over time. +* The versioned release makes it easy to see how the amount of information provided changed over time. ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json :jsonpointer: diff --git a/docs/schema/merging.md b/docs/schema/merging.md index fa252ef84..d2754dcbf 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -43,30 +43,30 @@ To convert a field's value in a release to a **versioned value**, you must: A **versioned value** thus describes a field's value in a specific release. -For example, in the above worked example, the estimated value of the procurement was $1,000 in a release (`tender/value/amount` was `1000`). Following the steps above, the versioned value is: +For example, in the above worked example, the estimated value of the procurement was 13,000 GHS in a release (`tender/value/amount` was `13000`). Following the steps above, the versioned value is: ```json { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseDate": "2020-10-21T13:02:26Z", "releaseTag": [ "tender" ], - "value": 1000 + "value": 13000 } ``` In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -For example, in the above worked example, the estimated value was $1,000 in a release published January 1, 2016 and then $2,000 in a release published February 5, 2016. In a versioned release, this is serialized as below: +For example, in the above worked example, the number of tenderers was 0 in a release published October 21, 2020 and then 2 in a release published November 5, 2020. In a versioned release, this is serialized as below: -```{jsoninclude} ../examples/merging/updates/versioned.json -:jsonpointer: /records/0/versionedRelease/tender/value -:expand: value, amount +```{jsoninclude} ../examples/merging/updates/ghana_versioned.json +:jsonpointer: /records/0/versionedRelease/tender +:expand: numberOfTenderers,releaseTag :title: Versioned_values ``` -```{jsoninclude} ../examples/merging/updates/versioned.json +```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: :expand: records, versionedRelease :title: Versioned_release From bebdcaf04f13e03c8f73cb42760a3a5e2b2634cf Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 28 Nov 2023 12:11:23 +0000 Subject: [PATCH 11/40] schema/merging.md: update versioned example and fix more typos --- docs/schema/merging.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/schema/merging.md b/docs/schema/merging.md index d2754dcbf..f3e53786b 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -43,7 +43,7 @@ To convert a field's value in a release to a **versioned value**, you must: A **versioned value** thus describes a field's value in a specific release. -For example, in the above worked example, the estimated value of the procurement was 13,000 GHS in a release (`tender/value/amount` was `13000`). Following the steps above, the versioned value is: +For example, in worked example 1 in [Updates and deletions](../guidance/build/merging), the estimated value of the procurement was 13,000 GHS (in the first release `tender/value/amount` was `13000`). Following the steps above, the versioned value is: ```json { @@ -58,7 +58,7 @@ For example, in the above worked example, the estimated value of the procurement In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -For example, in the above worked example, the number of tenderers was 0 in a release published October 21, 2020 and then 2 in a release published November 5, 2020. In a versioned release, this is serialized as below: +For example, in the worked example referenced above, the number of tenderers was 0 in the release published October 21, 2020 and then 2 in the release published November 5, 2020. In a versioned release, this is serialized as below: ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender From 21173b687875028c250f7e7e824f90c9960eb40c Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 30 Nov 2023 16:46:06 +0000 Subject: [PATCH 12/40] update tests_docs.py, change date to check --- tests/test_docs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_docs.py b/tests/test_docs.py index a0316a3bc..e1c7d9e29 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py @@ -13,11 +13,11 @@ def test_examples(browser, server, lang): examples = browser.find_element(By.ID, 'updates-and-deletions') select = Select(examples.find_element(By.TAG_NAME, 'select')) - assert '"date": "2016-01-01T09:30:00Z"' in examples.text + assert '"date": "2020-10-21T13:02:26Z"' in examples.text - select.select_by_visible_text('tenderAmendment') - assert '"date": "2016-02-05T10:30:00Z"' in examples.text - assert '"date": "2016-01-01T09:30:00Z"' not in examples.text + select.select_by_visible_text('tenderUpdate') + assert '"date": "2020-11-05T14:36:54Z"' in examples.text + assert '"date": "2020-10-21T13:02:26Z"' not in examples.text # test collapse expand # xs = examples.find_element(By.LINK_TEXT, '⊖') From d86b34a2ba427a76b44b41553ad1c85015b43601 Mon Sep 17 00:00:00 2001 From: odscjen <95221058+odscjen@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:31:16 +0000 Subject: [PATCH 13/40] Apply suggestions from code review Co-authored-by: Duncan Dewhurst --- docs/guidance/build/merging.md | 6 +++--- docs/guidance/map/buyers_suppliers.md | 2 +- docs/primer/how.md | 4 ++-- docs/primer/releases_and_records.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 270ebff3e..4a0a39ab6 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -12,16 +12,16 @@ The following examples show how updates and deletions are reflected in compiled ## Example 1: Updates -A government agency in Ghana publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 they publish an update containing the details of 2 parties that have submitted bids and the publication date of the bidding documents. +The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of two tenderers and the publication date of the bidding documents. -The agency then decides to cancel the tender. On December 19, 2020 it publishes a third release announcing that the tender has been cancelled. +On December 19, 2020 it publishes a third release announcing that the tender is cancelled. Through these individual releases, the agency provides real-time data about the contracting (or planning) process. In each release, the agency also updates the record, which combines all the releases to date. In the final record: * The compiled release contains all the information about the opportunity and the tenderers, using the same schema as a release. -* The versioned release makes it easy to see how the amount of information provided changed over time. +* The versioned release makes it easy to see how the contracting process changed over time. ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json :jsonpointer: diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md index 8cf23ea22..45ebbb00d 100644 --- a/docs/guidance/map/buyers_suppliers.md +++ b/docs/guidance/map/buyers_suppliers.md @@ -42,7 +42,7 @@ Siemens and Microsoft bid as a consortium for a contract to develop a new medica The contract is awarded to the consortium; however, the legal entity for the consortium is not created until after the contract award. -Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with the respective ids for each organization that match their id in the `Parties` array: +Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/reference.md#release-schema.json,/definitions/Organization,id). ```json { diff --git a/docs/primer/how.md b/docs/primer/how.md index 7aa3aa73e..f2ca56cbc 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -113,11 +113,11 @@ In addition to the default format of JSON, you can convert and publish your OCDS While the OCDS schema is described using JSON Schema, OCDS data can be converted from its JSON format to tabular formats such as CSV files or spreadsheets. JSON is favored by developers because it uses human-readable text to exchange complex information, such as nested objects. It can contain large volumes of information and is particularly good at handling one-to-many relationships (such as multiple bids per tender notice). -Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheets applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats as well both so that more users’ needs can be satisfied. +Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheet applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats both so that more users’ needs can be satisfied. **Example** -Ebonyi State in Nigeria publish OCDS data in JSON and tabular format. The JSON data is flattened into a series of CSV files which are combined into a single Excel spreadsheet. +Nigeria's Ebonyi State publishes OCDS data in JSON and tabular formats. The following example does not contain all existing fields, and not all of the included fields are required. It has been edited for length and consistency, and is not identical to the data available on the Ebonyi State e-Procurement platform. diff --git a/docs/primer/releases_and_records.md b/docs/primer/releases_and_records.md index 6c4b2e705..280ca8438 100644 --- a/docs/primer/releases_and_records.md +++ b/docs/primer/releases_and_records.md @@ -46,7 +46,7 @@ When you publish OCDS releases and records, you are encouraged to: * Produce bulk packages of releases and records for users to download ```{note} -For guidance on how to generate releases and records see the worked examples in [merging](../schema/merging.md) and [change history](../guidance/build/change_history.md). +To see what releases and records look like, refer to the worked examples in [merging](../schema/merging.md) and [change history](../guidance/build/change_history.md). ``` ```{note} From aa5b810eeb2eaf9537119a1260f73fc1e9cd00aa Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 1 Dec 2023 16:09:49 +0000 Subject: [PATCH 14/40] apply review suggestions --- .../merging/updates/ghana_tender1.json | 119 +- .../merging/updates/ghana_tender2.json | 188 +-- .../merging/updates/ghana_tender3.json | 188 +-- .../merging/updates/ghana_versioned.json | 1416 +++-------------- docs/examples/primer/award_items.csv | 2 - docs/examples/primer/award_suppliers.csv | 2 - docs/examples/primer/awards.csv | 2 - .../primer/contract_implementation.csv | 2 - docs/examples/primer/contracts.csv | 2 - docs/examples/primer/documents.csv | 2 - docs/examples/primer/parties.csv | 5 +- docs/examples/primer/primer.json | 153 +- docs/examples/primer/releases.csv | 4 +- docs/examples/primer/tender_items.csv | 2 - docs/guidance/build/merging.md | 16 +- docs/primer/how.md | 53 +- docs/schema/merging.md | 19 +- 17 files changed, 363 insertions(+), 1812 deletions(-) delete mode 100644 docs/examples/primer/award_items.csv delete mode 100644 docs/examples/primer/award_suppliers.csv delete mode 100644 docs/examples/primer/awards.csv delete mode 100644 docs/examples/primer/contract_implementation.csv delete mode 100644 docs/examples/primer/contracts.csv delete mode 100644 docs/examples/primer/documents.csv delete mode 100644 docs/examples/primer/tender_items.csv diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json index 66855ae31..6d01f0d39 100644 --- a/docs/examples/merging/updates/ghana_tender1.json +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -1,114 +1,45 @@ { "version": "1.1", + "publishedDate": "2020-10-21T13:02:26Z", + "publisher": { + "name": "Public Procurement Authority", + "scheme": "GH-RGD", + "uid": "1234 ", + "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" + }, + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", "releases": [ { + "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-144560-1601380494627-tender", + "date": "2020-10-21T13:02:26Z", + "tag": [ + "tender" + ], + "initiationType": "tender", "tender": { - "procuringEntity": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" - }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 0, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "active", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "status": "active" - }, - "initiationType": "tender", - "date": "2020-10-21T13:02:26Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } + "mainProcurementCategory": "goods", + "numberOfTenderers": 0, + "procurementMethod": "limited" }, "parties": [ { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559", - "email": "" - }, + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957", "roles": [ "buyer", "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] } - ], - "language": "en", - "tag": [ - "tender" - ], - "id": "ocds-uhveoc-144560-1601380494627-tender", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - } + ] } ] } diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json index a3817df0d..09632665e 100644 --- a/docs/examples/merging/updates/ghana_tender2.json +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -1,65 +1,58 @@ { "version": "1.1", + "publishedDate": "2020-11-05T14:36:54Z", + "publisher": { + "name": "Public Procurement Authority", + "scheme": "GH-RGD", + "uid": "1234 ", + "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" + }, + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", "releases": [ { - "tender": { - "procuringEntity": { + "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-144560", + "date": "2020-11-05T14:36:54Z", + "tag": [ + "tenderUpdate" + ], + "initiationType": "tender", + "parties": [ + { "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "datePublished": "2020-10-21T13:02:27Z", - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" + "id": "14957", + "roles": [ + "buyer", + "procuringEntity" + ] }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 2, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387", + "roles": [ + "tenderer" + ] }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", + "roles": [ + "tenderer" + ] + } + ], + "tender": { "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "active", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, + "mainProcurementCategory": "goods", + "numberOfTenderers": 2, + "procurementMethod": "limited", "tenderers": [ { "name": "GS INTERNATIONAL COMPANY LIMITED", @@ -69,100 +62,7 @@ "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" } - ], - "status": "active" - }, - "initiationType": "tender", - "date": "2020-11-05T14:36:54Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } - }, - "parties": [ - { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559", - "email": "" - }, - "roles": [ - "buyer", - "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - { - "identifier": { - "legalName": "GS INTERNATIONAL COMPANY LIMITED", - "scheme": "GH-RGD", - "id": "CS422592014" - }, - "address": { - "streetAddress": "Street 676", - "postalCode": "23321", - "locality": "Ga West Municipal", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "SALES.GSINT@GMAIL.COM" - }, - "roles": [ - "tenderer" - ], - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, - { - "identifier": { - "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "scheme": "GH-RGD", - "id": "CS362052014" - }, - "address": { - "streetAddress": "Street 21", - "postalCode": "23321", - "locality": "LA DADE-KOTOPON", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "INFO@NEXTCOMPUTERSGHANA.COM" - }, - "roles": [ - "tenderer" - ], - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ], - "language": "en", - "tag": [ - "tenderUpdate" - ], - "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] } } ] diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json index 005e30e68..7314ce56f 100644 --- a/docs/examples/merging/updates/ghana_tender3.json +++ b/docs/examples/merging/updates/ghana_tender3.json @@ -1,65 +1,58 @@ { "version": "1.1", + "publishedDate": "2022-12-19T11:55:46Z", + "publisher": { + "name": "Public Procurement Authority", + "scheme": "GH-RGD", + "uid": "1234 ", + "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" + }, + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", "releases": [ { - "tender": { - "procuringEntity": { + "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-144560", + "date": "2022-12-19T11:55:46Z", + "tag": [ + "tenderCancellation" + ], + "initiationType": "tender", + "parties": [ + { "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "datePublished": "2020-10-21T13:02:27Z", - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" + "id": "14957", + "roles": [ + "buyer", + "procuringEntity" + ] }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 2, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387", + "roles": [ + "tenderer" + ] }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", + "roles": [ + "tenderer" + ] + } + ], + "tender": { "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "cancelled", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, + "mainProcurementCategory": "goods", + "numberOfTenderers": 2, + "procurementMethod": "limited", "tenderers": [ { "name": "GS INTERNATIONAL COMPANY LIMITED", @@ -69,100 +62,7 @@ "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" } - ], - "status": "cancelled" - }, - "initiationType": "tender", - "date": "2022-12-19T11:55:46Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } - }, - "parties": [ - { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559", - "email": "" - }, - "roles": [ - "buyer", - "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - { - "identifier": { - "legalName": "GS INTERNATIONAL COMPANY LIMITED", - "scheme": "GH-RGD", - "id": "CS422592014" - }, - "address": { - "streetAddress": "Street 676", - "postalCode": "23321", - "locality": "Ga West Municipal", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "SALES.GSINT@GMAIL.COM" - }, - "roles": [ - "tenderer" - ], - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, - { - "identifier": { - "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "scheme": "GH-RGD", - "id": "CS362052014" - }, - "address": { - "streetAddress": "Street 21", - "postalCode": "23321", - "locality": "LA DADE-KOTOPON", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "INFO@NEXTCOMPUTERSGHANA.COM" - }, - "roles": [ - "tenderer" - ], - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ], - "language": "en", - "tag": [ - "tenderCancellation" - ], - "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] } } ] diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json index af36d7c81..716dba3aa 100644 --- a/docs/examples/merging/updates/ghana_versioned.json +++ b/docs/examples/merging/updates/ghana_versioned.json @@ -1,176 +1,93 @@ { "version": "1.1", + "publishedDate": "2022-12-19T11:55:46Z", + "publisher": { + "name": "Public Procurement Authority", + "scheme": "GH-RGD", + "uid": "1234 ", + "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" + }, + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", "records": [ { "ocid": "ocds-uhveoc-144560", "releases": [ { + "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-144560-1601380494627-tender", + "date": "2020-10-21T13:02:26Z", + "tag": [ + "tender" + ], + "initiationType": "tender", "tender": { - "procuringEntity": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" - }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 0, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "active", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "status": "active" - }, - "initiationType": "tender", - "date": "2020-10-21T13:02:26Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } + "mainProcurementCategory": "goods", + "numberOfTenderers": 0, + "procurementMethod": "limited" }, "parties": [ { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559" - }, + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957", "roles": [ "buyer", "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] } - ], - "language": "en", - "tag": [ - "tender" - ], - "id": "ocds-uhveoc-144560-1601380494627-tender", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - } + ] }, { - "tender": { - "procuringEntity": { + "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-144560", + "date": "2020-11-05T14:36:54Z", + "tag": [ + "tenderUpdate" + ], + "initiationType": "tender", + "parties": [ + { "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "datePublished": "2020-10-21T13:02:27Z", - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" + "id": "14957", + "roles": [ + "buyer", + "procuringEntity" + ] }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 2, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387", + "roles": [ + "tenderer" + ] }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", + "roles": [ + "tenderer" + ] + } + ], + "tender": { "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "active", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, + "mainProcurementCategory": "goods", + "numberOfTenderers": 2, + "procurementMethod": "limited", "tenderers": [ { "name": "GS INTERNATIONAL COMPANY LIMITED", @@ -180,160 +97,53 @@ "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" } - ], - "status": "active" - }, + ] + } + }, + { + "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-144560", + "date": "2022-12-19T11:55:46Z", + "tag": [ + "tenderCancellation" + ], "initiationType": "tender", - "date": "2020-11-05T14:36:54Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } - }, "parties": [ { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559" - }, + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957", "roles": [ "buyer", "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] }, { - "identifier": { - "legalName": "GS INTERNATIONAL COMPANY LIMITED", - "scheme": "GH-RGD", - "id": "CS422592014" - }, - "address": { - "streetAddress": "Street 676", - "postalCode": "23321", - "locality": "Ga West Municipal", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "SALES.GSINT@GMAIL.COM" - }, + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387", "roles": [ "tenderer" - ], - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" + ] }, { - "identifier": { - "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "scheme": "GH-RGD", - "id": "CS362052014" - }, - "address": { - "streetAddress": "Street 21", - "postalCode": "23321", - "locality": "LA DADE-KOTOPON", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "INFO@NEXTCOMPUTERSGHANA.COM" - }, + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", "roles": [ "tenderer" - ], - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" + ] } ], - "language": "en", - "tag": [ - "tenderUpdate" - ], - "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - } - }, - { "tender": { - "procuringEntity": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "datePublished": "2020-10-21T13:02:27Z", - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" - }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 2, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", "id": "144560", - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "cancelled", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, + "mainProcurementCategory": "goods", + "numberOfTenderers": 2, + "procurementMethod": "limited", "tenderers": [ { "name": "GS INTERNATIONAL COMPANY LIMITED", @@ -343,161 +153,54 @@ "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" } - ], - "status": "cancelled" - }, - "initiationType": "tender", - "date": "2022-12-19T11:55:46Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } - }, - "parties": [ - { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559" - }, - "roles": [ - "buyer", - "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - { - "identifier": { - "legalName": "GS INTERNATIONAL COMPANY LIMITED", - "scheme": "GH-RGD", - "id": "CS422592014" - }, - "address": { - "streetAddress": "Street 676", - "postalCode": "23321", - "locality": "Ga West Municipal", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "SALES.GSINT@GMAIL.COM" - }, - "roles": [ - "tenderer" - ], - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, - { - "identifier": { - "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "scheme": "GH-RGD", - "id": "CS362052014" - }, - "address": { - "streetAddress": "Street 21", - "postalCode": "23321", - "locality": "LA DADE-KOTOPON", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "INFO@NEXTCOMPUTERSGHANA.COM" - }, - "roles": [ - "tenderer" - ], - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ], - "language": "en", - "tag": [ - "tenderCancellation" - ], - "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" + ] } } ], "compiledRelease": { - "tender": { - "procuringEntity": { + "id": "compiled", + "ocid": "ocds-uhveoc-144560", + "date": "2022-12-20T01:01:12Z", + "tag": [ + "compiled" + ], + "initiationType": "tender", + "parties": [ + { "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - "documents": [ - { - "datePublished": "2020-10-21T13:02:27Z", - "documentType": "biddingDocuments", - "format": "text/html", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "dateModified": "2020-10-21T12:50:12Z", - "language": "EN", - "id": "144610", - "title": " Toners", - "url": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ], - "awardPeriod": { - "startDate": "2020-10-30T16:30:00Z" + "id": "14957", + "roles": [ + "buyer", + "procuringEntity" + ] }, - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "mainProcurementCategory": "goods", - "title": "Toners", - "procurementMethodDetails": "Request for Quotation (RFQ)", - "submissionMethod": [ - "electronicSubmission" - ], - "hasEnquiries": false, - "numberOfTenderers": 2, - "procurementMethod": "limited", - "enquiryPeriod": { - "endDate": "2020-10-28T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" + { + "name": "GS INTERNATIONAL COMPANY LIMITED", + "id": "2387", + "roles": [ + "tenderer" + ] }, - "awardCriteria": "priceOnly", - "eligibilityCriteria": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n", + { + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", + "roles": [ + "tenderer" + ] + } + ], + "tender": { "id": "144560", + "title": "Toners", + "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "status": "cancelled", "value": { "amount": 13000, "currency": "GHS" }, - "tenderPeriod": { - "endDate": "2020-10-30T16:00:00Z", - "startDate": "2020-10-21T13:02:21Z" - }, - "items": [ - { - "description": "Toner", - "id": "44103103", - "classification": { - "scheme": "UNSPSC", - "description": "Toner", - "id": "44103103", - "uri": "http://www.unspsc.org/codeset-downloads" - } - } - ], + "mainProcurementCategory": "goods", + "numberOfTenderers": 2, + "procurementMethod": "limited", "tenderers": [ { "name": "GS INTERNATIONAL COMPANY LIMITED", @@ -507,104 +210,23 @@ "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" } - ], - "status": "cancelled" - }, - "initiationType": "tender", - "date": "2022-12-20T01:01:12Z", - "planning": { - "budget": { - "amount": { - "amount": 13000, - "currency": "GHS" - }, - "description": "Toners", - "id": "GR/EOCO/GD/1410/2020" - } - }, - "parties": [ - { - "identifier": { - "legalName": "ECONOMIC AND ORGANISED CRIME OFFICE", - "scheme": "X-Ghaneps", - "id": "EOCO" - }, - "address": { - "streetAddress": "BARNES ROAD", - "locality": "ACCRA", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "faxNumber": "0302 664786", - "telephone": "0302 665559" - }, - "roles": [ - "buyer", - "procuringEntity" - ], - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - }, - { - "identifier": { - "legalName": "GS INTERNATIONAL COMPANY LIMITED", - "scheme": "GH-RGD", - "id": "CS422592014" - }, - "address": { - "streetAddress": "Street 676", - "postalCode": "23321", - "locality": "Ga West Municipal", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "SALES.GSINT@GMAIL.COM" - }, - "roles": [ - "tenderer" - ], - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, + ] + } + }, + "versionedRelease": { + "ocid": "ocds-uhveoc-144560", + "initiationType": [ { - "identifier": { - "legalName": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "scheme": "GH-RGD", - "id": "CS362052014" - }, - "address": { - "streetAddress": "Street 21", - "postalCode": "23321", - "locality": "LA DADE-KOTOPON", - "countryName": "Ghana", - "region": "GH" - }, - "contactPoint": { - "email": "INFO@NEXTCOMPUTERSGHANA.COM" - }, - "roles": [ - "tenderer" + "releaseTag": [ + "tender" ], - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" + "releaseDate": "2020-10-21T13:02:26Z", + "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "value": "tender" } ], - "language": "en", - "tag": [ - "compiled" - ], - "id": "compiled", - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957" - } - }, - "versionedRelease": { - "tender": { - "procuringEntity": { + "parties": [ + { "name": [ { "releaseTag": [ @@ -615,123 +237,81 @@ "value": "ECONOMIC AND ORGANISED CRIME OFFICE" } ], - "id": "14957" - }, - "documents": [ - { - "datePublished": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "2020-10-21T13:02:27Z" - } - ], - "documentType": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "biddingDocuments" - } - ], - "format": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "text/html" - } - ], - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners. You are requested to submit your quotation via GHANEPS portal. Deadline for submission is 30th October, 2020. at 16:00 HRS GMT." - } - ], - "dateModified": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-21T12:50:12Z" - } - ], - "language": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "EN" - } - ], - "id": "144610", - "title": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": " Toners" - } - ], - "url": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "https://www.ghaneps.gov.gh/epps/cft/downloadContractDocument.do?documentId=144610&resourceId=144560" - } - ] - } - ], - "awardPeriod": { - "startDate": [ + "id": "14957", + "roles": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-30T16:30:00Z" + "value": [ + "buyer", + "procuringEntity" + ] } ] }, - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT." - } - ], - "mainProcurementCategory": [ + { + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "GS INTERNATIONAL COMPANY LIMITED" + } + ], + "id": "2387", + "roles": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": [ + "tenderer" + ] + } + ] + }, + { + "name": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" + } + ], + "id": "1215", + "roles": [ + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": [ + "tenderer" + ] + } + ] + } + ], + "tender": { + "id": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "goods" + "value": "144560" } ], "title": [ @@ -744,208 +324,92 @@ "value": "Toners" } ], - "procurementMethodDetails": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Request for Quotation (RFQ)" - } - ], - "submissionMethod": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": [ - "electronicSubmission" - ] - } - ], - "hasEnquiries": [ + "description": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": false + "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT." } ], - "numberOfTenderers": [ + "status": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": 0 + "value": "active" }, { "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": 2 - } - ], - "procurementMethod": [ - { - "releaseTag": [ - "tender" + "tenderCancellation" ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "limited" + "releaseDate": "2022-12-19T11:55:46Z", + "releaseID": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "value": "cancelled" } ], - "enquiryPeriod": { - "endDate": [ + "value": { + "amount": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-28T16:00:00Z" + "value": 13000 } ], - "startDate": [ + "currency": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-21T13:02:21Z" + "value": "GHS" } ] }, - "awardCriteria": [ + "mainProcurementCategory": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "priceOnly" + "value": "goods" } ], - "eligibilityCriteria": [ + "numberOfTenderers": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Section : Bid Validity\n *Criterion[Type = numeric]: Bid Validity Period\nSection : Delivery\n *Criterion[Type = text]: Delivery period\nSection : Tender Signed\n *Criterion[Type = list]: Do you confirm that you are duly authorised to submit this Tender?\n" + "value": 0 + }, + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "value": 2 } ], - "id": [ + "procurementMethod": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "144560" - } - ], - "value": { - "amount": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": 13000 - } - ], - "currency": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "GHS" - } - ] - }, - "tenderPeriod": { - "endDate": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-30T16:00:00Z" - } - ], - "startDate": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "2020-10-21T13:02:21Z" - } - ] - }, - "items": [ - { - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Toner" - } - ], - "id": "44103103", - "classification": { - "scheme": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "UNSPSC" - } - ], - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Toner" - } - ], - "id": "44103103", - "uri": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "http://www.unspsc.org/codeset-downloads" - } - ] - } + "value": "limited" } ], "tenderers": [ @@ -975,445 +439,7 @@ ], "id": "1215" } - ], - "status": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "active" - }, - { - "releaseTag": [ - "tenderCancellation" - ], - "releaseDate": "2022-12-19T11:55:46Z", - "releaseID": "ocds-uhveoc-144560-1668517276492-tenderCancellation", - "value": "cancelled" - } ] - }, - "initiationType": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "tender" - } - ], - "planning": { - "budget": { - "amount": { - "amount": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": 13000 - } - ], - "currency": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "GHS" - } - ] - }, - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Toners" - } - ], - "id": "GR/EOCO/GD/1410/2020" - } - }, - "parties": [ - { - "identifier": { - "legalName": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "ECONOMIC AND ORGANISED CRIME OFFICE" - } - ], - "scheme": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "X-Ghaneps" - } - ], - "id": "EOCO" - }, - "address": { - "streetAddress": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "BARNES ROAD" - } - ], - "locality": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "ACCRA" - } - ], - "countryName": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "Ghana" - } - ], - "region": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "GH" - } - ] - }, - "contactPoint": { - "faxNumber": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "0302 664786" - } - ], - "telephone": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "0302 665559" - } - ], - "email": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "" - } - ] - }, - "roles": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": [ - "buyer", - "procuringEntity" - ] - } - ], - "name": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "ECONOMIC AND ORGANISED CRIME OFFICE" - } - ], - "id": "14957" - }, - { - "identifier": { - "legalName": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GS INTERNATIONAL COMPANY LIMITED" - } - ], - "scheme": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GH-RGD" - } - ], - "id": "CS422592014" - }, - "address": { - "streetAddress": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "Street 676" - } - ], - "postalCode": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "23321" - } - ], - "locality": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "Ga West Municipal" - } - ], - "countryName": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "Ghana" - } - ], - "region": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GH" - } - ] - }, - "contactPoint": { - "email": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "SALES.GSINT@GMAIL.COM" - } - ] - }, - "roles": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": [ - "tenderer" - ] - } - ], - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GS INTERNATIONAL COMPANY LIMITED" - } - ], - "id": "2387" - }, - { - "identifier": { - "legalName": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" - } - ], - "scheme": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GH-RGD" - } - ], - "id": "CS362052014" - }, - "address": { - "streetAddress": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "Street 21" - } - ], - "postalCode": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "23321" - } - ], - "locality": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "LA DADE-KOTOPON" - } - ], - "countryName": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "Ghana" - } - ], - "region": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GH" - } - ] - }, - "contactPoint": { - "email": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "INFO@NEXTCOMPUTERSGHANA.COM" - } - ] - }, - "roles": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": [ - "tenderer" - ] - } - ], - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" - } - ], - "id": "1215" - } - ], - "language": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "en" - } - ], - "ocid": "ocds-uhveoc-144560", - "buyer": { - "name": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "ECONOMIC AND ORGANISED CRIME OFFICE" - } - ], - "id": "14957" } } } diff --git a/docs/examples/primer/award_items.csv b/docs/examples/primer/award_items.csv deleted file mode 100644 index d6d21ec92..000000000 --- a/docs/examples/primer/award_items.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,awards/0/id,awards/0/items/0/id,awards/0/items/0/description,awards/0/items/0/classification/id,awards/0/items/0/classification/scheme,awards/0/items/0/classification/description,awards/0/items/0/quantity,awards/0/items/0/unit/name -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,1,Procurement of Office Stationeries for Ministry of Works,100767,UNSPSC,Stationery,15,packs diff --git a/docs/examples/primer/award_suppliers.csv b/docs/examples/primer/award_suppliers.csv deleted file mode 100644 index 8eacd691e..000000000 --- a/docs/examples/primer/award_suppliers.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,awards/0/id,awards/0/suppliers/0/id,awards/0/suppliers/0/name -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES diff --git a/docs/examples/primer/awards.csv b/docs/examples/primer/awards.csv deleted file mode 100644 index fb2acd3fa..000000000 --- a/docs/examples/primer/awards.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,awards/0/id,awards/0/title,awards/0/description,awards/0/status,awards/0/date,awards/0/value/amount,awards/0/value/currency,awards/0/contractPeriod/startDate,awards/0/contractPeriod/endDate,awards/0/contractPeriod/durationInDays -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-221,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,active,2022-06-25T13:00:00Z,299989.5,NGN,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365 diff --git a/docs/examples/primer/contract_implementation.csv b/docs/examples/primer/contract_implementation.csv deleted file mode 100644 index e0cc6b3a5..000000000 --- a/docs/examples/primer/contract_implementation.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,contracts/0/id,contracts/0/implementation/transactions/0/id,contracts/0/implementation/transactions/0/value/amount,contracts/0/implementation/transactions/0/value/currency,contracts/0/implementation/transactions/0/payer/id,contracts/0/implementation/transactions/0/payer/name,contracts/0/implementation/transactions/0/payee/id,contracts/0/implementation/transactions/0/payee/name -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-221-contract-1,ocds-zinqhl-0018553175,299990,NGN,NG-001,MINISTRY OF WORKS AND TRANSPORT,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES diff --git a/docs/examples/primer/contracts.csv b/docs/examples/primer/contracts.csv deleted file mode 100644 index e673dc5ae..000000000 --- a/docs/examples/primer/contracts.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,contracts/0/id,contracts/0/awardID,contracts/0/title,contracts/0/description,contracts/0/status,contracts/0/period/startDate,contracts/0/period/endDate,contracts/0/period/durationInDays,contracts/0/value/amount,contracts/0/value/currency,contracts/0/dateSigned -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-221-contract-1,ocds-zinqhl-221,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,active,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365,299989.5,NGN,2022-06-27T09:04:00Z diff --git a/docs/examples/primer/documents.csv b/docs/examples/primer/documents.csv deleted file mode 100644 index 058435e78..000000000 --- a/docs/examples/primer/documents.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,tender/id,tender/documents/0/id,tender/documents/0/documentType,tender/documents/0/title,tender/documents/0/description,tender/documents/0/url,tender/documents/0/datePublished,tender/documents/0/format,tender/documents/0/language -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-EB/WTR/EP002-NG,1.0,tenderNotice,Tender Notice,Official tender notice,https://www.ebonyieprocure.eb.gov.ng/admin/0,2022-05-27T16:31:21Z,pdf,en diff --git a/docs/examples/primer/parties.csv b/docs/examples/primer/parties.csv index 89e9d283f..a3ade96ed 100644 --- a/docs/examples/primer/parties.csv +++ b/docs/examples/primer/parties.csv @@ -1,3 +1,2 @@ -ocid,id,parties/0/id,parties/0/name,parties/0/address/streetAddress,parties/0/address/locality,parties/0/address/region,parties/0/address/postalCode,parties/0/address/countryName,parties/0/contactPoint/name,parties/0/contactPoint/email,parties/0/contactPoint/url,parties/0/roles,parties/0/identifier/id,parties/0/identifier/scheme,parties/0/identifier/legalName,parties/0/contactPoint/telephone -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-001,MINISTRY OF WORKS AND TRANSPORT,"ABAKALIKI, EBONYI STATE",Abakaliki,Ebonyi East,480,Nigeria,"ENGR. OBASI, OGBONNAYA ABARA",works@ebonyieprocure.eb.gov.ng,http://www.mowt.eb.gov.ng/,buyer,,,, -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-CAC-RC 3306867,INNOAGY AGRO VENTURES,1 Nwankwo Street Abakaliki,Abakaliki,,,,Procurement Team,innocentakamc@gmail.com,,supplier,RC 3306867,NG-CAC,INNOAGY AGRO VENTURES,08035289029 +ocid,id,parties/0/id,parties/0/name,parties/0/address/streetAddress,parties/0/address/locality,parties/0/address/region,parties/0/address/postalCode,parties/0/address/countryName,parties/0/contactPoint/name,parties/0/contactPoint/url,parties/0/roles +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-001,MINISTRY OF WORKS AND TRANSPORT,"ABAKALIKI, EBONYI STATE",Abakaliki,Ebonyi East,480,Nigeria,"ENGR. OBASI, OGBONNAYA ABARA",http://www.mowt.eb.gov.ng/,buyer diff --git a/docs/examples/primer/primer.json b/docs/examples/primer/primer.json index 7c49a19e9..3598b2fcf 100644 --- a/docs/examples/primer/primer.json +++ b/docs/examples/primer/primer.json @@ -2,6 +2,11 @@ "uri": "https://ebonyieprocure.eb.gov.ng/do_award_contract_details.php?id=ocds-zinqhl-014665-EB/WTR/EP002-NG", "version": "1.1", "publishedDate": "2022-05-27T10:00:00Z", + "publisher": { + "name": "Ebonyi State Council on Public Procurement" + }, + "license": "https://ebonyieprocure.eb.gov.ng/license.php", + "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php", "releases": [ { "ocid": "ocds-zinqhl-014665-EB/WTR/EP002-NG", @@ -11,61 +16,21 @@ "compiled" ], "initiationType": "tender", - "buyer": { - "id": "NG-001", - "name": "MINISTRY OF WORKS AND TRANSPORT" - }, - "language": "en", "tender": { "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG", "title": "Procurement of Office Stationeries for Ministry of Works", "description": "Procurement of Office Stationeries for Ministry of Works", "status": "complete", - "numberOfTenderers": 3, "procurementMethod": "open", "mainProcurementCategory": "goods", "procurementMethodDetails": "In open procedures, any interested economic operator may submit a tender in response to a contract notice", - "awardCriteriaDetails": "award to most responsive bid", "submissionMethod": [ "electronicSubmission" ], - "submissionMethodDetails": "Submit through the online portal at https://ebonyieprocure.eb.gov.ng", "tenderPeriod": { "startDate": "2022-05-27T16:32:00Z", "endDate": "2022-06-24T14:00:00Z" - }, - "contractPeriod": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "hasEnquiries": true, - "documents": [ - { - "id": "1.0", - "documentType": "tenderNotice", - "title": "Tender Notice", - "description": "Official tender notice", - "url": "https://www.ebonyieprocure.eb.gov.ng/admin/0", - "datePublished": "2022-05-27T16:31:21Z", - "format": "pdf", - "language": "en" - } - ], - "items": [ - { - "id": "1", - "classification": { - "scheme": "UNSPSC", - "id": "14111509", - "description": "Stationery" - }, - "quantity": 15, - "unit": { - "name": "packs" - } - } - ] + } }, "parties": [ { @@ -80,117 +45,13 @@ }, "contactPoint": { "name": "ENGR. OBASI, OGBONNAYA ABARA", - "email": "works@ebonyieprocure.eb.gov.ng", "url": "http://www.mowt.eb.gov.ng/" }, "roles": [ "buyer" ] - }, - { - "id": "NG-CAC-RC 3306867", - "name": "INNOAGY AGRO VENTURES", - "identifier": { - "id": "RC 3306867", - "scheme": "NG-CAC", - "legalName": "INNOAGY AGRO VENTURES" - }, - "address": { - "streetAddress": "1 Nwankwo Street Abakaliki", - "locality": "Abakaliki" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "innocentakamc@gmail.com", - "telephone": "08035289029" - }, - "roles": [ - "supplier" - ] - } - ], - "awards": [ - { - "id": "ocds-zinqhl-221", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "active", - "date": "2022-06-25T13:00:00Z", - "value": { - "amount": 299989.5, - "currency": "NGN" - }, - "items": [ - { - "id": "1", - "description": "Procurement of Office Stationeries for Ministry of Works", - "classification": { - "scheme": "UNSPSC", - "id": "100767", - "description": "Stationery" - }, - "quantity": 15, - "unit": { - "name": "packs" - } - } - ], - "contractPeriod": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "suppliers": [ - { - "id": "NG-CAC-RC 3306867", - "name": "INNOAGY AGRO VENTURES" - } - ] - } - ], - "contracts": [ - { - "id": "ocds-zinqhl-014665-221-contract-1", - "awardID": "ocds-zinqhl-221", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "active", - "period": { - "startDate": "2022-06-25T13:00:00Z", - "endDate": "2023-06-25T14:00:00Z", - "durationInDays": 365 - }, - "value": { - "amount": 299989.5, - "currency": "NGN" - }, - "dateSigned": "2022-06-27T09:04:00Z", - "implementation": { - "transactions": [ - { - "id": "ocds-zinqhl-0018553175", - "value": { - "amount": 299990, - "currency": "NGN" - }, - "payer": { - "name": "MINISTRY OF WORKS AND TRANSPORT", - "id": "NG-001" - }, - "payee": { - "name": "INNOAGY AGRO VENTURES", - "id": "NG-CAC-RC 3306867" - } - } - ] - } } ] } - ], - "publisher": { - "name": "Ebonyi State Council on Public Procurement" - }, - "license": "https://ebonyieprocure.eb.gov.ng/license.php", - "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php" + ] } diff --git a/docs/examples/primer/releases.csv b/docs/examples/primer/releases.csv index a1d3264c8..09176a016 100644 --- a/docs/examples/primer/releases.csv +++ b/docs/examples/primer/releases.csv @@ -1,2 +1,2 @@ -ocid,id,date,tag,initiationType,buyer/id,buyer/name,language,tender/id,tender/title,tender/description,tender/status,tender/numberOfTenderers,tender/procurementMethod,tender/mainProcurementCategory,tender/procurementMethodDetails,tender/awardCriteriaDetails,tender/submissionMethod,tender/submissionMethodDetails,tender/tenderPeriod/startDate,tender/tenderPeriod/endDate,tender/contractPeriod/startDate,tender/contractPeriod/endDate,tender/contractPeriod/durationInDays,tender/hasEnquiries -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,2022-05-27T16:31:21Z,compiled,tender,NG-001,MINISTRY OF WORKS AND TRANSPORT,en,ocds-zinqhl-014665-EB/WTR/EP002-NG,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,complete,3,open,goods,"In open procedures, any interested economic operator may submit a tender in response to a contract notice",award to most responsive bid,electronicSubmission,Submit through the online portal at https://ebonyieprocure.eb.gov.ng,2022-05-27T16:32:00Z,2022-06-24T14:00:00Z,2022-06-25T13:00:00Z,2023-06-25T14:00:00Z,365,TRUE +ocid,id,date,tag,initiationType,tender/id,tender/title,tender/description,tender/status,tender/procurementMethod,tender/mainProcurementCategory,tender/procurementMethodDetails,tender/submissionMethod,tender/tenderPeriod/startDate,tender/tenderPeriod/endDate +ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,2022-05-27T16:31:21Z,compiled,tender,ocds-zinqhl-014665-EB/WTR/EP002-NG,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,complete,open,goods,"In open procedures, any interested economic operator may submit a tender in response to a contract notice",electronicSubmission,2022-05-27T16:32:00Z,2022-06-24T14:00:00Z diff --git a/docs/examples/primer/tender_items.csv b/docs/examples/primer/tender_items.csv deleted file mode 100644 index e3dded1cf..000000000 --- a/docs/examples/primer/tender_items.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,tender/id,tender/items/0/id,tender/items/0/classification/id,tender/items/0/classification/scheme,tender/items/0/classification/description,tender/items/0/quantity,tender/items/0/unit/name -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,ocds-zinqhl-014665-EB/WTR/EP002-NG,1,14111509,UNSPSC,Stationery,15,packs diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 4a0a39ab6..818ffcf37 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -24,26 +24,26 @@ In each release, the agency also updates the record, which combines all the rele * The versioned release makes it easy to see how the contracting process changed over time. ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json -:jsonpointer: -:expand: releases, tag, tender +:jsonpointer: releases +:expand: tag, tender :title: tender ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json -:jsonpointer: -:expand: releases, tag, tender +:jsonpointer: releases +:expand: tag, tender :title: tenderUpdate ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json -:jsonpointer: -:expand: releases, tag, tender +:jsonpointer: releases +:expand: tag, tender :title: tenderCancellation ``` ```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json -:jsonpointer: -:expand: records, compiledRelease, versionedRelease, tag, tender +:jsonpointer: records +:expand: compiledRelease, versionedRelease, tag, tender :title: record ``` diff --git a/docs/primer/how.md b/docs/primer/how.md index f2ca56cbc..f97ba2d62 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -124,8 +124,8 @@ The following example does not contain all existing fields, and not all of the i **JSON** ```{jsoninclude} ../examples/primer/primer.json -:jsonpointer: -:expand: releases, items +:jsonpointer: releases +:expand: tender ``` **CSV** @@ -143,55 +143,6 @@ The following example does not contain all existing fields, and not all of the i :header-rows: 1 :file: ../examples/primer/parties.csv ``` - -***tender_items*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/tender_items.csv -``` - -***documents*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/documents.csv -``` - -***awards*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/awards.csv -``` - -***award_suppliers*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/award_suppliers.csv -``` - -***award_items*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/award_items.csv -``` - -***contracts*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/contracts.csv -``` - -***contract_implementation*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/contract_implementation.csv -``` ```` No matter what type of contracting data you are working with or format you publish in, following OCDS rules and guidance will help you and your users to: diff --git a/docs/schema/merging.md b/docs/schema/merging.md index f3e53786b..7c892513d 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -45,15 +45,11 @@ A **versioned value** thus describes a field's value in a specific release. For example, in worked example 1 in [Updates and deletions](../guidance/build/merging), the estimated value of the procurement was 13,000 GHS (in the first release `tender/value/amount` was `13000`). Following the steps above, the versioned value is: -```json -{ - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "releaseDate": "2020-10-21T13:02:26Z", - "releaseTag": [ - "tender" - ], - "value": 13000 -} +```{jsoninclude} ../examples/merging/updates/ghana_versioned.json +:jsonpointer: /records/0/versionedRelease/tender +:include_only: id,date,tag,tender/value/amount +:expand: tender/value/amount +:title: Versioned_values ``` In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. @@ -62,13 +58,14 @@ For example, in the worked example referenced above, the number of tenderers was ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender +:include_only: id,date,tag,tender/numberOfTenderers :expand: numberOfTenderers,releaseTag :title: Versioned_values ``` ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json -:jsonpointer: -:expand: records, versionedRelease +:jsonpointer: /records/0/versionedRelease +:expand: tender/numberOfTenderers :title: Versioned_release ``` From 348945d95789a0046c5e5415e81a8f8d4ff88cbb Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 1 Dec 2023 16:47:01 +0000 Subject: [PATCH 15/40] fix build errors --- .../merging/updates/ghana_tender1.json | 22 +++++++++---------- docs/guidance/build/merging.md | 16 +++++++------- docs/guidance/map/buyers_suppliers.md | 2 +- docs/primer/how.md | 2 +- docs/schema/merging.md | 6 ++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json index 6d01f0d39..3f62cb975 100644 --- a/docs/examples/merging/updates/ghana_tender1.json +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -17,6 +17,16 @@ "tender" ], "initiationType": "tender", + "parties": [ + { + "name": "ECONOMIC AND ORGANISED CRIME OFFICE", + "id": "14957", + "roles": [ + "buyer", + "procuringEntity" + ] + } + ], "tender": { "id": "144560", "title": "Toners", @@ -29,17 +39,7 @@ "mainProcurementCategory": "goods", "numberOfTenderers": 0, "procurementMethod": "limited" - }, - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - } - ] + } } ] } diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 818ffcf37..067aba69a 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -24,26 +24,26 @@ In each release, the agency also updates the record, which combines all the rele * The versioned release makes it easy to see how the contracting process changed over time. ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json -:jsonpointer: releases -:expand: tag, tender +:jsonpointer: /releases +:expand: tag, tender, parties :title: tender ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json -:jsonpointer: releases -:expand: tag, tender +:jsonpointer: /releases +:expand: tag, tender, parties :title: tenderUpdate ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json -:jsonpointer: releases -:expand: tag, tender +:jsonpointer: /releases +:expand: tag, tender, parties :title: tenderCancellation ``` ```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json -:jsonpointer: records -:expand: compiledRelease, versionedRelease, tag, tender +:jsonpointer: /records +:expand: compiledRelease, versionedRelease, tag, tender, parties :title: record ``` diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md index 45ebbb00d..c4fa67dde 100644 --- a/docs/guidance/map/buyers_suppliers.md +++ b/docs/guidance/map/buyers_suppliers.md @@ -42,7 +42,7 @@ Siemens and Microsoft bid as a consortium for a contract to develop a new medica The contract is awarded to the consortium; however, the legal entity for the consortium is not created until after the contract award. -Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/reference.md#release-schema.json,/definitions/Organization,id). +Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/identifiers.md#organization-identifiers). ```json { diff --git a/docs/primer/how.md b/docs/primer/how.md index f97ba2d62..b5350bd39 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -124,7 +124,7 @@ The following example does not contain all existing fields, and not all of the i **JSON** ```{jsoninclude} ../examples/primer/primer.json -:jsonpointer: releases +:jsonpointer: /releases :expand: tender ``` diff --git a/docs/schema/merging.md b/docs/schema/merging.md index 7c892513d..26f45fd6f 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -48,7 +48,7 @@ For example, in worked example 1 in [Updates and deletions](../guidance/build/me ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender :include_only: id,date,tag,tender/value/amount -:expand: tender/value/amount +:expand: id,value,amount,currency :title: Versioned_values ``` @@ -59,13 +59,13 @@ For example, in the worked example referenced above, the number of tenderers was ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender :include_only: id,date,tag,tender/numberOfTenderers -:expand: numberOfTenderers,releaseTag +:expand: id,numberOfTenderers,releaseTag :title: Versioned_values ``` ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease -:expand: tender/numberOfTenderers +:expand: tender,numberOfTenderers :title: Versioned_release ``` From 522ace7b7a01679f733bad797b51607768bd3610 Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 1 Dec 2023 16:52:40 +0000 Subject: [PATCH 16/40] how.md: apply review suggestion --- docs/primer/how.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/primer/how.md b/docs/primer/how.md index b5350bd39..1666705ea 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -119,8 +119,6 @@ Tabular formats, such as CSV (or comma separated values) are commonly used in sp Nigeria's Ebonyi State publishes OCDS data in JSON and tabular formats. -The following example does not contain all existing fields, and not all of the included fields are required. It has been edited for length and consistency, and is not identical to the data available on the Ebonyi State e-Procurement platform. - **JSON** ```{jsoninclude} ../examples/primer/primer.json From 83eff561dbfcc5573525d88332af0d443675a52c Mon Sep 17 00:00:00 2001 From: Jen Harris <95221058+odscjen@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:40:14 +0000 Subject: [PATCH 17/40] Apply suggestions from code review Co-authored-by: Duncan Dewhurst --- docs/examples/merging/updates/ghana_tender1.json | 2 +- docs/examples/merging/updates/ghana_tender2.json | 7 ------- docs/guidance/build/merging.md | 12 ++++++------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json index 3f62cb975..c0997954f 100644 --- a/docs/examples/merging/updates/ghana_tender1.json +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -30,7 +30,7 @@ "tender": { "id": "144560", "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "active", "value": { "amount": 13000, diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json index 09632665e..74c4abc6a 100644 --- a/docs/examples/merging/updates/ghana_tender2.json +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -32,13 +32,6 @@ "roles": [ "tenderer" ] - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] } ], "tender": { diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 067aba69a..945b94f87 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -12,11 +12,11 @@ The following examples show how updates and deletions are reflected in compiled ## Example 1: Updates -The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of two tenderers and the publication date of the bidding documents. +The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of two tenderers. On December 19, 2020 it publishes a third release announcing that the tender is cancelled. -Through these individual releases, the agency provides real-time data about the contracting (or planning) process. +Through these individual releases, the agency provides real-time data about the contracting process. In each release, the agency also updates the record, which combines all the releases to date. In the final record: @@ -26,25 +26,25 @@ In each release, the agency also updates the record, which combines all the rele ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json :jsonpointer: /releases :expand: tag, tender, parties -:title: tender +:title: Tender release ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json :jsonpointer: /releases :expand: tag, tender, parties -:title: tenderUpdate +:title: Tender update release ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json :jsonpointer: /releases :expand: tag, tender, parties -:title: tenderCancellation +:title: Tender cancellation release ``` ```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json :jsonpointer: /records :expand: compiledRelease, versionedRelease, tag, tender, parties -:title: record +:title: Record ``` ## Example 2: Deletion of fields and objects From d393426d9ee7ade74175e875f9342593bdd20c82 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 12 Dec 2023 11:28:43 +0000 Subject: [PATCH 18/40] docs/merging updates following review --- .../merging/updates/ghana_tender2.json | 28 ++--------- .../merging/updates/ghana_tender3.json | 46 +------------------ .../merging/updates/ghana_versioned.json | 42 +---------------- docs/guidance/build/merging.md | 14 +++--- docs/schema/merging.md | 2 +- 5 files changed, 14 insertions(+), 118 deletions(-) diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json index 74c4abc6a..03f98de27 100644 --- a/docs/examples/merging/updates/ghana_tender2.json +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -16,19 +16,10 @@ "tag": [ "tenderUpdate" ], - "initiationType": "tender", "parties": [ { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - }, - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387", + "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", + "id": "1215", "roles": [ "tenderer" ] @@ -36,21 +27,8 @@ ], "tender": { "id": "144560", - "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "status": "active", - "value": { - "amount": 13000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "numberOfTenderers": 2, - "procurementMethod": "limited", + "numberOfTenderers": 1, "tenderers": [ - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json index 7314ce56f..188b7bddb 100644 --- a/docs/examples/merging/updates/ghana_tender3.json +++ b/docs/examples/merging/updates/ghana_tender3.json @@ -16,53 +16,9 @@ "tag": [ "tenderCancellation" ], - "initiationType": "tender", - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - }, - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387", - "roles": [ - "tenderer" - ] - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] - } - ], "tender": { "id": "144560", - "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", - "status": "cancelled", - "value": { - "amount": 13000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "numberOfTenderers": 2, - "procurementMethod": "limited", - "tenderers": [ - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ] + "status": "cancelled" } } ] diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json index 716dba3aa..b0bda1187 100644 --- a/docs/examples/merging/updates/ghana_versioned.json +++ b/docs/examples/merging/updates/ghana_versioned.json @@ -252,31 +252,6 @@ } ] }, - { - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GS INTERNATIONAL COMPANY LIMITED" - } - ], - "id": "2387", - "roles": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": [ - "tenderer" - ] - } - ] - }, { "name": [ { @@ -331,7 +306,7 @@ ], "releaseDate": "2020-10-21T13:02:26Z", "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT." + "value": "The E.O.C.O is requesting quotations for the supply of toners." } ], "status": [ @@ -399,7 +374,7 @@ ], "releaseDate": "2020-11-05T14:36:54Z", "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": 2 + "value": 1 } ], "procurementMethod": [ @@ -413,19 +388,6 @@ } ], "tenderers": [ - { - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": "GS INTERNATIONAL COMPANY LIMITED" - } - ], - "id": "2387" - }, { "name": [ { diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 945b94f87..3513389da 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -12,7 +12,7 @@ The following examples show how updates and deletions are reflected in compiled ## Example 1: Updates -The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of two tenderers. +The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of one tenderer. On December 19, 2020 it publishes a third release announcing that the tender is cancelled. @@ -20,31 +20,31 @@ Through these individual releases, the agency provides real-time data about the In each release, the agency also updates the record, which combines all the releases to date. In the final record: -* The compiled release contains all the information about the opportunity and the tenderers, using the same schema as a release. +* The compiled release contains all the information about the opportunity and the tenderer, using the same schema as a release. * The versioned release makes it easy to see how the contracting process changed over time. ```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json :jsonpointer: /releases :expand: tag, tender, parties -:title: Tender release +:title: tender ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json :jsonpointer: /releases :expand: tag, tender, parties -:title: Tender update release +:title: tenderUpdate ``` ```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json :jsonpointer: /releases -:expand: tag, tender, parties -:title: Tender cancellation release +:expand: tag, tender +:title: tenderCancellation ``` ```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json :jsonpointer: /records :expand: compiledRelease, versionedRelease, tag, tender, parties -:title: Record +:title: record ``` ## Example 2: Deletion of fields and objects diff --git a/docs/schema/merging.md b/docs/schema/merging.md index 26f45fd6f..e772c9eae 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -54,7 +54,7 @@ For example, in worked example 1 in [Updates and deletions](../guidance/build/me In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -For example, in the worked example referenced above, the number of tenderers was 0 in the release published October 21, 2020 and then 2 in the release published November 5, 2020. In a versioned release, this is serialized as below: +For example, in the worked example referenced above, the number of tenderers was 0 in the release published October 21, 2020 and then 1 in the release published November 5, 2020. In a versioned release, this is serialized as below: ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender From 7c81ba51ceb9bd9a16230a0310787a86fede5e55 Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 15 Dec 2023 15:39:14 +0000 Subject: [PATCH 19/40] docs/merging: apply review suggestions --- .../merging/updates/ghana_tender1.json | 9 +- .../merging/updates/ghana_tender2.json | 13 +- .../merging/updates/ghana_tender3.json | 8 +- .../merging/updates/ghana_versioned.json | 135 ++++++------------ docs/guidance/build/merging.md | 2 +- docs/schema/merging.md | 43 ++++-- 6 files changed, 92 insertions(+), 118 deletions(-) diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json index c0997954f..8b5e93cd6 100644 --- a/docs/examples/merging/updates/ghana_tender1.json +++ b/docs/examples/merging/updates/ghana_tender1.json @@ -7,11 +7,11 @@ "uid": "1234 ", "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", "releases": [ { - "ocid": "ocds-uhveoc-144560", - "id": "ocds-uhveoc-144560-1601380494627-tender", + "ocid": "ocds-uhveoc-000001", + "id": "ocds-uhveoc-000001-1601380494627-tender", "date": "2020-10-21T13:02:26Z", "tag": [ "tender" @@ -28,7 +28,7 @@ } ], "tender": { - "id": "144560", + "id": "000001", "title": "Toners", "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "active", @@ -37,7 +37,6 @@ "currency": "GHS" }, "mainProcurementCategory": "goods", - "numberOfTenderers": 0, "procurementMethod": "limited" } } diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json index 03f98de27..21f6a1afc 100644 --- a/docs/examples/merging/updates/ghana_tender2.json +++ b/docs/examples/merging/updates/ghana_tender2.json @@ -7,11 +7,11 @@ "uid": "1234 ", "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", "releases": [ { - "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-000001-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-000001", "date": "2020-11-05T14:36:54Z", "tag": [ "tenderUpdate" @@ -26,8 +26,11 @@ } ], "tender": { - "id": "144560", - "numberOfTenderers": 1, + "id": "000001", + "value": { + "amount": 12000, + "currency": "GHS" + }, "tenderers": [ { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json index 188b7bddb..d90bbdfe6 100644 --- a/docs/examples/merging/updates/ghana_tender3.json +++ b/docs/examples/merging/updates/ghana_tender3.json @@ -7,17 +7,17 @@ "uid": "1234 ", "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", "releases": [ { - "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-000001-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-000001", "date": "2022-12-19T11:55:46Z", "tag": [ "tenderCancellation" ], "tender": { - "id": "144560", + "id": "000001", "status": "cancelled" } } diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json index b0bda1187..dd73ccbee 100644 --- a/docs/examples/merging/updates/ghana_versioned.json +++ b/docs/examples/merging/updates/ghana_versioned.json @@ -7,30 +7,29 @@ "uid": "1234 ", "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-144560", + "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", "records": [ { - "ocid": "ocds-uhveoc-144560", + "ocid": "ocds-uhveoc-000001", "releases": [ { - "ocid": "ocds-uhveoc-144560", - "id": "ocds-uhveoc-144560-1601380494627-tender", + "ocid": "ocds-uhveoc-000001", + "id": "ocds-uhveoc-000001-1601380494627-tender", "date": "2020-10-21T13:02:26Z", "tag": [ "tender" ], "initiationType": "tender", "tender": { - "id": "144560", + "id": "000001", "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "active", "value": { "amount": 13000, "currency": "GHS" }, "mainProcurementCategory": "goods", - "numberOfTenderers": 0, "procurementMethod": "limited" }, "parties": [ @@ -45,8 +44,8 @@ ] }, { - "id": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-000001-1601380494630-tenderUpdate", + "ocid": "ocds-uhveoc-000001", "date": "2020-11-05T14:36:54Z", "tag": [ "tenderUpdate" @@ -61,13 +60,6 @@ "procuringEntity" ] }, - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387", - "roles": [ - "tenderer" - ] - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215", @@ -77,22 +69,17 @@ } ], "tender": { - "id": "144560", + "id": "000001", "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "active", "value": { - "amount": 13000, + "amount": 12000, "currency": "GHS" }, "mainProcurementCategory": "goods", - "numberOfTenderers": 2, "procurementMethod": "limited", "tenderers": [ - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" @@ -101,8 +88,8 @@ } }, { - "id": "ocds-uhveoc-144560-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-144560", + "id": "ocds-uhveoc-000001-1668517276492-tenderCancellation", + "ocid": "ocds-uhveoc-000001", "date": "2022-12-19T11:55:46Z", "tag": [ "tenderCancellation" @@ -117,13 +104,6 @@ "procuringEntity" ] }, - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387", - "roles": [ - "tenderer" - ] - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215", @@ -133,22 +113,17 @@ } ], "tender": { - "id": "144560", + "id": "000001", "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "cancelled", "value": { - "amount": 13000, + "amount": 12000, "currency": "GHS" }, "mainProcurementCategory": "goods", - "numberOfTenderers": 2, "procurementMethod": "limited", "tenderers": [ - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" @@ -159,7 +134,7 @@ ], "compiledRelease": { "id": "compiled", - "ocid": "ocds-uhveoc-144560", + "ocid": "ocds-uhveoc-000001", "date": "2022-12-20T01:01:12Z", "tag": [ "compiled" @@ -174,13 +149,6 @@ "procuringEntity" ] }, - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387", - "roles": [ - "tenderer" - ] - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215", @@ -190,22 +158,17 @@ } ], "tender": { - "id": "144560", + "id": "000001", "title": "Toners", - "description": "The E.O.C.O is requesting for quotations from your outfit for the supply of ten (10) pieces each of 26A and 29A toners.\r\nYou are requested to submit your quotation via GHANEPS portal.\r\nDeadline for submission is 30th October, 2020. at 16:00 HRS GMT.", + "description": "The E.O.C.O is requesting quotations for the supply of toners.", "status": "cancelled", "value": { "amount": 13000, "currency": "GHS" }, "mainProcurementCategory": "goods", - "numberOfTenderers": 2, "procurementMethod": "limited", "tenderers": [ - { - "name": "GS INTERNATIONAL COMPANY LIMITED", - "id": "2387" - }, { "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", "id": "1215" @@ -214,14 +177,14 @@ } }, "versionedRelease": { - "ocid": "ocds-uhveoc-144560", + "ocid": "ocds-uhveoc-000001", "initiationType": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "tender" } ], @@ -233,7 +196,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "ECONOMIC AND ORGANISED CRIME OFFICE" } ], @@ -244,7 +207,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": [ "buyer", "procuringEntity" @@ -259,7 +222,7 @@ "tenderUpdate" ], "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" } ], @@ -270,7 +233,7 @@ "tenderUpdate" ], "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", "value": [ "tenderer" ] @@ -285,8 +248,8 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": "144560" + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", + "value": "000001" } ], "title": [ @@ -295,7 +258,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "Toners" } ], @@ -305,7 +268,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "The E.O.C.O is requesting quotations for the supply of toners." } ], @@ -315,7 +278,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "active" }, { @@ -323,7 +286,7 @@ "tenderCancellation" ], "releaseDate": "2022-12-19T11:55:46Z", - "releaseID": "ocds-uhveoc-144560-1668517276492-tenderCancellation", + "releaseID": "ocds-uhveoc-000001-1668517276492-tenderCancellation", "value": "cancelled" } ], @@ -334,8 +297,16 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": 13000 + }, + { + "releaseTag": [ + "tenderUpdate" + ], + "releaseDate": "2020-11-05T14:36:54Z", + "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", + "value": 12000 } ], "currency": [ @@ -344,7 +315,7 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "GHS" } ] @@ -355,35 +326,17 @@ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "goods" } ], - "numberOfTenderers": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", - "value": 0 - }, - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", - "value": 1 - } - ], "procurementMethod": [ { "releaseTag": [ "tender" ], "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-144560-1601380494627-tender", + "releaseID": "ocds-uhveoc-000001-1601380494627-tender", "value": "limited" } ], @@ -395,7 +348,7 @@ "tenderUpdate" ], "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-144560-1601380494630-tenderUpdate", + "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" } ], diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 3513389da..b07764c59 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -12,7 +12,7 @@ The following examples show how updates and deletions are reflected in compiled ## Example 1: Updates -The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of one tenderer. +The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of one tenderer and an amended tender value of 12,000 GHS. On December 19, 2020 it publishes a third release announcing that the tender is cancelled. diff --git a/docs/schema/merging.md b/docs/schema/merging.md index e772c9eae..4ec51dfc1 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -43,30 +43,49 @@ To convert a field's value in a release to a **versioned value**, you must: A **versioned value** thus describes a field's value in a specific release. -For example, in worked example 1 in [Updates and deletions](../guidance/build/merging), the estimated value of the procurement was 13,000 GHS (in the first release `tender/value/amount` was `13000`). Following the steps above, the versioned value is: +For example, in worked example 1 in [Updates and deletions](../guidance/build/merging), the method by which the procurement is taking place is stated as limited (in the first release `tender/procurementMethod` was `limited`). In the initial release this looks like: + +```{jsoninclude} ../examples/merging/updates/ghana_tender1.json +:jsonpointer: /releases/0/tender +:include_only: procurementMethod +:expand: procurementMethod +:title: Value +``` + +Following the steps above, the versioned value is: ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json :jsonpointer: /records/0/versionedRelease/tender -:include_only: id,date,tag,tender/value/amount -:expand: id,value,amount,currency +:include_only: procurementMethod +:expand: procurementMethod :title: Versioned_values ``` In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -For example, in the worked example referenced above, the number of tenderers was 0 in the release published October 21, 2020 and then 1 in the release published November 5, 2020. In a versioned release, this is serialized as below: +For example, in the worked example referenced above, the value of the tender was $13,000 in the release published October 21, 2020 and then $12,000 in the release published November 5, 2020. -```{jsoninclude} ../examples/merging/updates/ghana_versioned.json -:jsonpointer: /records/0/versionedRelease/tender -:include_only: id,date,tag,tender/numberOfTenderers -:expand: id,numberOfTenderers,releaseTag -:title: Versioned_values +```{jsoninclude} ../examples/merging/updates/ghana_tender1.json +:jsonpointer: /releases/0/tender +:include_only: tender/value +:expand: value +:title: initial_value ``` +```{jsoninclude} ../examples/merging/updates/ghana_tender2.json +:jsonpointer: /releases/0/tender +:include_only: tender/value +:expand: value +:title: updated_value +``` + +In a versioned release, this is serialized as below: + ```{jsoninclude} ../examples/merging/updates/ghana_versioned.json -:jsonpointer: /records/0/versionedRelease -:expand: tender,numberOfTenderers -:title: Versioned_release +:jsonpointer: /records/0/versionedRelease/tender +:include_only: tender/value +:expand: value,amount,releaseTag +:title: Versioned_values ``` The structure of the versioned release is described by the [versioned release schema](../../build/current_lang/versioned-release-validation-schema.json); note that the `ocid` field's value is not versioned. From 95575f90a81da814657ed4dbf8e578d29d0d039e Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 14:31:20 +1300 Subject: [PATCH 20/40] docs/guidance/build/merging.md: Replace updates example --- docs/guidance/build/merging.md | 39 +++------------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index b07764c59..14f96c000 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -10,44 +10,11 @@ The merge routine also allows a publisher to correct a publication error by dele The following examples show how updates and deletions are reflected in compiled and versioned releases. -## Example 1: Updates +## Updates -The Ghana Public Procurement Authority publishes a release to announce an opportunity on October 21, 2020 with an estimated value of 13,000 GHS. On November 5, 2020 it publishes an update containing the details of one tenderer and an amended tender value of 12,000 GHS. +The [tender updates and amendments example](../map/amendments.md) illustrates how releases are used to update field values and how updates are reflected in compiled and versioned releases. -On December 19, 2020 it publishes a third release announcing that the tender is cancelled. - -Through these individual releases, the agency provides real-time data about the contracting process. - -In each release, the agency also updates the record, which combines all the releases to date. In the final record: - -* The compiled release contains all the information about the opportunity and the tenderer, using the same schema as a release. -* The versioned release makes it easy to see how the contracting process changed over time. - -```{jsoninclude} ../../examples/merging/updates/ghana_tender1.json -:jsonpointer: /releases -:expand: tag, tender, parties -:title: tender -``` - -```{jsoninclude} ../../examples/merging/updates/ghana_tender2.json -:jsonpointer: /releases -:expand: tag, tender, parties -:title: tenderUpdate -``` - -```{jsoninclude} ../../examples/merging/updates/ghana_tender3.json -:jsonpointer: /releases -:expand: tag, tender -:title: tenderCancellation -``` - -```{jsoninclude} ../../examples/merging/updates/ghana_versioned.json -:jsonpointer: /records -:expand: compiledRelease, versionedRelease, tag, tender, parties -:title: record -``` - -## Example 2: Deletion of fields and objects +## Deletions ### Fields From 253c3f6db00ddff18c5f4aba409d1be88dfe17af Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 14:53:43 +1300 Subject: [PATCH 21/40] docs/guidance/map/buyers_suppliers.md: Move consortia example to JSON file, simplify --- docs/examples/buyers_suppliers/consortia.json | 45 +++++++++++++++++++ docs/guidance/map/buyers_suppliers.md | 31 ++++--------- 2 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 docs/examples/buyers_suppliers/consortia.json diff --git a/docs/examples/buyers_suppliers/consortia.json b/docs/examples/buyers_suppliers/consortia.json new file mode 100644 index 000000000..04bca72a3 --- /dev/null +++ b/docs/examples/buyers_suppliers/consortia.json @@ -0,0 +1,45 @@ +{ + "version": "1.1", + "releases": [ + { + "ocid": "ocds-213czf-0000", + "id": "1", + "date": "2024-01-01T00:00:00Z", + "awards": [ + { + "id": "1", + "suppliers": [ + { + "id": "GB-COH-727817", + "name": "SIEMENS PUBLIC LIMITED COMPANY" + }, + { + "id":"GB-COH-1624297", + "name": "MICROSOFT LIMITED" + } + ] + } + ], + "parties": [ + [ + { + "id": "GB-COH-727817", + "name": "SIEMENS PUBLIC LIMITED COMPANY", + "identifier": { + "id": "727817", + "scheme": "GB-COH" + } + }, + { + "id":"GB-COH-1624297", + "name": "MICROSOFT LIMITED", + "identifier": { + "id": "624297", + "scheme": "GB-COH" + } + } + ] + ] + } + ] +} diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md index 03e555198..bea23a404 100644 --- a/docs/guidance/map/buyers_suppliers.md +++ b/docs/guidance/map/buyers_suppliers.md @@ -38,29 +38,16 @@ In such cases, the `Award` object in OCDS can have multiple suppliers associated ### Example: Consortia suppliers -Siemens and Microsoft bid as a consortium for a contract to develop a new medical imaging device for the Department of Health and Social Care. +Siemens and Microsoft bid as a consortium for a contract. The contract is awarded to the consortium; however, the legal entity for the consortium is not created until after the contract award. -Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/identifiers.md#organization-identifiers). - -```json -{ - "awards": [ - { - "id": "DHSC-2019-A18074", - "title": "Medical imaging device development", - "suppliers": [ - { - "name": "SIEMENS PUBLIC LIMITED COMPANY", - "id": "GB-COH-727817" - }, - { - "name": "MICROSOFT LIMITED", - "id":"GB-COH-1624297" - } - ] - } - ] -} +Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/identifiers.md#organization-identifiers): + +```{field-description} ../../../build/current_lang/release-schema.json /definitions/Organization/properties/id +``` + +```{jsoninclude} ../../examples/buyers_suppliers/consortia.json +:jsonpointer: /releases +:expand: awards, suppliers, parties, identifier ``` From 058b50a3c1003488a9dc8431cf6f1b5c662012f7 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 15:04:07 +1300 Subject: [PATCH 22/40] docs/primer/how.md: Simplify example --- docs/examples/primer/parties.csv | 2 -- docs/examples/primer/primer.csv | 2 ++ docs/examples/primer/primer.json | 56 ++++++------------------------- docs/examples/primer/releases.csv | 2 -- docs/primer/how.md | 20 ++--------- 5 files changed, 15 insertions(+), 67 deletions(-) delete mode 100644 docs/examples/primer/parties.csv create mode 100644 docs/examples/primer/primer.csv delete mode 100644 docs/examples/primer/releases.csv diff --git a/docs/examples/primer/parties.csv b/docs/examples/primer/parties.csv deleted file mode 100644 index a3ade96ed..000000000 --- a/docs/examples/primer/parties.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,parties/0/id,parties/0/name,parties/0/address/streetAddress,parties/0/address/locality,parties/0/address/region,parties/0/address/postalCode,parties/0/address/countryName,parties/0/contactPoint/name,parties/0/contactPoint/url,parties/0/roles -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,NG-001,MINISTRY OF WORKS AND TRANSPORT,"ABAKALIKI, EBONYI STATE",Abakaliki,Ebonyi East,480,Nigeria,"ENGR. OBASI, OGBONNAYA ABARA",http://www.mowt.eb.gov.ng/,buyer diff --git a/docs/examples/primer/primer.csv b/docs/examples/primer/primer.csv new file mode 100644 index 000000000..5cd25f8b0 --- /dev/null +++ b/docs/examples/primer/primer.csv @@ -0,0 +1,2 @@ +ocid,id,date,tag,tender/id,tender/title,tender/value/amount,tender/value/currency +ocds-213czf-0000,1,2024-01-01T00:00:00Z,tender,1,Purchase of office supplies,6000,USD diff --git a/docs/examples/primer/primer.json b/docs/examples/primer/primer.json index 3598b2fcf..3d8978132 100644 --- a/docs/examples/primer/primer.json +++ b/docs/examples/primer/primer.json @@ -1,57 +1,21 @@ { - "uri": "https://ebonyieprocure.eb.gov.ng/do_award_contract_details.php?id=ocds-zinqhl-014665-EB/WTR/EP002-NG", "version": "1.1", - "publishedDate": "2022-05-27T10:00:00Z", - "publisher": { - "name": "Ebonyi State Council on Public Procurement" - }, - "license": "https://ebonyieprocure.eb.gov.ng/license.php", - "publicationPolicy": "https://ebonyieprocure.eb.gov.ng/publication.php", "releases": [ { - "ocid": "ocds-zinqhl-014665-EB/WTR/EP002-NG", - "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG-award", - "date": "2022-05-27T16:31:21Z", + "ocid": "ocds-213czf-0000", + "id": "1", + "date": "2024-01-01T00:00:00Z", "tag": [ - "compiled" + "tender" ], - "initiationType": "tender", "tender": { - "id": "ocds-zinqhl-014665-EB/WTR/EP002-NG", - "title": "Procurement of Office Stationeries for Ministry of Works", - "description": "Procurement of Office Stationeries for Ministry of Works", - "status": "complete", - "procurementMethod": "open", - "mainProcurementCategory": "goods", - "procurementMethodDetails": "In open procedures, any interested economic operator may submit a tender in response to a contract notice", - "submissionMethod": [ - "electronicSubmission" - ], - "tenderPeriod": { - "startDate": "2022-05-27T16:32:00Z", - "endDate": "2022-06-24T14:00:00Z" + "id": "1", + "title": "Purchase of office supplies", + "value": { + "amount": 6000, + "currency": "USD" } - }, - "parties": [ - { - "name": "MINISTRY OF WORKS AND TRANSPORT", - "id": "NG-001", - "address": { - "streetAddress": "ABAKALIKI, EBONYI STATE", - "locality": "Abakaliki", - "region": "Ebonyi East", - "postalCode": "480", - "countryName": "Nigeria" - }, - "contactPoint": { - "name": "ENGR. OBASI, OGBONNAYA ABARA", - "url": "http://www.mowt.eb.gov.ng/" - }, - "roles": [ - "buyer" - ] - } - ] + } } ] } diff --git a/docs/examples/primer/releases.csv b/docs/examples/primer/releases.csv deleted file mode 100644 index 09176a016..000000000 --- a/docs/examples/primer/releases.csv +++ /dev/null @@ -1,2 +0,0 @@ -ocid,id,date,tag,initiationType,tender/id,tender/title,tender/description,tender/status,tender/procurementMethod,tender/mainProcurementCategory,tender/procurementMethodDetails,tender/submissionMethod,tender/tenderPeriod/startDate,tender/tenderPeriod/endDate -ocds-zinqhl-014665-EB/WTR/EP002-NG,ocds-zinqhl-014665-EB/WTR/EP002-NG-award,2022-05-27T16:31:21Z,compiled,tender,ocds-zinqhl-014665-EB/WTR/EP002-NG,Procurement of Office Stationeries for Ministry of Works,Procurement of Office Stationeries for Ministry of Works,complete,open,goods,"In open procedures, any interested economic operator may submit a tender in response to a contract notice",electronicSubmission,2022-05-27T16:32:00Z,2022-06-24T14:00:00Z diff --git a/docs/primer/how.md b/docs/primer/how.md index 455517e1c..39e6c9b7d 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -115,32 +115,18 @@ While the OCDS schema is described using JSON Schema, OCDS data can be converted Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheet applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats both so that more users’ needs can be satisfied. -**Example** - -Nigeria's Ebonyi State publishes OCDS data in JSON and tabular formats. - -**JSON** +The following examples show the same data in JSON and tabular format: ```{jsoninclude} ../examples/primer/primer.json :jsonpointer: /releases -:expand: tender +:expand: tag, tender ``` -**CSV** - -***releases*** - ```{csv-table-no-translate} :header-rows: 1 -:file: ../examples/primer/releases.csv +:file: ../examples/primer/primer.csv ``` -***parties*** - -```{csv-table-no-translate} -:header-rows: 1 -:file: ../examples/primer/parties.csv -``` ```` No matter what type of contracting data you are working with or format you publish in, following OCDS rules and guidance will help you and your users to: From 5be532454313a03e509ba4d7856cc61ad772d8fc Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 28 Feb 2024 16:33:44 +1300 Subject: [PATCH 23/40] docs/guidance/map/amendments.md: Simplify tender example --- docs/examples/amendments/tender.json | 436 +++++---------------------- docs/guidance/map/amendments.md | 28 +- 2 files changed, 78 insertions(+), 386 deletions(-) diff --git a/docs/examples/amendments/tender.json b/docs/examples/amendments/tender.json index 59975919a..8ffc05e07 100644 --- a/docs/examples/amendments/tender.json +++ b/docs/examples/amendments/tender.json @@ -6,376 +6,136 @@ "releases": [ { "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender", - "date": "2016-01-01T09:30:00Z", + "id": "1", + "date": "2024-01-01T00:00:00Z", "tag": [ "tender" ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Data merge tool.", - "status": "active", + "id": "1", + "title": "Office supplies", "value": { - "amount": 1000, + "amount": 10000, "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-15T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" } } }, { "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender-update", - "date": "2016-01-31T09:30:00Z", + "id": "2", + "date": "2024-01-07T00:00:00Z", "tag": [ "tenderUpdate" ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "id": "1", + "title": "Office supplies", "value": { - "amount": 1000, + "amount": 10000, "currency": "USD" }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-15T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - } + "mainProcurementCategory": "goods" } }, { "ocid": "ocds-213czf-000-00002", - "id": "ocds-213czf-000-00002-01-tender-amendment", - "date": "2016-02-05T10:30:00Z", + "id": "3", + "date": "2024-01-14T00:00:00Z", "tag": [ "tenderAmendment" ], - "parties": [ - { - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ], - "id": "GB-COH-09506232" - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "id": "1", + "title": "Office supplies", "value": { - "amount": 2000, + "amount": 15000, "currency": "USD" }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, + "mainProcurementCategory": "goods", "amendments": [ { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" + "id": "1", + "date": "2024-01-14T00:00:00Z", + "rationale": "Additional needs identified.", + "amendsReleaseID": "2", + "releaseID": "3" } ] } } ], "compiledRelease": { + "ocid": "ocds-213czf-000-00002", + "id": "ocds-213czf-000-00002-2024-01-14T00:00:00Z", + "date": "2024-01-14T00:00:00Z", "tag": [ "compiled" ], - "id": "ocds-213czf-000-00002-2016-02-05T10:30:00Z", - "date": "2016-02-05T10:30:00Z", - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ] - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "id": "1", + "title": "Office supplies", "value": { - "amount": 2000, + "amount": 15000, "currency": "USD" }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, + "mainProcurementCategory": "goods", "amendments": [ { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" + "id": "1", + "date": "2024-01-14T00:00:00Z", + "rationale": "Additional needs identified.", + "amendsReleaseID": "2", + "releaseID": "3" } ] - } + } }, "versionedRelease": { "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ], - "identifier": { - "scheme": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH" - } - ], - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "09506232" - } - ], - "legalName": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services Co-operative" - } - ], - "uri": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "https://opencorporates.com/companies/gb/09506232" - } - ] - }, - "roles": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": [ - "buyer" - ] - } - ] - } - ], - "buyer": { - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH-09506232" - } - ], - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ] - }, "tender": { "id": [ { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "1", + "releaseDate": "2024-01-01T00:00:00Z", "releaseTag": [ "tender" ], - "value": "ocds-213czf-000-00002-01-tender" + "value": "1" } ], "title": [ { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Data merging tool" - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "1", + "releaseDate": "2024-01-01T00:00:00Z", "releaseTag": [ "tender" ], - "value": "Data merge tool." - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-update", - "releaseDate": "2016-01-31T09:30:00Z", - "releaseTag": [ - "tenderUpdate" - ], - "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." - } - ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" + "value": "Office supplies" } ], "value": { "amount": [ { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "1", + "releaseDate": "2024-01-01T00:00:00Z", "releaseTag": [ "tender" ], - "value": 1000 + "value": 10000 }, { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", + "releaseID": "3", + "releaseDate": "2024-01-14T00:00:00Z", "releaseTag": [ "tenderAmendment" ], - "value": 2000 + "value": 15000 } ], "currency": [ { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "1", + "releaseDate": "2024-01-01T00:00:00Z", "releaseTag": [ "tender" ], @@ -383,119 +143,59 @@ } ] }, - "procurementMethod": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "open" - } - ], - "awardCriteria": [ + "mainProcurementCategory": [ { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", + "releaseID": "2", + "releaseDate": "2024-01-07T00:00:00Z", "releaseTag": [ "tender" ], - "value": "bestProposal" + "value": [ + "goods" + ] } ], - "tenderPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-01-31T09:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-02-15T18:00:00Z" - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "2016-02-20T18:00:00Z" - } - ] - }, - "awardPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-04-01T00:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-06-01T23:59:59Z" - } - ] - }, "amendments": [ { - "id": "amendment-1", + "id": "1", "date": [ { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", + "releaseID": "3", + "releaseDate": "2024-01-14T00:00:00Z", "releaseTag": [ "tenderAmendment" ], - "value": "2016-02-04T09:30:00Z" + "value": "2024-01-14T00:00:00Z" } ], "rationale": [ { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", + "releaseID": "3", + "releaseDate": "2024-01-14T00:00:00Z", "releaseTag": [ "tenderAmendment" ], - "value": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended" + "value": "Additional needs identified" } ], "amendsReleaseID": [ { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", + "releaseID": "3", + "releaseDate": "2024-01-14T00:00:00Z", "releaseTag": [ "tenderAmendment" ], - "value": "ocds-213czf-000-00002-01-tender" + "value": "2" } ], "releaseID": [ { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", + "releaseID": "3", + "releaseDate": "2024-01-14T00:00:00Z", "releaseTag": [ "tenderAmendment" ], - "value": "ocds-213czf-000-00002-01-tender-amendment" + "value": "2" } ] } diff --git a/docs/guidance/map/amendments.md b/docs/guidance/map/amendments.md index 32c126d9e..0fbc2de32 100644 --- a/docs/guidance/map/amendments.md +++ b/docs/guidance/map/amendments.md @@ -24,11 +24,11 @@ The nature of a change can be made explicit using: ### Example 1: Tender updates and amendments -This example goes through updates during the **tender** stage in a contracting process. +This example illustrates how updates and amendments are modelled in OCDS. -#### Tender +#### Tender release -A publisher issues a tender for a "Data merge tool". A new release with the `tag` 'tender' is built, see the JSON example below. +A buyer publishes a tender for the purchase of office supplies. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/0 @@ -36,9 +36,9 @@ A publisher issues a tender for a "Data merge tool". A new release with the `tag :title: Tender ``` -#### Tender Update +#### Tender update release -Weeks later, the publisher expands the `description` of the tender to provide more details about the tool being procured. A new release with the `tag` 'tenderUpdate' is built. The publisher does not consider this to be a formal 'amendment' to the tender, so does not publish any amendment information. See the JSON release below. +The buyer adds a main procurement category to the tender. The new information is not a formal amendment to the tender so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. The publisher chooses to repeat fields whose values are unchanged from the previous release. Such fields can be omitted when a publication provides access to historic releases. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/1 @@ -46,9 +46,9 @@ Weeks later, the publisher expands the `description` of the tender to provide mo :title: TenderUpdate ``` -#### Tender Amendment +#### Tender amendment release -A few days later, the publisher increases the value of the tender and extends the deadline for bid submissions. These changes are considered as an 'amendment' by the publisher (depending on jurisdiction, certain changes can need to be disclosed as amendments), and so the new release has the `tag` 'tenderAmendment' and an `amendments` block under `tender`. The release reflects the updated value (USD 2000 instead of USD 1000) and the updated closing date for bid submissions (`2012-02-20` instead of `2012-02-15`). See the JSON example below. +The buyer increases the estimated value of the tender. This change is a formal amendment to the tender so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. Note that `tender.amendments` does not include the changed values. Rather, the `tender.value.amount` field itself is updated. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/2 @@ -58,11 +58,11 @@ A few days later, the publisher increases the value of the tender and extends th #### Record -A full record is provided below, with all the releases for the process and a `compiledRelease` and `versionedRelease`. The `versionedRelease` block reflects all the changes made in the tender. +`releases` contains the above releases, `compiledRelease` contains the latest value of each field and, `versionedRelease` contains a history of changes to each field. The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to identify what changed. ```{jsoninclude} ../../examples/amendments/tender.json -:jsonpointer: -:expand: records, releases +:jsonpointer: /records/0 +:expand: compiledRelease, versionedRelease, value, amount :title: FullRecord ``` @@ -70,14 +70,6 @@ A full record is provided below, with all the releases for the process and a `co It is encouraged to [download](../../examples/amendments/tender.json) the record example and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. ``` -Note in this example that: - -* **The amendments block does not contain data on what was changed**. Changes are recorded by updating the fields of the `tender` block a new release. - -* **The publisher chooses in the 'tenderAmendment' release to repeat a fragment of the original 'tender' release**. This is not necessary when a full archive of releases is made accessible, but a publisher might want to provide the latest data available in each release. - -* **In the record**, the `releaseID` and `amendsReleaseID` fields from the `amendments` array can be used to look up information in the `versionedRelease` object or `releases` array, to see where changes are explained by an amendment `rationale`. - ### Example 2: Contract amendment This example shows an update to the value and scope of a contract. From 4618ed4f0e1d7c52260cb4d33acb5cc4f1eb5253 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 28 Feb 2024 16:37:43 +1300 Subject: [PATCH 24/40] docs/guidance/map/amendments.md: Add paragraph breaks --- docs/guidance/map/amendments.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/guidance/map/amendments.md b/docs/guidance/map/amendments.md index 0fbc2de32..4cded05cd 100644 --- a/docs/guidance/map/amendments.md +++ b/docs/guidance/map/amendments.md @@ -38,7 +38,9 @@ A buyer publishes a tender for the purchase of office supplies. #### Tender update release -The buyer adds a main procurement category to the tender. The new information is not a formal amendment to the tender so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. The publisher chooses to repeat fields whose values are unchanged from the previous release. Such fields can be omitted when a publication provides access to historic releases. +The buyer adds a main procurement category to the tender. The new information is not a formal amendment to the tender so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. + +The publisher chooses to repeat fields whose values are unchanged from the previous release. Such fields can be omitted when a publication provides access to historic releases. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/1 @@ -48,7 +50,9 @@ The buyer adds a main procurement category to the tender. The new information is #### Tender amendment release -The buyer increases the estimated value of the tender. This change is a formal amendment to the tender so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. Note that `tender.amendments` does not include the changed values. Rather, the `tender.value.amount` field itself is updated. +The buyer increases the estimated value of the tender. This change is a formal amendment to the tender so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. + +Note that `tender.amendments` does not include the changed values. Rather, the `tender.value.amount` field itself is updated. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/2 @@ -58,7 +62,9 @@ The buyer increases the estimated value of the tender. This change is a formal a #### Record -`releases` contains the above releases, `compiledRelease` contains the latest value of each field and, `versionedRelease` contains a history of changes to each field. The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to identify what changed. +`releases` contains the above releases, `compiledRelease` contains the latest value of each field and, `versionedRelease` contains a history of changes to each field. + +The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to identify what changed. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0 From 5b26351371de42c585c2fbe41a208ba7b89393ed Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 28 Feb 2024 16:43:34 +1300 Subject: [PATCH 25/40] docs/examples/amendments/tender.json: Reindent --- docs/examples/amendments/tender.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples/amendments/tender.json b/docs/examples/amendments/tender.json index 8ffc05e07..c30cae455 100644 --- a/docs/examples/amendments/tender.json +++ b/docs/examples/amendments/tender.json @@ -88,7 +88,7 @@ "releaseID": "3" } ] - } + } }, "versionedRelease": { "ocid": "ocds-213czf-000-00002", From fe30b27aa5b741dfb2855ce0201d3a646e76c7a8 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 29 Feb 2024 11:54:49 +1300 Subject: [PATCH 26/40] docs/guidance/map/amendments.md: Copy edits --- docs/guidance/map/amendments.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/guidance/map/amendments.md b/docs/guidance/map/amendments.md index 4cded05cd..76ab82432 100644 --- a/docs/guidance/map/amendments.md +++ b/docs/guidance/map/amendments.md @@ -4,31 +4,31 @@ # Updates and amendments -Information about a contracting (or planning) process will often change over time. +Information about a contracting (or planning) process often changes over time. -Each time information changes, a new OCDS release ought to be published. The new release can contain information that was previously published, in addition to the new information. +Each time information changes, a new OCDS release ought to be published. The new release can repeat information that was previously published, in addition to new and changed information. -There are three kinds of changes: +There are three types of change: * **New information**. For example, when information about the award of a contract is first released. -* **Updates to existing information**. For example, to correct errors in earlier releases, or to make minor adjustments to titles, descriptions or date. -* **Amendments**. For example, when the value or duration of a contract is changed. The term amendment often has a specific legal meaning for a publisher. Certain changes to a tender, award or contract might only be allowed as part of an amendment. +* **Updates to existing information**. For example, to correct errors in earlier releases, or to make minor adjustments to titles, descriptions or dates. +* **Amendments**. For example, when the value or duration of a contract is changed. The term amendment often has a specific legal meaning for a publisher. Certain changes to a tender, award or contract might only be permitted as part of an amendment. The nature of a change can be made explicit using: -* **The release tag** (`tag`). For example, for a release with a new contract, use 'contract'. For an update to the contract, use 'contractUpdate', and for an amendment to the contract, use 'contractAmendment'. +* **The release tag** field (`tag`), which is used to identify the type of change. For example, 'contract' identifies information about a new contract, 'contractUpdate' identifies an update to existing information about a contract, and 'contractAmendment' identifies a formal amendment to a contract. -* **The amendments** building block. This can contain an array of amendment explanations, and clearly identify the releases that contain before and after values. +* **The amendments** fields (`tender.amendments` and `contract.amendments`), which are used to list amendments along with their rationales and references to the releases that contain before and after values. ## Worked examples ### Example 1: Tender updates and amendments -This example illustrates how updates and amendments are modelled in OCDS. +This example illustrates how new information, updates and amendments are modelled in OCDS. #### Tender release -A buyer publishes a tender for the purchase of office supplies. +A buyer publishes an opportunity for the purchase of office supplies. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/0 @@ -38,7 +38,7 @@ A buyer publishes a tender for the purchase of office supplies. #### Tender update release -The buyer adds a main procurement category to the tender. The new information is not a formal amendment to the tender so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. +The buyer now indicates the opportunity's main procurement category. The new information is not a formal amendment so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. The publisher chooses to repeat fields whose values are unchanged from the previous release. Such fields can be omitted when a publication provides access to historic releases. @@ -50,7 +50,7 @@ The publisher chooses to repeat fields whose values are unchanged from the previ #### Tender amendment release -The buyer increases the estimated value of the tender. This change is a formal amendment to the tender so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. +The buyer increases the estimated value of the opportunity. This change is a formal amendment so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. Note that `tender.amendments` does not include the changed values. Rather, the `tender.value.amount` field itself is updated. @@ -62,7 +62,7 @@ Note that `tender.amendments` does not include the changed values. Rather, the ` #### Record -`releases` contains the above releases, `compiledRelease` contains the latest value of each field and, `versionedRelease` contains a history of changes to each field. +`releases` contains the above releases, `compiledRelease` contains the latest value of each field, and `versionedRelease` contains a history of changes to each field. The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to identify what changed. @@ -73,7 +73,7 @@ The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the co ``` ```{hint} -It is encouraged to [download](../../examples/amendments/tender.json) the record example and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. +[Download](../../examples/amendments/tender.json) the record example and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. ``` ### Example 2: Contract amendment From 9923faecb7c3c4c4a27baefd8d2ff93070a530b1 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 29 Feb 2024 16:50:08 +1300 Subject: [PATCH 27/40] docs/guidance/map/amendments.md: Remove contract example --- docs/examples/amendments/contract.json | 754 ------------------------- docs/guidance/map/amendments.md | 46 +- 2 files changed, 3 insertions(+), 797 deletions(-) delete mode 100644 docs/examples/amendments/contract.json diff --git a/docs/examples/amendments/contract.json b/docs/examples/amendments/contract.json deleted file mode 100644 index b4e476a73..000000000 --- a/docs/examples/amendments/contract.json +++ /dev/null @@ -1,754 +0,0 @@ -{ - "version": "1.1", - "records": [ - { - "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "releases": [ - { - "id": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "date": "2019-02-15T01:00:58Z", - "tag": [ - "contract" - ], - "contracts": [ - { - "status": "active", - "description": "Appliances for Tuvalu PPB Residence", - "title": "4501062723", - "items": [ - { - "id": "1", - "description": "Domestic coffee maker", - "quantity": 2, - "classification": { - "scheme": "UNSPSC", - "id": "52141526" - } - }, - { - "id": "2", - "description": "Domestic electrical kettle", - "quantity": 2, - "classification": { - "scheme": "UNSPSC", - "id": "52141523" - } - } - ], - "period": { - "startDate": "2018-11-30T01:00:00Z", - "endDate": "2019-12-30T01:00:00Z" - }, - "value": { - "currency": "AUD", - "amount": 750.0 - }, - "dateSigned": "2018-12-21T02:49:50Z", - "awardID": "CN3562241-12b0ab89ef79180a7289cb6c40c33c1f", - "id": "CN3562241" - } - ], - "parties": [ - { - "identifier": { - "scheme": "AU-ABN", - "id": "60010555549" - }, - "name": "NORSHIP MARINE", - "roles": [ - "supplier" - ], - "address": { - "postalCode": "4870", - "country": "AU", - "region": "QLD", - "locality": "PORTSMITH" - }, - "contactPoint": { - "email": "BMI.FINANCIALREPORTING@DEFENCE.GOV.AU", - "telephone": "00", - "name": "SP&I - International Policy" - }, - "id": "fb9c43bb01f873c72c730bdac5b0858f" - }, - { - "identifier": { - "scheme": "AU-ABN", - "id": "62950639680" - }, - "name": "Department of Defence", - "roles": [ - "buyer" - ], - "contactPoint": { - "email": "tenders@finance.gov.au" - }, - "id": "0ec9911c9e99d1b7bb1b77f4abffc583" - } - ] - }, - { - "id": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "date": "2019-02-17T00:00:00Z", - "tag": [ - "contractAmendment" - ], - "contracts": [ - { - "status": "active", - "amendments": [ - { - "id": "1", - "amendsReleaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "rationale": "After negotiations with the supplier, the scope of the contract has been increased to purchase an additional item.", - "date": "2019-02-16T12:00:00Z" - } - ], - "description": "Appliances for Tuvalu PPB Residence", - "title": "4501062723", - "items": [ - { - "id": "3", - "description": "Domestic microwave oven", - "quantity": 1, - "classification": { - "scheme": "UNSPSC", - "id": "52141502" - } - } - ], - "period": { - "startDate": "2018-11-30T01:00:00Z", - "endDate": "2019-12-30T01:00:00Z" - }, - "value": { - "currency": "AUD", - "amount": 1250.0 - }, - "dateSigned": "2018-12-21T02:49:50Z", - "awardID": "CN3562241-12b0ab89ef79180a7289cb6c40c33c1f", - "id": "CN3562241" - } - ], - "parties": [ - { - "identifier": { - "scheme": "AU-ABN", - "id": "60010555549" - }, - "name": "NORSHIP MARINE", - "roles": [ - "supplier" - ], - "address": { - "postalCode": "4870", - "country": "AU", - "region": "QLD", - "locality": "PORTSMITH" - }, - "contactPoint": { - "email": "BMI.FINANCIALREPORTING@DEFENCE.GOV.AU", - "telephone": "00", - "name": "SP&I - International Policy" - }, - "id": "fb9c43bb01f873c72c730bdac5b0858f" - }, - { - "identifier": { - "scheme": "AU-ABN", - "id": "62950639680" - }, - "name": "Department of Defence", - "roles": [ - "buyer" - ], - "contactPoint": { - "email": "tenders@finance.gov.au" - }, - "id": "0ec9911c9e99d1b7bb1b77f4abffc583" - } - ] - } - ], - "compiledRelease": { - "tag": [ - "compiled" - ], - "id": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2019-02-17T00:00:00Z", - "date": "2019-02-17T00:00:00Z", - "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "contracts": [ - { - "id": "CN3562241", - "status": "active", - "description": "Appliances for Tuvalu PPB Residence", - "title": "4501062723", - "items": [ - { - "id": "1", - "description": "Domestic coffee maker", - "quantity": 2, - "classification": { - "scheme": "UNSPSC", - "id": "52141526" - } - }, - { - "id": "2", - "description": "Domestic electrical kettle", - "quantity": 2, - "classification": { - "scheme": "UNSPSC", - "id": "52141523" - } - }, - { - "id": "3", - "description": "Domestic microwave oven", - "quantity": 1, - "classification": { - "scheme": "UNSPSC", - "id": "52141502" - } - } - ], - "period": { - "startDate": "2018-11-30T01:00:00Z", - "endDate": "2019-12-30T01:00:00Z" - }, - "value": { - "currency": "AUD", - "amount": 1250.0 - }, - "dateSigned": "2018-12-21T02:49:50Z", - "awardID": "CN3562241-12b0ab89ef79180a7289cb6c40c33c1f", - "amendments": [ - { - "id": "1", - "amendsReleaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "rationale": "Increased scope of goods required.", - "date": "2019-02-16T12:00:00Z" - } - ] - } - ], - "parties": [ - { - "id": "fb9c43bb01f873c72c730bdac5b0858f", - "identifier": { - "scheme": "AU-ABN", - "id": "60010555549" - }, - "name": "NORSHIP MARINE", - "roles": [ - "supplier" - ], - "address": { - "postalCode": "4870", - "country": "AU", - "region": "QLD", - "locality": "PORTSMITH" - }, - "contactPoint": { - "email": "BMI.FINANCIALREPORTING@DEFENCE.GOV.AU", - "telephone": "00", - "name": "SP&I - International Policy" - } - }, - { - "id": "0ec9911c9e99d1b7bb1b77f4abffc583", - "identifier": { - "scheme": "AU-ABN", - "id": "62950639680" - }, - "name": "Department of Defence", - "roles": [ - "buyer" - ], - "contactPoint": { - "email": "tenders@finance.gov.au" - } - } - ] - }, - "versionedRelease": { - "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "contracts": [ - { - "id": "CN3562241", - "status": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], - "description": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "Appliances for Tuvalu PPB Residence" - } - ], - "title": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "4501062723" - } - ], - "items": [ - { - "id": "1", - "description": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "Domestic coffee maker" - } - ], - "quantity": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": 2 - } - ], - "classification": { - "scheme": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "UNSPSC" - } - ], - "id": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "52141526" - } - ] - } - }, - { - "id": "2", - "description": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "Domestic electrical kettle" - } - ], - "quantity": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": 2 - } - ], - "classification": { - "scheme": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "UNSPSC" - } - ], - "id": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "52141523" - } - ] - } - }, - { - "id": "3", - "description": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "Domestic microwave oven" - } - ], - "quantity": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": 1 - } - ], - "classification": { - "scheme": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "UNSPSC" - } - ], - "id": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "52141502" - } - ] - } - } - ], - "period": { - "startDate": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "2018-11-30T01:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "2019-12-30T01:00:00Z" - } - ] - }, - "value": { - "currency": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "AUD" - } - ], - "amount": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": 750.0 - }, - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": 1250.0 - } - ] - }, - "dateSigned": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "2018-12-21T02:49:50Z" - } - ], - "awardID": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "CN3562241-12b0ab89ef79180a7289cb6c40c33c1f" - } - ], - "amendments": [ - { - "id": "1", - "amendsReleaseID": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24" - } - ], - "releaseID": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5" - } - ], - "rationale": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "Increased scope of goods required." - } - ], - "date": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2000b475e7c23fcda74fcae13275e6c5", - "releaseDate": "2019-02-17T00:00:00Z", - "releaseTag": [ - "contractAmendment" - ], - "value": "2019-02-16T12:00:00Z" - } - ] - } - ] - } - ], - "parties": [ - { - "id": "fb9c43bb01f873c72c730bdac5b0858f", - "identifier": { - "scheme": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "AU-ABN" - } - ], - "id": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "60010555549" - } - ] - }, - "name": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "NORSHIP MARINE" - } - ], - "roles": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": [ - "supplier" - ] - } - ], - "address": { - "postalCode": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "4870" - } - ], - "country": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "AU" - } - ], - "region": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "QLD" - } - ], - "locality": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "PORTSMITH" - } - ] - }, - "contactPoint": { - "email": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "BMI.FINANCIALREPORTING@DEFENCE.GOV.AU" - } - ], - "telephone": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "00" - } - ], - "name": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "SP&I - International Policy" - } - ] - } - }, - { - "id": "0ec9911c9e99d1b7bb1b77f4abffc583", - "identifier": { - "scheme": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "AU-ABN" - } - ], - "id": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "62950639680" - } - ] - }, - "name": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "Department of Defence" - } - ], - "roles": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": [ - "buyer" - ] - } - ], - "contactPoint": { - "email": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "tenders@finance.gov.au" - } - ] - } - } - ] - } - } - ] -} diff --git a/docs/guidance/map/amendments.md b/docs/guidance/map/amendments.md index 76ab82432..9d6bd8e64 100644 --- a/docs/guidance/map/amendments.md +++ b/docs/guidance/map/amendments.md @@ -76,51 +76,11 @@ The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the co [Download](../../examples/amendments/tender.json) the record example and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. ``` -### Example 2: Contract amendment - -This example shows an update to the value and scope of a contract. - -#### Contract - -A contract signature notice is published for the purchase of domestic appliances. The publisher builds a release and uses the 'contract' `tag`. - -See the JSON release below. - -```{jsoninclude} ../../examples/amendments/contract.json -:jsonpointer: /records/0/releases/0 -:expand: tag, contracts, items -:title: Contract -``` - -#### Contract Amendment - -A few days after the contract release, its scope is increased to include the purchase of one additional appliance. A new 'contractAmendment' release is built, where a single item is added in the `contracts/items` block and the value of the contract is increased. A `amendments` block is included to explain the rationale of the changes. - -See the example release below. - -```{jsoninclude} ../../examples/amendments/contract.json -:jsonpointer: /records/0/releases/1 -:expand: tag, contracts, items, amendments -:title: ContractAmendment -``` - -Note that amendments can cover more than values or duration. Also, note that the publisher chose to not repeat the contract items, but add a new one with a new ID value. - -In certain scenarios there might not be a valid `amendsReleaseID` and so it can be omitted, e.g. when historical data is being published in a single release. - -#### Record - -An example record for the whole process is shown below. Consider downloading the [record example](../../examples/amendments/contract.json) and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. - -Note that the `compiledRelease` contains all the items, included the latest one added in the contract amendment. - -```{jsoninclude} ../../examples/amendments/contract.json -:jsonpointer: -:expand: records, releases -:title: Record +```{admonition} Contract updates and amendments +Contract updates and amendments are modelled in the same way: the 'contract', 'contractUpdate' and 'contractAmendment' release tags distinguish the type of change and amendments are listed in the `contract.amendments` field. ``` -### Example 3: Amendments in a Easy Releases scenario +### Example 2: Amendments in a Easy Releases scenario The [Easy releases guidance](../build/easy_releases) explains how to publish releases without storing or publishing a full change history. Depending on the source system, it might still be possible to publish a history of amendments when using this model. From 5d99ef612cd8a369815b62a730e16151fd8a6d71 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 15:53:22 +1300 Subject: [PATCH 28/40] docs/schema/merging.md: Update example --- docs/schema/merging.md | 47 +++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/docs/schema/merging.md b/docs/schema/merging.md index 4ec51dfc1..f8d342d0b 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -43,49 +43,36 @@ To convert a field's value in a release to a **versioned value**, you must: A **versioned value** thus describes a field's value in a specific release. -For example, in worked example 1 in [Updates and deletions](../guidance/build/merging), the method by which the procurement is taking place is stated as limited (in the first release `tender/procurementMethod` was `limited`). In the initial release this looks like: +For example, a tender release sets the value of `tender.value.amount`. -```{jsoninclude} ../examples/merging/updates/ghana_tender1.json -:jsonpointer: /releases/0/tender -:include_only: procurementMethod -:expand: procurementMethod -:title: Value +```{jsoninclude} ../examples/amendments/tender.json +:jsonpointer: /records/0/releases/0 +:expand: tag, tender, value ``` -Following the steps above, the versioned value is: +Following the steps above, the versioned value of `tender.value.amount` is: -```{jsoninclude} ../examples/merging/updates/ghana_versioned.json -:jsonpointer: /records/0/versionedRelease/tender -:include_only: procurementMethod -:expand: procurementMethod -:title: Versioned_values +```{jsoninclude} ../examples/amendments/tender.json +:jsonpointer: /records/0/versionedRelease/tender/value/amount/0 +:expand: releaseTag ``` In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -For example, in the worked example referenced above, the value of the tender was $13,000 in the release published October 21, 2020 and then $12,000 in the release published November 5, 2020. +Following on from the example above, a later release updates the value of `tender.value.amount`. -```{jsoninclude} ../examples/merging/updates/ghana_tender1.json -:jsonpointer: /releases/0/tender -:include_only: tender/value -:expand: value -:title: initial_value +```{jsoninclude} ../examples/amendments/tender.json +:jsonpointer: /records/0/releases/2 +:expand: tag, tender, value ``` -```{jsoninclude} ../examples/merging/updates/ghana_tender2.json -:jsonpointer: /releases/0/tender -:include_only: tender/value -:expand: value -:title: updated_value -``` +In the versioned release, `tender.value.amount` is replaced with an array of versioned values: + +```{jsoninclude} ../examples/amendments/tender.json +:jsonpointer: /records/0/versionedRelease/tender/value +:expand: amount, releaseTag -In a versioned release, this is serialized as below: -```{jsoninclude} ../examples/merging/updates/ghana_versioned.json -:jsonpointer: /records/0/versionedRelease/tender -:include_only: tender/value -:expand: value,amount,releaseTag -:title: Versioned_values ``` The structure of the versioned release is described by the [versioned release schema](../../build/current_lang/versioned-release-validation-schema.json); note that the `ocid` field's value is not versioned. From a3c727f564ad214fc70ca1725588226ae648a6d5 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 15:55:15 +1300 Subject: [PATCH 29/40] docs/examples/merging/updates: Remove unused examples --- .../merging/updates/ghana_tender1.json | 44 --- .../merging/updates/ghana_tender2.json | 43 --- .../merging/updates/ghana_tender3.json | 25 -- .../merging/updates/ghana_versioned.json | 362 ------------------ 4 files changed, 474 deletions(-) delete mode 100644 docs/examples/merging/updates/ghana_tender1.json delete mode 100644 docs/examples/merging/updates/ghana_tender2.json delete mode 100644 docs/examples/merging/updates/ghana_tender3.json delete mode 100644 docs/examples/merging/updates/ghana_versioned.json diff --git a/docs/examples/merging/updates/ghana_tender1.json b/docs/examples/merging/updates/ghana_tender1.json deleted file mode 100644 index 8b5e93cd6..000000000 --- a/docs/examples/merging/updates/ghana_tender1.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": "1.1", - "publishedDate": "2020-10-21T13:02:26Z", - "publisher": { - "name": "Public Procurement Authority", - "scheme": "GH-RGD", - "uid": "1234 ", - "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" - }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", - "releases": [ - { - "ocid": "ocds-uhveoc-000001", - "id": "ocds-uhveoc-000001-1601380494627-tender", - "date": "2020-10-21T13:02:26Z", - "tag": [ - "tender" - ], - "initiationType": "tender", - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - } - ], - "tender": { - "id": "000001", - "title": "Toners", - "description": "The E.O.C.O is requesting quotations for the supply of toners.", - "status": "active", - "value": { - "amount": 13000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "procurementMethod": "limited" - } - } - ] -} diff --git a/docs/examples/merging/updates/ghana_tender2.json b/docs/examples/merging/updates/ghana_tender2.json deleted file mode 100644 index 21f6a1afc..000000000 --- a/docs/examples/merging/updates/ghana_tender2.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "1.1", - "publishedDate": "2020-11-05T14:36:54Z", - "publisher": { - "name": "Public Procurement Authority", - "scheme": "GH-RGD", - "uid": "1234 ", - "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" - }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", - "releases": [ - { - "id": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-000001", - "date": "2020-11-05T14:36:54Z", - "tag": [ - "tenderUpdate" - ], - "parties": [ - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] - } - ], - "tender": { - "id": "000001", - "value": { - "amount": 12000, - "currency": "GHS" - }, - "tenderers": [ - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ] - } - } - ] -} diff --git a/docs/examples/merging/updates/ghana_tender3.json b/docs/examples/merging/updates/ghana_tender3.json deleted file mode 100644 index d90bbdfe6..000000000 --- a/docs/examples/merging/updates/ghana_tender3.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.1", - "publishedDate": "2022-12-19T11:55:46Z", - "publisher": { - "name": "Public Procurement Authority", - "scheme": "GH-RGD", - "uid": "1234 ", - "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" - }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", - "releases": [ - { - "id": "ocds-uhveoc-000001-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-000001", - "date": "2022-12-19T11:55:46Z", - "tag": [ - "tenderCancellation" - ], - "tender": { - "id": "000001", - "status": "cancelled" - } - } - ] -} diff --git a/docs/examples/merging/updates/ghana_versioned.json b/docs/examples/merging/updates/ghana_versioned.json deleted file mode 100644 index dd73ccbee..000000000 --- a/docs/examples/merging/updates/ghana_versioned.json +++ /dev/null @@ -1,362 +0,0 @@ -{ - "version": "1.1", - "publishedDate": "2022-12-19T11:55:46Z", - "publisher": { - "name": "Public Procurement Authority", - "scheme": "GH-RGD", - "uid": "1234 ", - "uri": "https://egovonline.gegov.gov.gh/RGDPortalWeb/portal/RGDHome/eghana.portal" - }, - "uri": "https://www.ghaneps.gov.gh/ocds/services/releasepackage/getfullreleasepackageforocid/ocds-uhveoc-000001", - "records": [ - { - "ocid": "ocds-uhveoc-000001", - "releases": [ - { - "ocid": "ocds-uhveoc-000001", - "id": "ocds-uhveoc-000001-1601380494627-tender", - "date": "2020-10-21T13:02:26Z", - "tag": [ - "tender" - ], - "initiationType": "tender", - "tender": { - "id": "000001", - "title": "Toners", - "description": "The E.O.C.O is requesting quotations for the supply of toners.", - "status": "active", - "value": { - "amount": 13000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "procurementMethod": "limited" - }, - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - } - ] - }, - { - "id": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "ocid": "ocds-uhveoc-000001", - "date": "2020-11-05T14:36:54Z", - "tag": [ - "tenderUpdate" - ], - "initiationType": "tender", - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] - } - ], - "tender": { - "id": "000001", - "title": "Toners", - "description": "The E.O.C.O is requesting quotations for the supply of toners.", - "status": "active", - "value": { - "amount": 12000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "procurementMethod": "limited", - "tenderers": [ - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ] - } - }, - { - "id": "ocds-uhveoc-000001-1668517276492-tenderCancellation", - "ocid": "ocds-uhveoc-000001", - "date": "2022-12-19T11:55:46Z", - "tag": [ - "tenderCancellation" - ], - "initiationType": "tender", - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] - } - ], - "tender": { - "id": "000001", - "title": "Toners", - "description": "The E.O.C.O is requesting quotations for the supply of toners.", - "status": "cancelled", - "value": { - "amount": 12000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "procurementMethod": "limited", - "tenderers": [ - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ] - } - } - ], - "compiledRelease": { - "id": "compiled", - "ocid": "ocds-uhveoc-000001", - "date": "2022-12-20T01:01:12Z", - "tag": [ - "compiled" - ], - "initiationType": "tender", - "parties": [ - { - "name": "ECONOMIC AND ORGANISED CRIME OFFICE", - "id": "14957", - "roles": [ - "buyer", - "procuringEntity" - ] - }, - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215", - "roles": [ - "tenderer" - ] - } - ], - "tender": { - "id": "000001", - "title": "Toners", - "description": "The E.O.C.O is requesting quotations for the supply of toners.", - "status": "cancelled", - "value": { - "amount": 13000, - "currency": "GHS" - }, - "mainProcurementCategory": "goods", - "procurementMethod": "limited", - "tenderers": [ - { - "name": "NEXT IT AND COMPUTER ENGINEERING LIMITED", - "id": "1215" - } - ] - } - }, - "versionedRelease": { - "ocid": "ocds-uhveoc-000001", - "initiationType": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "tender" - } - ], - "parties": [ - { - "name": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "ECONOMIC AND ORGANISED CRIME OFFICE" - } - ], - "id": "14957", - "roles": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": [ - "buyer", - "procuringEntity" - ] - } - ] - }, - { - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" - } - ], - "id": "1215", - "roles": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "value": [ - "tenderer" - ] - } - ] - } - ], - "tender": { - "id": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "000001" - } - ], - "title": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "Toners" - } - ], - "description": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "The E.O.C.O is requesting quotations for the supply of toners." - } - ], - "status": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "active" - }, - { - "releaseTag": [ - "tenderCancellation" - ], - "releaseDate": "2022-12-19T11:55:46Z", - "releaseID": "ocds-uhveoc-000001-1668517276492-tenderCancellation", - "value": "cancelled" - } - ], - "value": { - "amount": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": 13000 - }, - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "value": 12000 - } - ], - "currency": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "GHS" - } - ] - }, - "mainProcurementCategory": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "goods" - } - ], - "procurementMethod": [ - { - "releaseTag": [ - "tender" - ], - "releaseDate": "2020-10-21T13:02:26Z", - "releaseID": "ocds-uhveoc-000001-1601380494627-tender", - "value": "limited" - } - ], - "tenderers": [ - { - "name": [ - { - "releaseTag": [ - "tenderUpdate" - ], - "releaseDate": "2020-11-05T14:36:54Z", - "releaseID": "ocds-uhveoc-000001-1601380494630-tenderUpdate", - "value": "NEXT IT AND COMPUTER ENGINEERING LIMITED" - } - ], - "id": "1215" - } - ] - } - } - } - ] -} From a14cace463f792acdc8d042a278f09b66418bfbf Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 15:56:54 +1300 Subject: [PATCH 30/40] docs/examples/buyers_suppliers/consortia.json: Indent --- docs/examples/buyers_suppliers/consortia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/buyers_suppliers/consortia.json b/docs/examples/buyers_suppliers/consortia.json index 04bca72a3..5563a0a96 100644 --- a/docs/examples/buyers_suppliers/consortia.json +++ b/docs/examples/buyers_suppliers/consortia.json @@ -14,7 +14,7 @@ "name": "SIEMENS PUBLIC LIMITED COMPANY" }, { - "id":"GB-COH-1624297", + "id": "GB-COH-1624297", "name": "MICROSOFT LIMITED" } ] @@ -31,7 +31,7 @@ } }, { - "id":"GB-COH-1624297", + "id": "GB-COH-1624297", "name": "MICROSOFT LIMITED", "identifier": { "id": "624297", From 557563766a579d888b5b66e6931c196544a07173 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Mon, 4 Mar 2024 16:08:29 +1300 Subject: [PATCH 31/40] tests/test_docs.py: Remove unneeded test --- tests/test_docs.py | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 tests/test_docs.py diff --git a/tests/test_docs.py b/tests/test_docs.py deleted file mode 100644 index e1c7d9e29..000000000 --- a/tests/test_docs.py +++ /dev/null @@ -1,23 +0,0 @@ -import pytest -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import Select - -from . import languages - - -@pytest.mark.parametrize('lang', list(languages)) -# This seems to be an issue in Selenium and/or ChromeDriver. -@pytest.mark.filterwarnings("ignore:unclosed Date: Tue, 26 Mar 2024 23:50:11 -0400 Subject: [PATCH 32/40] examples: Fix filenames in readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 38b19d6dc..8afd14d22 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ cat docs/examples/merging/updates/{tender*,award*}.json | ocdskit --pretty compi ``` ```shell -cat docs/examples/merging/deletions/field-tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json --published-date 2013-07-30T09:00:10.000Z > docs/examples/merging/deletions/field-record.json -cat docs/examples/merging/deletions/object-tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json > docs/examples/merging/deletions/object-record.json -cat docs/examples/merging/deletions/array_award*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json > docs/examples/merging/deletions/array-record.json +cat docs/examples/merging/deletions/field_tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json --published-date 2013-07-30T09:00:10.000Z > docs/examples/merging/deletions/field_record.json +cat docs/examples/merging/deletions/object_tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json > docs/examples/merging/deletions/object_record.json +cat docs/examples/merging/deletions/array_award*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json > docs/examples/merging/deletions/array_record.json ``` Update the examples in `docs/examples/change_history`: From fca40c7e28bc37399bbe3ad687ac626b5806eb65 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:04:44 -0400 Subject: [PATCH 33/40] docs: Fix command in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8afd14d22..d531566c8 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ cat docs/examples/merging/deletions/array_award*.json | ocdskit --pretty compile Update the examples in `docs/examples/change_history`: ```shell -cat docs/examples/change_history/{tender}.json | ocdskit --pretty compile --published-date 2010-03-15T09:30:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json --package --versioned --schema schema/release-schema.json > docs/examples/change_history/records/tender.json +cat docs/examples/change_history/tender.json | ocdskit --pretty compile --published-date 2010-03-15T09:30:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json --package --versioned --schema schema/release-schema.json > docs/examples/change_history/records/tender.json cat docs/examples/change_history/{tender,tenderUpdate}.json | ocdskit --pretty compile --published-date 2010-03-20T09:45:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json --package --versioned --schema schema/release-schema.json > docs/examples/change_history/records/tenderUpdate.json cat docs/examples/change_history/{tender,tenderUpdate,award}.json | ocdskit --pretty compile --published-date 2010-05-10T09:30:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json --package --versioned --schema schema/release-schema.json > docs/examples/change_history/records/award.json cat docs/examples/change_history/{tender,tenderUpdate,award,contract}.json | ocdskit --pretty compile --published-date 2010-06-10T10:30:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json --package --versioned --schema schema/release-schema.json > docs/examples/change_history/records/contract.json From bd3b4a55259bf4254c8be8062b82439c3e595cc8 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 10:46:21 +1300 Subject: [PATCH 34/40] docs/guidance/build/merging.md: Update heading --- docs/guidance/build/merging.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 14f96c000..3896e59a0 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -70,7 +70,7 @@ The final record is shown below. Note that the fields in the `contractPeriod` bl :title: record ``` -## Example 3: Deletion of array items +## Deletion of array items The public procurement authority in Zambia publishes an award notice, as well as an OCDS release with an 'award' tag. A NGO collects the individual releases published by the procurement authority on a weekly basis to merge into their own records, which they use to display information on their website. From 4af6cce759041bcf4d631c3c61fa3f5f80cece20 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 10:47:58 +1300 Subject: [PATCH 35/40] Apply suggestions from code review Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- docs/guidance/build/merging.md | 2 +- docs/guidance/map/amendments.md | 16 +++++++++------- docs/guidance/map/buyers_suppliers.md | 5 +---- docs/primer/how.md | 2 +- docs/schema/merging.md | 8 ++++---- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/docs/guidance/build/merging.md b/docs/guidance/build/merging.md index 3896e59a0..b6bcdda98 100644 --- a/docs/guidance/build/merging.md +++ b/docs/guidance/build/merging.md @@ -14,7 +14,7 @@ The following examples show how updates and deletions are reflected in compiled The [tender updates and amendments example](../map/amendments.md) illustrates how releases are used to update field values and how updates are reflected in compiled and versioned releases. -## Deletions +## Deletion of fields and objects ### Fields diff --git a/docs/guidance/map/amendments.md b/docs/guidance/map/amendments.md index 9d6bd8e64..877afd456 100644 --- a/docs/guidance/map/amendments.md +++ b/docs/guidance/map/amendments.md @@ -8,7 +8,7 @@ Information about a contracting (or planning) process often changes over time. Each time information changes, a new OCDS release ought to be published. The new release can repeat information that was previously published, in addition to new and changed information. -There are three types of change: +There are three types of changes: * **New information**. For example, when information about the award of a contract is first released. * **Updates to existing information**. For example, to correct errors in earlier releases, or to make minor adjustments to titles, descriptions or dates. @@ -18,7 +18,7 @@ The nature of a change can be made explicit using: * **The release tag** field (`tag`), which is used to identify the type of change. For example, 'contract' identifies information about a new contract, 'contractUpdate' identifies an update to existing information about a contract, and 'contractAmendment' identifies a formal amendment to a contract. -* **The amendments** fields (`tender.amendments` and `contract.amendments`), which are used to list amendments along with their rationales and references to the releases that contain before and after values. +* **The amendments** fields (`tender.amendments`, `awards.amendments` and `contracts.amendments`), which are used to list amendments along with their rationales and references to the releases that contain "before" and "after" values. ## Worked examples @@ -38,9 +38,11 @@ A buyer publishes an opportunity for the purchase of office supplies. #### Tender update release -The buyer now indicates the opportunity's main procurement category. The new information is not a formal amendment so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. +The buyer now indicates the opportunity's main procurement category. The new information is not a formal amendment, so the publisher uses the 'tenderUpdate' tag and omits the `tender.amendments` field. +```{note} The publisher chooses to repeat fields whose values are unchanged from the previous release. Such fields can be omitted when a publication provides access to historic releases. +``` ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0/releases/1 @@ -50,7 +52,7 @@ The publisher chooses to repeat fields whose values are unchanged from the previ #### Tender amendment release -The buyer increases the estimated value of the opportunity. This change is a formal amendment so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. +The buyer increases the estimated value of the opportunity. This change is a formal amendment, so the publisher uses the 'tenderAmendment' tag and populates the `tender.amendments` field. Note that `tender.amendments` does not include the changed values. Rather, the `tender.value.amount` field itself is updated. @@ -64,7 +66,7 @@ Note that `tender.amendments` does not include the changed values. Rather, the ` `releases` contains the above releases, `compiledRelease` contains the latest value of each field, and `versionedRelease` contains a history of changes to each field. -The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to identify what changed. +The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the compiled release can be looked up in `releases` and `versionedRelease` to determine what changed. ```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: /records/0 @@ -76,8 +78,8 @@ The `releaseID` and `amendsReleaseID` fields in the `amendments` array of the co [Download](../../examples/amendments/tender.json) the record example and use the [Data Review Tool](https://review.standard.open-contracting.org/) to explore the changes in the contracting process. ``` -```{admonition} Contract updates and amendments -Contract updates and amendments are modelled in the same way: the 'contract', 'contractUpdate' and 'contractAmendment' release tags distinguish the type of change and amendments are listed in the `contract.amendments` field. +```{admonition} Award and contract updates and amendments +Award and contract updates and amendments are modelled in the same way. The 'award', 'contract', 'awardUpdate', 'contractUpdate' and 'contractAmendment' release tags indicate the type of change. Amendments are listed in the `awards.amendments` and `contracts.amendments` fields. ``` ### Example 2: Amendments in a Easy Releases scenario diff --git a/docs/guidance/map/buyers_suppliers.md b/docs/guidance/map/buyers_suppliers.md index bea23a404..2e58a7920 100644 --- a/docs/guidance/map/buyers_suppliers.md +++ b/docs/guidance/map/buyers_suppliers.md @@ -42,10 +42,7 @@ Siemens and Microsoft bid as a consortium for a contract. The contract is awarded to the consortium; however, the legal entity for the consortium is not created until after the contract award. -Both Siemens and Microsoft are listed as suppliers on the contract award in OCDS, with `id`s constructed according to [`Organization.id`](../../schema/identifiers.md#organization-identifiers): - -```{field-description} ../../../build/current_lang/release-schema.json /definitions/Organization/properties/id -``` +Both Siemens and Microsoft are listed as suppliers on the contract award: ```{jsoninclude} ../../examples/buyers_suppliers/consortia.json :jsonpointer: /releases diff --git a/docs/primer/how.md b/docs/primer/how.md index 39e6c9b7d..403f6217d 100644 --- a/docs/primer/how.md +++ b/docs/primer/how.md @@ -113,7 +113,7 @@ In addition to the default format of JSON, you can convert and publish your OCDS While the OCDS schema is described using JSON Schema, OCDS data can be converted from its JSON format to tabular formats such as CSV files or spreadsheets. JSON is favored by developers because it uses human-readable text to exchange complex information, such as nested objects. It can contain large volumes of information and is particularly good at handling one-to-many relationships (such as multiple bids per tender notice). -Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheet applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats both so that more users’ needs can be satisfied. +Tabular formats, such as CSV (or comma separated values) are commonly used in spreadsheet applications and other analysis tools. Many people are comfortable working with spreadsheets using tools like Excel. While JSON is the default format, a good publication will publish tabular formats as well, so that more users’ needs can be satisfied. The following examples show the same data in JSON and tabular format: diff --git a/docs/schema/merging.md b/docs/schema/merging.md index f8d342d0b..dbab1e407 100644 --- a/docs/schema/merging.md +++ b/docs/schema/merging.md @@ -43,14 +43,14 @@ To convert a field's value in a release to a **versioned value**, you must: A **versioned value** thus describes a field's value in a specific release. -For example, a tender release sets the value of `tender.value.amount`. +For example, a tender release sets the `tender.value.amount`field: ```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0/releases/0 :expand: tag, tender, value ``` -Following the steps above, the versioned value of `tender.value.amount` is: +Following the steps above, the versioned value of the `tender.value.amount` field is: ```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0/versionedRelease/tender/value/amount/0 @@ -59,14 +59,14 @@ Following the steps above, the versioned value of `tender.value.amount` is: In a **versioned release**, with a few exceptions, a field's value is replaced with an array of versioned values, which should be in chronological order by `releaseDate`. -Following on from the example above, a later release updates the value of `tender.value.amount`. +Following on from the example above, a later release updates the value of the `tender.value.amount` field: ```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0/releases/2 :expand: tag, tender, value ``` -In the versioned release, `tender.value.amount` is replaced with an array of versioned values: +In the versioned release, the `tender.value.amount` field is an array, that now contains another versioned value: ```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0/versionedRelease/tender/value From fa9161ae56e8b2e2d0b381d82b1b960b9b9cd484 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 11:12:39 +1300 Subject: [PATCH 36/40] docs/examples: Remove unused --- README.md | 1 - .../change_history/tenderAmendment.json | 149 ------------------ docs/examples/merging/updates/merged.json | 122 -------------- .../organizations/consortia_simple.json | 18 --- 4 files changed, 290 deletions(-) delete mode 100644 docs/examples/change_history/tenderAmendment.json delete mode 100644 docs/examples/merging/updates/merged.json delete mode 100644 docs/examples/organizations/consortia_simple.json diff --git a/README.md b/README.md index d531566c8..5b4e066e5 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ Install [OCDS Kit](https://pypi.org/project/ocdskit/) Update the examples in `docs/examples/merging`: ```shell -cat docs/examples/merging/updates/{tender*,award*}.json | ocdskit --pretty compile --published-date 2016-03-05T13:02:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002-merge.json --package --linked-releases > docs/examples/merging/updates/merged.json cat docs/examples/merging/updates/{tender*,award*}.json | ocdskit --pretty compile --published-date 2016-03-05T13:02:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002-merge.json --package --linked-releases --versioned > docs/examples/merging/updates/versioned.json ``` diff --git a/docs/examples/change_history/tenderAmendment.json b/docs/examples/change_history/tenderAmendment.json deleted file mode 100644 index 21fffdb9b..000000000 --- a/docs/examples/change_history/tenderAmendment.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "version": "1.1", - "extensions": [], - "releases": [ - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-03-tenderAmendment", - "date": "2010-03-20T10:45:00Z", - "tag": [ - "tenderAmendment" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "procuringEntity", - "buyer" - ], - "id": "GB-LAC-E09000003" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "tender": { - "id": "ocds-213czf-000-00001-01-tender", - "title": "Planned cycle lane improvements", - "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 120000, - "currency": "GBP" - } - } - } - ], - "minValue": { - "amount": 600000, - "currency": "GBP" - }, - "value": { - "amount": 1210000, - "currency": "GBP" - }, - "procurementMethod": "open", - "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.", - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", - "enquiryPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2010-03-14T17:30:00Z" - }, - "hasEnquiries": true, - "tenderPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2011-04-01T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2010-06-01T00:00:00Z", - "endDate": "2011-08-01T23:59:59Z" - }, - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "documents": [ - { - "id": "0005", - "documentType": "notice", - "title": "Tender Notice", - "description": "Official tender notice.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-01T09:00:00Z", - "format": "text/html" - }, - { - "id": "0006", - "documentType": "enquiryResponses", - "title": "Enquiry Responses", - "description": "Responses to enquiries asked by interested parties.", - "url": "http://example.com/enquiry-response/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-20T11:30:15Z", - "format": "text/html" - } - ], - "amendments": [ - { - "id": "update-1", - "date": "2010-03-20T09:45:00Z", - "rationale": "Update following enquiries.", - "description": "Following the enquiry period, enquiries were received and responses to questions asked have been published. No changes to the overall tender details were made.", - "amendsReleaseID": "ocds-213czf-000-00001-02-tender", - "releaseID": "ocds-213czf-000-00001-03-tenderUpdate" - }, - { - "id": "amendment-1", - "date": "2010-03-20T10:45:00Z", - "rationale": "Revised value", - "description": "Following the enquiry period, a decision was made to increase the maximum value by 10%.", - "amendsReleaseID": "ocds-213czf-000-00001-03-tenderUpdate", - "releaseID": "ocds-213czf-000-00001-03-tenderAmendment" - } - ] - } - } - ] -} diff --git a/docs/examples/merging/updates/merged.json b/docs/examples/merging/updates/merged.json deleted file mode 100644 index 137b58cd0..000000000 --- a/docs/examples/merging/updates/merged.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "version": "1.1", - "records": [ - { - "ocid": "ocds-213czf-000-00002", - "releases": [ - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json#ocds-213czf-000-00002-01-award1", - "date": "2016-03-01T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json#ocds-213czf-000-00002-01-award2", - "date": "2016-03-03T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json#ocds-213czf-000-00002-01-tender", - "date": "2016-01-01T09:30:00Z", - "tag": [ - "tender" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json#ocds-213czf-000-00002-01-tender-update", - "date": "2016-01-31T09:30:00Z", - "tag": [ - "tenderUpdate" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json#ocds-213czf-000-00002-01-tender-amendment", - "date": "2016-02-05T10:30:00Z", - "tag": [ - "tenderAmendment" - ] - } - ], - "compiledRelease": { - "tag": [ - "compiled" - ], - "id": "ocds-213czf-000-00002-2016-03-03T09:30:00Z", - "date": "2016-03-03T09:30:00Z", - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ] - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { - "amount": 2000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, - "amendments": [ - { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "date": "2016-03-01T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - }, - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "date": "2016-03-03T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - } - ] - } - } - ] -} diff --git a/docs/examples/organizations/consortia_simple.json b/docs/examples/organizations/consortia_simple.json deleted file mode 100644 index 85920d8a0..000000000 --- a/docs/examples/organizations/consortia_simple.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "awards": [ - { - "id": "DHSC-2019-A18074", - "title": "Medical imaging device development", - "suppliers": [ - { - "name": "SIEMENS PUBLIC LIMITED COMPANY", - "id": "GB-COH-727817" - }, - { - "name": "MICROSOFT LIMITED", - "id": "GB-COH-1624297" - } - ] - } - ] -} From e6a89cb8b29647739ad43aedcb884f356a5a7078 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 11:13:05 +1300 Subject: [PATCH 37/40] docs/schema: Update record and record package examples --- README.md | 4 - docs/examples/merging/embedded_releases.json | 1518 ----------------- docs/examples/merging/updates/versioned.json | 515 ------ .../record_reference/linked_releases.json | 31 + docs/schema/packaging/record_package.md | 2 +- docs/schema/records_reference.md | 10 +- 6 files changed, 37 insertions(+), 2043 deletions(-) delete mode 100644 docs/examples/merging/embedded_releases.json delete mode 100644 docs/examples/merging/updates/versioned.json create mode 100644 docs/examples/record_reference/linked_releases.json diff --git a/README.md b/README.md index 5b4e066e5..06022f178 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,6 @@ Install [OCDS Kit](https://pypi.org/project/ocdskit/) Update the examples in `docs/examples/merging`: -```shell -cat docs/examples/merging/updates/{tender*,award*}.json | ocdskit --pretty compile --published-date 2016-03-05T13:02:00Z --uri https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002-merge.json --package --linked-releases --versioned > docs/examples/merging/updates/versioned.json -``` - ```shell cat docs/examples/merging/deletions/field_tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json --published-date 2013-07-30T09:00:10.000Z > docs/examples/merging/deletions/field_record.json cat docs/examples/merging/deletions/object_tender*.json | ocdskit --pretty compile --package --versioned --schema schema/release-schema.json > docs/examples/merging/deletions/object_record.json diff --git a/docs/examples/merging/embedded_releases.json b/docs/examples/merging/embedded_releases.json deleted file mode 100644 index 474720b28..000000000 --- a/docs/examples/merging/embedded_releases.json +++ /dev/null @@ -1,1518 +0,0 @@ -{ - "extensions": [], - "records": [ - { - "compiledRelease": { - "awards": [ - { - "contractPeriod": { - "endDate": "2011-08-01T23:59:00Z", - "startDate": "2010-07-01T00:00:00Z" - }, - "date": "2010-05-10T10:30:00Z", - "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "documents": [ - { - "datePublished": "2010-05-10T10:30:00Z", - "description": "Award of contract to build new cycle lanes in the centre of town to AnyCorp Ltd.", - "documentType": "notice", - "format": "text/html", - "id": "0007", - "title": "Award notice", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html" - } - ], - "id": "ocds-213czf-000-00001-award-01", - "items": [ - { - "additionalClassifications": [ - { - "description": "Cycle path construction work", - "id": "45233162-2", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "classification": { - "description": "Construction work for highways", - "id": "45233130", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "description": "string", - "id": "0001", - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "suppliers": [ - { - "id": "GB-COH-1234567844", - "name": "AnyCorp Cycle Provision" - } - ], - "title": "Award of contract to build new cycle lanes in the centre of town.", - "value": { - "amount": 11000000, - "currency": "GBP" - } - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "contracts": [ - { - "awardID": "ocds-213czf-000-00001-award-01", - "dateSigned": "2015-06-10T14:23:12Z", - "description": "Contract monitoring for cycle lane construction.", - "documents": [ - { - "datePublished": "2015-06-10T16:43:12Z", - "description": "The Signed Contract for Cycle Path Construction", - "documentType": "contractSigned", - "format": "application/pdf", - "id": "0008", - "title": "Signed Contract", - "url": "http://example.com/contracts/ocds-213czf-000-00001" - }, - { - "datePublished": "2010-12-15T15:34:02Z", - "description": "Physical progress report for cycle path construction", - "documentType": "physicalProcessReport", - "format": "application/pdf", - "id": "0009", - "title": "Progress report", - "url": "http://example.com/reports/ocds-213czf-000-00001/cycle-path-01.pdf" - } - ], - "id": "ocds-213czf-000-00001-contract-01", - "implementation": { - "transactions": [ - { - "date": "2010-08-01T00:00:00Z", - "id": "ocds-213czf-000-00001-1", - "payee": { - "id": "GB-COH-1234567844", - "name": "AnyCorp Ltd" - }, - "payer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "source": "https://openspending.org/uk-barnet-spending/", - "uri": "https://openspending.org/uk-barnet-spending/transaction/asd9235qaghvs1059620ywhgai", - "value": { - "amount": 500000, - "currency": "GBP" - } - }, - { - "date": "2010-10-01T00:00:00Z", - "id": "ocds-213czf-000-00001-2", - "payee": { - "id": "GB-COH-1234567844", - "name": "AnyCorp Ltd" - }, - "payer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "source": "https://openspending.org/uk-barnet-spending/", - "uri": "https://openspending.org/uk-barnet-spending/transaction/asd9235qaghvs105962as0012", - "value": { - "amount": 100000, - "currency": "GBP" - } - } - ] - }, - "items": [ - { - "additionalClassifications": [ - { - "description": "Cycle path construction work", - "id": "45233162-2", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "classification": { - "description": "Construction work for highways", - "id": "45233130", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "description": "string", - "id": "0001", - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "period": { - "endDate": "2011-08-01T23:59:00Z", - "startDate": "2010-07-01T00:00:00Z" - }, - "title": "Contract to build new cycle lanes in the centre of town.", - "value": { - "amount": 11000000, - "currency": "GBP" - } - } - ], - "date": "2011-01-10T09:30:00Z", - "id": "ocds-213czf-000-00001-06-implementation", - "ocid": "ocds-213czf-000-00001", - "parties": [ - { - "address": { - "country": "GB", - "locality": "London", - "postalCode": "N11 1NP", - "region": "London", - "streetAddress": "4, North London Business Park, Oakleigh Rd S" - }, - "contactPoint": { - "email": "procurement-team@example.com", - "faxNumber": "01234 345 345", - "name": "Procurement Team", - "telephone": "01234 345 346", - "url": "http://example.com/contact/" - }, - "id": "GB-LAC-E09000003", - "identifier": { - "id": "E09000003", - "legalName": "London Borough of Barnet", - "scheme": "GB-LAC", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "roles": [ - "buyer", - "buyer" - ] - }, - { - "additionalIdentifiers": [ - { - "id": "987654321", - "scheme": "GB-VAT" - } - ], - "address": { - "country": "GB", - "locality": "Anytown", - "postalCode": "AN1 1TN", - "region": "AnyCounty", - "streetAddress": "100 Anytown Lane" - }, - "contactPoint": { - "email": "contracts@anycorp.example", - "faxNumber": "12345 456 343", - "name": "Contracts Team", - "telephone": "12345 456 343" - }, - "id": "GB-COH-1234567844", - "identifier": { - "id": "1234567844", - "legalName": "AnyCorp Ltd", - "scheme": "GB-COH", - "uri": "http://www.anycorp.example" - }, - "name": "AnyCorp Cycle Provision", - "roles": [ - "supplier" - ] - } - ], - "planning": { - "budget": { - "amount": { - "amount": 6700000.0, - "currency": "GBP" - }, - "description": "Budget allocation for highway maintenance, aligned with 2015 strategic plan. ", - "id": "6801ad388f3a38b7740dde20108c58b35984ee91", - "project": "Central Junction Cycle Scheme", - "projectID": "SP001", - "source": "https://openspending.org/uk-barnet-budget/entries/6801ad388f3a38b7740dde20108c58b35984ee91", - "uri": "https://openspending.org/uk-barnet-budget/entries/6801ad388f3a38b7740dde20108c58b35984ee91" - }, - "documents": [ - { - "datePublished": "2009-01-05T00:00:00Z", - "description": "The overall strategic framework for procurement to enhance cycle provision.", - "documentType": "procurementPlan", - "format": "application/pdf", - "id": "0001", - "title": "Area Wide Cycle Improvements - Procurement Plan", - "url": "http://example.com/opencontracting/documents/planning/highways/procurementPlan.pdf" - }, - { - "datePublished": "2009-01-15T00:00:00Z", - "description": "Needs assessment for provision for cyclists in the centre of town.", - "documentType": "needsAssessment", - "format": "application/pdf", - "id": "0002", - "title": "Cycle provision - Needs Assessment", - "url": "http://example.com/opencontracting/documents/ocds-213czf-000-00001/needsAssessment.pdf" - } - ], - "rationale": "The 2009 Strategic Plan identifies a need for an improved cycle route in the centre of town." - }, - "tag": [ - "compiled" - ], - "tender": { - "amendments": [ - { - "amendsReleaseID": "ocds-213czf-000-00001-02-tender", - "date": "2010-03-20T09:45:00Z", - "description": "Following the enquiry period, enquiries were received and responses to questions asked have been published. No changes to the overall tender details were made.", - "id": "update-1", - "rationale": "Update following enquiries.", - "releaseID": "ocds-213czf-000-00001-03-tenderUpdate" - }, - { - "amendsReleaseID": "ocds-213czf-000-00001-02-tender", - "date": "2010-03-20T10:45:00Z", - "description": "Following the enquiry period, a decision was made to increase the maximum value by 10%.", - "id": "amendment-1", - "rationale": "Revised value", - "releaseID": "ocds-213czf-000-00001-03-tenderAmendment" - } - ], - "awardCriteria": "bestProposal", - "awardCriteriaDetails": "The best proposal, subject to value for money requirements, will be accepted.", - "awardPeriod": { - "endDate": "2011-08-01T23:59:59Z", - "startDate": "2010-06-01T00:00:00Z" - }, - "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "documents": [ - { - "dateModified": "2015-02-15T00:00:00Z", - "datePublished": "2015-02-15T00:00:00Z", - "description": "A consultation document inviting citizen input into cycle provision.", - "format": "text/html", - "id": "0003", - "title": "Consultation on cycle provision", - "url": "http://example.com/consultations/cycle-provision/" - }, - { - "datePublished": "2015-02-15T00:00:00Z", - "description": "A map showing areas affected by the planned highway updates. Available from local libraries.", - "format": "offline/print", - "id": "0004", - "title": "Map of affected areas" - }, - { - "datePublished": "2010-03-01T09:00:00Z", - "description": "Official tender notice.", - "documentType": "notice", - "format": "text/html", - "id": "0005", - "title": "Tender Notice", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html" - }, - { - "datePublished": "2010-03-20T11:30:15Z", - "description": "Responses to enquiries asked by interested parties.", - "documentType": "enquiryResponses", - "format": "text/html", - "id": "0006", - "title": "Enquiry Responses", - "url": "http://example.com/enquiry-response/ocds-213czf-000-00001-01.html" - } - ], - "enquiryPeriod": { - "endDate": "2010-03-14T17:30:00Z", - "startDate": "2010-03-01T09:00:00Z" - }, - "hasEnquiries": true, - "id": "ocds-213czf-000-00001-01-tender", - "items": [ - { - "additionalClassifications": [ - { - "description": "Cycle path construction work", - "id": "45233162-2", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "classification": { - "description": "Construction work for highways", - "id": "45233130", - "scheme": "CPV", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "description": "string", - "id": "0001", - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 120000, - "currency": "GBP" - } - } - } - ], - "milestones": [ - { - "description": "A consultation period is open for citizen input to shape the final plans.", - "dueDate": "2015-04-15T17:00:00Z", - "id": "0001", - "title": "Consultation Period" - } - ], - "minValue": { - "amount": 600000, - "currency": "GBP" - }, - "procurementMethod": "open", - "procurementMethodRationale": "An open competitive tender is required by EU Rules", - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", - "tenderPeriod": { - "endDate": "2011-04-01T18:00:00Z", - "startDate": "2010-03-01T09:00:00Z" - }, - "title": "Planned cycle lane improvements", - "value": { - "amount": 1210000, - "currency": "GBP" - } - } - }, - "ocid": "ocds-213czf-000-00001", - "releases": [ - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-01-planning", - "date": "2009-03-15T14:45:00Z", - "tag": [ - "planning" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "procuringEntity", - "buyer" - ], - "id": "GB-LAC-E09000003" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "planning": { - "budget": { - "source": "https://openspending.org/uk-barnet-budget/entries/6801ad388f3a38b7740dde20108c58b35984ee91", - "id": "6801ad388f3a38b7740dde20108c58b35984ee91", - "description": "Budget allocation for highway maintenance, aligned with 2015 strategic plan. ", - "amount": { - "amount": 6700000.0, - "currency": "GBP" - }, - "project": "Central Junction Cycle Scheme", - "projectID": "SP001", - "uri": "https://openspending.org/uk-barnet-budget/entries/6801ad388f3a38b7740dde20108c58b35984ee91" - }, - "rationale": "The 2009 Strategic Plan identifies a need for an improved cycle route in the centre of town.", - "documents": [ - { - "id": "0001", - "documentType": "procurementPlan", - "title": "Area Wide Cycle Improvements - Procurement Plan", - "description": "The overall strategic framework for procurement to enhance cycle provision.", - "url": "http://example.com/opencontracting/documents/planning/highways/procurementPlan.pdf", - "datePublished": "2009-01-05T00:00:00Z", - "format": "application/pdf" - }, - { - "id": "0002", - "documentType": "needsAssessment", - "title": "Cycle provision - Needs Assessment", - "description": "Needs assessment for provision for cyclists in the centre of town.", - "url": "http://example.com/opencontracting/documents/ocds-213czf-000-00001/needsAssessment.pdf", - "datePublished": "2009-01-15T00:00:00Z", - "format": "application/pdf" - } - ] - }, - "tender": { - "id": "ocds-213czf-000-00001-01-planning", - "title": "Planned cycle lane improvements", - "description": "The authority plans to tender for improvements to the cycle lane in early 2010. This notice provides advanced notice of the intention to tender, and details to upcoming consultation events.", - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 10, - "unit": { - "name": "Miles", - "value": { - "amount": 100000, - "currency": "GBP" - } - } - } - ], - "minValue": { - "amount": 500000, - "currency": "GBP" - }, - "value": { - "amount": 1000000, - "currency": "GBP" - }, - "procurementMethod": "open", - "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.", - "tenderPeriod": { - "startDate": "2010-02-01T00:00:00Z" - }, - "awardPeriod": { - "startDate": "2010-06-01T00:00:00Z", - "endDate": "2011-06-01T23:59:59Z" - }, - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "documents": [ - { - "id": "0003", - "title": "Consultation on cycle provision", - "description": "A consultation document inviting citizen input into cycle provision.", - "url": "http://example.com/consultations/cycle-provision/", - "datePublished": "2015-02-15T00:00:00Z", - "dateModified": "2015-02-15T00:00:00Z", - "format": "text/html" - }, - { - "id": "0004", - "title": "Map of affected areas", - "description": "A map showing areas affected by the planned highway updates. Available from local libraries.", - "datePublished": "2015-02-15T00:00:00Z", - "format": "offline/print" - } - ], - "milestones": [ - { - "id": "0001", - "title": "Consultation Period", - "description": "A consultation period is open for citizen input to shape the final plans.", - "dueDate": "2015-04-15T17:00:00Z" - } - ] - } - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-02-tender", - "date": "2010-03-15T09:30:00Z", - "tag": [ - "tender" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "procuringEntity", - "buyer" - ], - "id": "GB-LAC-E09000003" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "tender": { - "id": "ocds-213czf-000-00001-01-tender", - "title": "Planned cycle lane improvements", - "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 120000, - "currency": "GBP" - } - } - } - ], - "minValue": { - "amount": 600000, - "currency": "GBP" - }, - "value": { - "amount": 1100000, - "currency": "GBP" - }, - "procurementMethod": "open", - "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.", - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", - "enquiryPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2010-03-14T17:30:00Z" - }, - "hasEnquiries": false, - "tenderPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2011-04-01T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2010-06-01T00:00:00Z", - "endDate": "2011-08-01T23:59:59Z" - }, - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "documents": [ - { - "id": "0005", - "documentType": "notice", - "title": "Tender Notice", - "description": "Official tender notice.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-01T09:00:00Z", - "format": "text/html" - } - ] - } - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-03-tenderAmendment", - "date": "2010-03-20T10:45:00Z", - "tag": [ - "tenderAmendment" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "procuringEntity", - "buyer" - ], - "id": "GB-LAC-E09000003" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "tender": { - "id": "ocds-213czf-000-00001-01-tender", - "title": "Planned cycle lane improvements", - "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 120000, - "currency": "GBP" - } - } - } - ], - "minValue": { - "amount": 600000, - "currency": "GBP" - }, - "value": { - "amount": 1210000, - "currency": "GBP" - }, - "procurementMethod": "open", - "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.", - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", - "enquiryPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2010-03-14T17:30:00Z" - }, - "hasEnquiries": true, - "tenderPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2011-04-01T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2010-06-01T00:00:00Z", - "endDate": "2011-08-01T23:59:59Z" - }, - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "documents": [ - { - "id": "0005", - "documentType": "notice", - "title": "Tender Notice", - "description": "Official tender notice.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-01T09:00:00Z", - "format": "text/html" - }, - { - "id": "0006", - "documentType": "enquiryResponses", - "title": "Enquiry Responses", - "description": "Responses to enquiries asked by interested parties.", - "url": "http://example.com/enquiry-response/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-20T11:30:15Z", - "format": "text/html" - } - ], - "amendments": [ - { - "id": "update-1", - "date": "2010-03-20T09:45:00Z", - "rationale": "Update following enquiries.", - "description": "Following the enquiry period, enquiries were received and responses to questions asked have been published. No changes to the overall tender details were made.", - "amendsReleaseID": "ocds-213czf-000-00001-02-tender", - "releaseID": "ocds-213czf-000-00001-03-tenderUpdate" - }, - { - "id": "amendment-1", - "date": "2010-03-20T10:45:00Z", - "rationale": "Revised value", - "description": "Following the enquiry period, a decision was made to increase the maximum value by 10%.", - "amendsReleaseID": "ocds-213czf-000-00001-03-tenderUpdate", - "releaseID": "ocds-213czf-000-00001-03-tenderAmendment" - } - ] - } - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-03-tenderUpdate", - "date": "2010-03-20T09:45:00Z", - "tag": [ - "tenderUpdate" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "procuringEntity", - "buyer" - ], - "id": "GB-LAC-E09000003" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "tender": { - "id": "ocds-213czf-000-00001-01-tender", - "title": "Planned cycle lane improvements", - "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 120000, - "currency": "GBP" - } - } - } - ], - "minValue": { - "amount": 600000, - "currency": "GBP" - }, - "value": { - "amount": 1100000, - "currency": "GBP" - }, - "procurementMethod": "open", - "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.", - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", - "enquiryPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2010-03-14T17:30:00Z" - }, - "hasEnquiries": true, - "tenderPeriod": { - "startDate": "2010-03-01T09:00:00Z", - "endDate": "2011-04-01T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2010-06-01T00:00:00Z", - "endDate": "2011-08-01T23:59:59Z" - }, - "procuringEntity": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "documents": [ - { - "id": "0005", - "documentType": "notice", - "title": "Tender Notice", - "description": "Official tender notice.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-01T09:00:00Z", - "format": "text/html" - }, - { - "id": "0006", - "documentType": "enquiryResponses", - "title": "Enquiry Responses", - "description": "Responses to enquiries asked by interested parties.", - "url": "http://example.com/enquiry-response/ocds-213czf-000-00001-01.html", - "datePublished": "2010-03-20T11:30:15Z", - "format": "text/html" - } - ], - "amendments": [ - { - "id": "update-1", - "date": "2010-03-20T09:45:00Z", - "rationale": "Update following enquiries.", - "description": "Following the enquiry period, enquiries were received and responses to questions asked have been published. No changes to the overall tender details were made.", - "amendsReleaseID": "ocds-213czf-000-00001-02-tender", - "releaseID": "ocds-213czf-000-00001-03-tenderUpdate" - } - ] - } - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-04-award", - "date": "2010-05-10T09:30:00Z", - "tag": [ - "award" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "buyer" - ], - "id": "GB-LAC-E09000003" - }, - { - "identifier": { - "scheme": "GB-COH", - "id": "1234567844", - "legalName": "AnyCorp Ltd", - "uri": "http://www.anycorp.example" - }, - "additionalIdentifiers": [ - { - "scheme": "GB-VAT", - "id": "987654321" - } - ], - "name": "AnyCorp Cycle Provision", - "address": { - "streetAddress": "100 Anytown Lane", - "locality": "Anytown", - "region": "AnyCounty", - "postalCode": "AN1 1TN", - "country": "GB" - }, - "contactPoint": { - "name": "Contracts Team", - "email": "contracts@anycorp.example", - "telephone": "12345 456 343", - "faxNumber": "12345 456 343" - }, - "roles": [ - "supplier" - ], - "id": "GB-COH-1234567844" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "awards": [ - { - "id": "ocds-213czf-000-00001-award-01", - "title": "Award of contract to build new cycle lanes in the centre of town.", - "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", - "value": { - "amount": 11000000, - "currency": "GBP" - }, - "suppliers": [ - { - "id": "GB-COH-1234567844", - "name": "AnyCorp Cycle Provision" - } - ], - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "contractPeriod": { - "startDate": "2010-07-01T00:00:00Z", - "endDate": "2011-08-01T23:59:00Z" - }, - "documents": [ - { - "id": "0007", - "documentType": "notice", - "title": "Award notice", - "description": "Award of contract to build new cycle lanes in the centre of town to AnyCorp Ltd.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html", - "datePublished": "2010-05-10T09:30:00Z", - "format": "text/html" - } - ] - } - ] - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-05-contract", - "date": "2010-05-10T10:30:00Z", - "tag": [ - "contract" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "buyer" - ], - "id": "GB-LAC-E09000003" - }, - { - "identifier": { - "scheme": "GB-COH", - "id": "1234567844", - "legalName": "AnyCorp Ltd", - "uri": "http://www.anycorp.example" - }, - "additionalIdentifiers": [ - { - "scheme": "GB-VAT", - "id": "987654321" - } - ], - "name": "AnyCorp Cycle Provision", - "address": { - "streetAddress": "100 Anytown Lane", - "locality": "Anytown", - "region": "AnyCounty", - "postalCode": "AN1 1TN", - "country": "GB" - }, - "contactPoint": { - "name": "Contracts Team", - "email": "contracts@anycorp.example", - "telephone": "12345 456 343", - "faxNumber": "12345 456 343" - }, - "roles": [ - "supplier" - ], - "id": "GB-COH-1234567844" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "awards": [ - { - "id": "ocds-213czf-000-00001-award-01", - "title": "Award of contract to build new cycle lanes in the centre of town.", - "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", - "value": { - "amount": 11000000, - "currency": "GBP" - }, - "suppliers": [ - { - "id": "GB-COH-1234567844", - "name": "AnyCorp Cycle Provision" - } - ], - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "contractPeriod": { - "startDate": "2010-07-01T00:00:00Z", - "endDate": "2011-08-01T23:59:00Z" - }, - "documents": [ - { - "id": "0007", - "documentType": "notice", - "title": "Award notice", - "description": "Award of contract to build new cycle lanes in the centre of town to AnyCorp Ltd.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html", - "datePublished": "2010-05-10T10:30:00Z", - "format": "text/html" - } - ] - } - ], - "contracts": [ - { - "id": "ocds-213czf-000-00001-contract-01", - "awardID": "ocds-213czf-000-00001-award-01", - "title": "Contract to build new cycle lanes in the centre of town.", - "description": "A contract has been signed between the Council and AnyCorp Ltd for construction of new cycle lanes in the centre of town.", - "period": { - "startDate": "2010-07-01T00:00:00Z", - "endDate": "2011-08-01T23:59:00Z" - }, - "value": { - "amount": 11000000, - "currency": "GBP" - }, - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "dateSigned": "2015-06-10T14:23:12Z", - "documents": [ - { - "id": "0008", - "documentType": "contractSigned", - "title": "Signed Contract", - "description": "The Signed Contract for Cycle Path Construction", - "url": "http://example.com/contracts/ocds-213czf-000-00001", - "datePublished": "2015-06-10T16:43:12Z", - "format": "application/pdf" - } - ] - } - ] - }, - { - "ocid": "ocds-213czf-000-00001", - "id": "ocds-213czf-000-00001-06-implementation", - "date": "2011-01-10T09:30:00Z", - "tag": [ - "implementation" - ], - "parties": [ - { - "identifier": { - "scheme": "GB-LAC", - "id": "E09000003", - "legalName": "London Borough of Barnet", - "uri": "http://www.barnet.gov.uk/" - }, - "name": "London Borough of Barnet", - "address": { - "streetAddress": "4, North London Business Park, Oakleigh Rd S", - "locality": "London", - "region": "London", - "postalCode": "N11 1NP", - "country": "GB" - }, - "contactPoint": { - "name": "Procurement Team", - "email": "procurement-team@example.com", - "telephone": "01234 345 346", - "faxNumber": "01234 345 345", - "url": "http://example.com/contact/" - }, - "roles": [ - "buyer" - ], - "id": "GB-LAC-E09000003" - }, - { - "identifier": { - "scheme": "GB-COH", - "id": "1234567844", - "legalName": "AnyCorp Ltd", - "uri": "http://www.anycorp.example" - }, - "additionalIdentifiers": [ - { - "scheme": "GB-VAT", - "id": "987654321" - } - ], - "name": "AnyCorp Cycle Provision", - "address": { - "streetAddress": "100 Anytown Lane", - "locality": "Anytown", - "region": "AnyCounty", - "postalCode": "AN1 1TN", - "country": "GB" - }, - "contactPoint": { - "name": "Contracts Team", - "email": "contracts@anycorp.example", - "telephone": "12345 456 343", - "faxNumber": "12345 456 343" - }, - "roles": [ - "supplier" - ], - "id": "GB-COH-1234567844" - } - ], - "buyer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "awards": [ - { - "id": "ocds-213czf-000-00001-award-01", - "title": "Award of contract to build new cycle lanes in the centre of town.", - "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", - "value": { - "amount": 11000000, - "currency": "GBP" - }, - "suppliers": [ - { - "id": "GB-COH-1234567844", - "name": "AnyCorp Cycle Provision" - } - ], - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "contractPeriod": { - "startDate": "2010-07-01T00:00:00Z", - "endDate": "2011-08-01T23:59:00Z" - }, - "documents": [ - { - "id": "0007", - "documentType": "notice", - "title": "Award notice", - "description": "Award of contract to build new cycle lanes in the centre of town to AnyCorp Ltd.", - "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html", - "datePublished": "2010-05-10T10:30:00Z", - "format": "text/html" - } - ] - } - ], - "contracts": [ - { - "id": "ocds-213czf-000-00001-contract-01", - "awardID": "ocds-213czf-000-00001-award-01", - "title": "Contract to build new cycle lanes in the centre of town.", - "description": "Contract monitoring for cycle lane construction.", - "period": { - "startDate": "2010-07-01T00:00:00Z", - "endDate": "2011-08-01T23:59:00Z" - }, - "value": { - "amount": 11000000, - "currency": "GBP" - }, - "items": [ - { - "id": "0001", - "description": "string", - "classification": { - "scheme": "CPV", - "id": "45233130", - "description": "Construction work for highways", - "uri": "http://cpv.data.ac.uk/code-45233130" - }, - "additionalClassifications": [ - { - "scheme": "CPV", - "id": "45233162-2", - "description": "Cycle path construction work", - "uri": "http://cpv.data.ac.uk/code-45233162.html" - } - ], - "quantity": 8, - "unit": { - "name": "Miles", - "value": { - "amount": 137000, - "currency": "GBP" - } - } - } - ], - "dateSigned": "2015-06-10T14:23:12Z", - "documents": [ - { - "id": "0009", - "documentType": "physicalProcessReport", - "title": "Progress report", - "description": "Physical progress report for cycle path construction", - "url": "http://example.com/reports/ocds-213czf-000-00001/cycle-path-01.pdf", - "datePublished": "2010-12-15T15:34:02Z", - "format": "application/pdf" - } - ], - "implementation": { - "transactions": [ - { - "id": "ocds-213czf-000-00001-1", - "source": "https://openspending.org/uk-barnet-spending/", - "date": "2010-08-01T00:00:00Z", - "uri": "https://openspending.org/uk-barnet-spending/transaction/asd9235qaghvs1059620ywhgai", - "payer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "payee": { - "id": "GB-COH-1234567844", - "name": "AnyCorp Ltd" - }, - "value": { - "amount": 500000, - "currency": "GBP" - } - }, - { - "id": "ocds-213czf-000-00001-2", - "source": "https://openspending.org/uk-barnet-spending/", - "date": "2010-10-01T00:00:00Z", - "uri": "https://openspending.org/uk-barnet-spending/transaction/asd9235qaghvs105962as0012", - "payer": { - "id": "GB-LAC-E09000003", - "name": "London Borough of Barnet" - }, - "payee": { - "id": "GB-COH-1234567844", - "name": "AnyCorp Ltd" - }, - "value": { - "amount": 100000, - "currency": "GBP" - } - } - ] - } - } - ] - } - ] - } - ], - "version": "1.1" -} diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json deleted file mode 100644 index 1cc80020d..000000000 --- a/docs/examples/merging/updates/versioned.json +++ /dev/null @@ -1,515 +0,0 @@ -{ - "version": "1.1", - "records": [ - { - "ocid": "ocds-213czf-000-00002", - "releases": [ - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json#ocds-213czf-000-00002-01-award1", - "date": "2016-03-01T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json#ocds-213czf-000-00002-01-award2", - "date": "2016-03-03T09:30:00Z", - "tag": [ - "award" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json#ocds-213czf-000-00002-01-tender", - "date": "2016-01-01T09:30:00Z", - "tag": [ - "tender" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json#ocds-213czf-000-00002-01-tender-update", - "date": "2016-01-31T09:30:00Z", - "tag": [ - "tenderUpdate" - ] - }, - { - "url": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json#ocds-213czf-000-00002-01-tender-amendment", - "date": "2016-02-05T10:30:00Z", - "tag": [ - "tenderAmendment" - ] - } - ], - "compiledRelease": { - "tag": [ - "compiled" - ], - "id": "ocds-213czf-000-00002-2016-03-03T09:30:00Z", - "date": "2016-03-03T09:30:00Z", - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": "Open Data Services", - "identifier": { - "scheme": "GB-COH", - "id": "09506232", - "legalName": "Open Data Services Co-operative", - "uri": "https://opencorporates.com/companies/gb/09506232" - }, - "roles": [ - "buyer" - ] - } - ], - "buyer": { - "id": "GB-COH-09506232", - "name": "Open Data Services" - }, - "tender": { - "id": "ocds-213czf-000-00002-01-tender", - "title": "Data merging tool", - "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { - "amount": 2000, - "currency": "USD" - }, - "procurementMethod": "open", - "awardCriteria": "bestProposal", - "tenderPeriod": { - "startDate": "2016-01-31T09:00:00Z", - "endDate": "2016-02-20T18:00:00Z" - }, - "awardPeriod": { - "startDate": "2016-04-01T00:00:00Z", - "endDate": "2016-06-01T23:59:59Z" - }, - "amendments": [ - { - "id": "amendment-1", - "date": "2016-02-04T09:30:00Z", - "rationale": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended", - "amendsReleaseID": "ocds-213czf-000-00002-01-tender", - "releaseID": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "date": "2016-03-01T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - }, - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": "Award of contract to create the data merging tool.", - "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "date": "2016-03-03T09:30:00Z", - "value": { - "amount": 750, - "currency": "USD" - } - } - ] - }, - "versionedRelease": { - "ocid": "ocds-213czf-000-00002", - "parties": [ - { - "id": "GB-COH-09506232", - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ], - "identifier": { - "scheme": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH" - } - ], - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "09506232" - } - ], - "legalName": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services Co-operative" - } - ], - "uri": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "https://opencorporates.com/companies/gb/09506232" - } - ] - }, - "roles": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": [ - "buyer" - ] - } - ] - } - ], - "buyer": { - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "GB-COH-09506232" - } - ], - "name": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Open Data Services" - } - ] - }, - "tender": { - "id": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "ocds-213czf-000-00002-01-tender" - } - ], - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Data merging tool" - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "Data merge tool." - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-update", - "releaseDate": "2016-01-31T09:30:00Z", - "releaseTag": [ - "tenderUpdate" - ], - "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": 1000 - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": 2000 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "USD" - } - ] - }, - "procurementMethod": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "open" - } - ], - "awardCriteria": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "bestProposal" - } - ], - "tenderPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-01-31T09:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-02-15T18:00:00Z" - }, - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "2016-02-20T18:00:00Z" - } - ] - }, - "awardPeriod": { - "startDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-04-01T00:00:00Z" - } - ], - "endDate": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "2016-06-01T23:59:59Z" - } - ] - }, - "amendments": [ - { - "id": "amendment-1", - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "2016-02-04T09:30:00Z" - } - ], - "rationale": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "Based on feedback from potential bidders, the total budget was increased by $1000, and the deadline extended" - } - ], - "amendsReleaseID": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "ocds-213czf-000-00002-01-tender" - } - ], - "releaseID": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender-amendment", - "releaseDate": "2016-02-05T10:30:00Z", - "releaseTag": [ - "tenderAmendment" - ], - "value": "ocds-213czf-000-00002-01-tender-amendment" - } - ] - } - ] - }, - "awards": [ - { - "id": "ocds-213czf-000-00002-award-supplier-one", - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Award of contract to create the data merging tool." - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation" - } - ], - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "2016-03-01T09:30:00Z" - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": 750 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "USD" - } - ] - } - }, - { - "id": "ocds-213czf-000-00002-award-supplier-two", - "title": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Award of contract to create the data merging tool." - } - ], - "description": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool" - } - ], - "date": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "2016-03-03T09:30:00Z" - } - ], - "value": { - "amount": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": 750 - } - ], - "currency": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "USD" - } - ] - } - } - ] - } - } - ] -} diff --git a/docs/examples/record_reference/linked_releases.json b/docs/examples/record_reference/linked_releases.json new file mode 100644 index 000000000..4dc84d804 --- /dev/null +++ b/docs/examples/record_reference/linked_releases.json @@ -0,0 +1,31 @@ +{ + "version": "1.1", + "records": [ + { + "ocid": "ocds-213czf-000-00002", + "releases": [ + { + "url": "http://example.com/releases/ocds-213czf-000-00002.json#1", + "date": "2024-01-01T00:00:00Z", + "tag": [ + "tender" + ] + }, + { + "url": "http://example.com/releases/ocds-213czf-000-00002.json#2", + "date": "2024-01-07T00:00:00Z", + "tag": [ + "tenderUpdate" + ] + }, + { + "url": "http://example.com/releases/ocds-213czf-000-00002.json#3", + "date": "2024-01-14T00:00:00Z", + "tag": [ + "tenderAmendment" + ] + } + ] + } + ] +} diff --git a/docs/schema/packaging/record_package.md b/docs/schema/packaging/record_package.md index 80288ec87..3b025a522 100644 --- a/docs/schema/packaging/record_package.md +++ b/docs/schema/packaging/record_package.md @@ -5,7 +5,7 @@ The record package schema describes a container for records. ````{admonition} Example :class: hint -```{jsoninclude} ../../examples/merging/updates/versioned.json +```{jsoninclude} ../../examples/amendments/tender.json :jsonpointer: :title: Record package ``` diff --git a/docs/schema/records_reference.md b/docs/schema/records_reference.md index cc2ba78fc..f47514000 100644 --- a/docs/schema/records_reference.md +++ b/docs/schema/records_reference.md @@ -30,7 +30,7 @@ A record **may** contain a [versionedRelease](#versioned-release) object, which ````{admonition} Example :class: hint -```{jsoninclude} ../examples/merging/updates/versioned.json +```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0 :title: record ``` @@ -56,7 +56,7 @@ For each `url` value, it must be possible for a consuming application to retriev The following example demonstrates the use of linked releases. -```{jsoninclude} ../examples/merging/updates/versioned.json +```{jsoninclude} ../examples/record_reference/linked_releases.json :jsonpointer: /records/0 :expand: releases, tag :title: releases @@ -72,7 +72,7 @@ An embedded release follows the [release schema](reference). In other words, ins The following example demonstrates the use of embedded releases. -```{jsoninclude} ../examples/merging/embedded_releases.json +```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0 :expand: releases,tag :title: releases @@ -106,8 +106,8 @@ A separate, auto-generated [versioned release schema](../../build/current_lang/v The following example displays a single field's [versioned values](merging.md#versioned-values). This shows that the amount changed between the tender stage and a tender amendment, while the currency did not. -```{jsoninclude} ../examples/merging/updates/versioned.json +```{jsoninclude} ../examples/amendments/tender.json :jsonpointer: /records/0/versionedRelease/tender/value -:expand: amount, releaseTag +:expand: amount, releaseTag, currency :title: versioned ``` From e8be637267bcaf46eff38885d6bc576f6cc0adb2 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 11:17:44 +1300 Subject: [PATCH 38/40] docs/schema/records_reference.md: Update text to match JSON --- docs/schema/records_reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schema/records_reference.md b/docs/schema/records_reference.md index f47514000..384a3dce1 100644 --- a/docs/schema/records_reference.md +++ b/docs/schema/records_reference.md @@ -62,7 +62,7 @@ The following example demonstrates the use of linked releases. :title: releases ``` -Above, the first linked release has a `url` value of `https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json#ocds-213czf-000-00002-01-award1`. The first part (`https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json`) is the URL of the release package, and the fragment identifier (`ocds-213czf-000-00002-01-award1`) is the `id` of the release. +Above, the first linked release has a `url` value of `http://example.com/releases/ocds-213czf-000-00002.json#1`. The first part (`http://example.com/releases/ocds-213czf-000-00002.json`) is the URL of the release package, and the fragment identifier (`1`) is the `id` of the release. Release `id` values are only required to be unique within the scope of a (contracting or planning) process: that is, within the scope of an `ocid` value. As such, a consuming application needs to use that fragment identifier in combination with the `ocid` of the record in order to identify the matching release within the release package. From 2140e6c3ef9ccb4dfecc3e7f5462e6fb9dcad906 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 28 Mar 2024 11:20:38 +1300 Subject: [PATCH 39/40] Update docs/guidance/map/milestones.md Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- docs/guidance/map/milestones.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guidance/map/milestones.md b/docs/guidance/map/milestones.md index f45200447..64cefe157 100644 --- a/docs/guidance/map/milestones.md +++ b/docs/guidance/map/milestones.md @@ -18,7 +18,7 @@ populate the tender milestones block instead. ## Tender The tender milestones block is used to describe two types of milestone: - * Key dates in the tender and award stages which are not covered by other fields, for example, the date by which buyer or procuring entity will respond to enquiries. + * Key dates in the tender and award stages which are not covered by other fields, for example, the date by which the buyer or procuring entity will respond to enquiries. * Anticipated milestones during the contract implementation stage, for example, the date by which goods need to be delivered. ## Contract From 3d95f6ac4d7306c024331f30cd27a98968fbb2f0 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Wed, 27 Mar 2024 21:31:41 -0400 Subject: [PATCH 40/40] examples: Use HTTPS for linked_releases.json --- docs/examples/record_reference/linked_releases.json | 6 +++--- docs/schema/records_reference.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/examples/record_reference/linked_releases.json b/docs/examples/record_reference/linked_releases.json index 4dc84d804..8da33d89a 100644 --- a/docs/examples/record_reference/linked_releases.json +++ b/docs/examples/record_reference/linked_releases.json @@ -5,21 +5,21 @@ "ocid": "ocds-213czf-000-00002", "releases": [ { - "url": "http://example.com/releases/ocds-213czf-000-00002.json#1", + "url": "https://example.com/releases/ocds-213czf-000-00002.json#1", "date": "2024-01-01T00:00:00Z", "tag": [ "tender" ] }, { - "url": "http://example.com/releases/ocds-213czf-000-00002.json#2", + "url": "https://example.com/releases/ocds-213czf-000-00002.json#2", "date": "2024-01-07T00:00:00Z", "tag": [ "tenderUpdate" ] }, { - "url": "http://example.com/releases/ocds-213czf-000-00002.json#3", + "url": "https://example.com/releases/ocds-213czf-000-00002.json#3", "date": "2024-01-14T00:00:00Z", "tag": [ "tenderAmendment" diff --git a/docs/schema/records_reference.md b/docs/schema/records_reference.md index 384a3dce1..a5fb1ff60 100644 --- a/docs/schema/records_reference.md +++ b/docs/schema/records_reference.md @@ -62,7 +62,7 @@ The following example demonstrates the use of linked releases. :title: releases ``` -Above, the first linked release has a `url` value of `http://example.com/releases/ocds-213czf-000-00002.json#1`. The first part (`http://example.com/releases/ocds-213czf-000-00002.json`) is the URL of the release package, and the fragment identifier (`1`) is the `id` of the release. +Above, the first linked release has a `url` value of `https://example.com/releases/ocds-213czf-000-00002.json#1`. The first part (`https://example.com/releases/ocds-213czf-000-00002.json`) is the URL of the release package, and the fragment identifier (`1`) is the `id` of the release. Release `id` values are only required to be unique within the scope of a (contracting or planning) process: that is, within the scope of an `ocid` value. As such, a consuming application needs to use that fragment identifier in combination with the `ocid` of the record in order to identify the matching release within the release package.