Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1449 improve examples #1661

Merged
merged 43 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
762a12b
update buyers_suppliers, convert csv example to json
odscjen Oct 23, 2023
87c2ac1
consortia_simple.json fix indenting
odscjen Oct 23, 2023
26891a4
update primer/how.md and primer/releases_records.md
odscjen Nov 20, 2023
1707563
Merge remote-tracking branch 'origin/1.2-dev' into 1449-improve-examples
odscjen Nov 20, 2023
eb37438
primer/how.md: fix csv tables
odscjen Nov 20, 2023
50f81f4
primer/how.md: fix paths for examples/
odscjen Nov 20, 2023
36cf585
primer/how.md: remove nested header from admonition
odscjen Nov 20, 2023
b3ecff3
merging.md: update example using real example from Ghana
odscjen Nov 20, 2023
cf172f0
docs/examples: run ocdskit indent
odscjen Nov 20, 2023
fe6dc74
add back versioned.json
odscjen Nov 20, 2023
aaa066d
build/merging.md: correct typos
odscjen Nov 20, 2023
bebdcaf
schema/merging.md: update versioned example and fix more typos
odscjen Nov 28, 2023
21173b6
update tests_docs.py, change date to check
odscjen Nov 30, 2023
d86b34a
Apply suggestions from code review
odscjen Dec 1, 2023
aa5b810
apply review suggestions
odscjen Dec 1, 2023
348945d
fix build errors
odscjen Dec 1, 2023
522ace7
how.md: apply review suggestion
odscjen Dec 1, 2023
83eff56
Apply suggestions from code review
odscjen Dec 12, 2023
d393426
docs/merging updates following review
odscjen Dec 12, 2023
7c81ba5
docs/merging: apply review suggestions
odscjen Dec 15, 2023
b565973
Merge branch '1.2-dev' into 1449-improve-examples
odscjen Feb 28, 2024
95575f9
docs/guidance/build/merging.md: Replace updates example
duncandewhurst Mar 4, 2024
253c3f6
docs/guidance/map/buyers_suppliers.md: Move consortia example to JSON…
duncandewhurst Mar 4, 2024
058b50a
docs/primer/how.md: Simplify example
duncandewhurst Mar 4, 2024
5be5324
docs/guidance/map/amendments.md: Simplify tender example
duncandewhurst Feb 28, 2024
4618ed4
docs/guidance/map/amendments.md: Add paragraph breaks
duncandewhurst Feb 28, 2024
5b26351
docs/examples/amendments/tender.json: Reindent
duncandewhurst Feb 28, 2024
fe30b27
docs/guidance/map/amendments.md: Copy edits
duncandewhurst Feb 28, 2024
9923fae
docs/guidance/map/amendments.md: Remove contract example
duncandewhurst Feb 29, 2024
5d99ef6
docs/schema/merging.md: Update example
duncandewhurst Mar 4, 2024
a3c727f
docs/examples/merging/updates: Remove unused examples
duncandewhurst Mar 4, 2024
a14cace
docs/examples/buyers_suppliers/consortia.json: Indent
duncandewhurst Mar 4, 2024
5575637
tests/test_docs.py: Remove unneeded test
duncandewhurst Mar 4, 2024
30fdb79
Merge branch '1.2-dev' into 1449-improve-examples (conflicts due to r…
jpmckinney Mar 27, 2024
92f6391
examples: Fix filenames in readme
jpmckinney Mar 27, 2024
fca40c7
docs: Fix command in README
jpmckinney Mar 27, 2024
bd3b4a5
docs/guidance/build/merging.md: Update heading
duncandewhurst Mar 27, 2024
4af6cce
Apply suggestions from code review
duncandewhurst Mar 27, 2024
fa9161a
docs/examples: Remove unused
duncandewhurst Mar 27, 2024
e6a89cb
docs/schema: Update record and record package examples
duncandewhurst Mar 27, 2024
e8be637
docs/schema/records_reference.md: Update text to match JSON
duncandewhurst Mar 27, 2024
2140e6c
Update docs/guidance/map/milestones.md
duncandewhurst Mar 27, 2024
3d95f6a
examples: Use HTTPS for linked_releases.json
jpmckinney Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions docs/examples/merging/updates/award1.json

This file was deleted.

46 changes: 0 additions & 46 deletions docs/examples/merging/updates/award2.json

This file was deleted.

45 changes: 45 additions & 0 deletions docs/examples/merging/updates/ghana_tender1.json
Original file line number Diff line number Diff line change
@@ -0,0 +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",
"parties": [
{
"name": "ECONOMIC AND ORGANISED CRIME OFFICE",
"id": "14957",
"roles": [
"buyer",
"procuringEntity"
]
}
],
"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.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"status": "active",
"value": {
"amount": 13000,
"currency": "GHS"
},
"mainProcurementCategory": "goods",
"numberOfTenderers": 0,
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"procurementMethod": "limited"
}
}
]
}
69 changes: 69 additions & 0 deletions docs/examples/merging/updates/ghana_tender2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"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": [
{
"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",
"roles": [
"buyer",
"procuringEntity"
]
},
{
"name": "GS INTERNATIONAL COMPANY LIMITED",
"id": "2387",
"roles": [
"tenderer"
]
},
{
"name": "NEXT IT AND COMPUTER ENGINEERING LIMITED",
"id": "1215",
"roles": [
"tenderer"
]
odscjen marked this conversation as resolved.
Show resolved Hide resolved
}
],
"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",
"tenderers": [
{
"name": "GS INTERNATIONAL COMPANY LIMITED",
"id": "2387"
},
{
"name": "NEXT IT AND COMPUTER ENGINEERING LIMITED",
"id": "1215"
}
]
}
}
]
}
69 changes: 69 additions & 0 deletions docs/examples/merging/updates/ghana_tender3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"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": [
{
"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",
"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"
}
]
}
}
]
}
Loading