Skip to content

Commit

Permalink
Merge pull request #1679 from open-contracting/1622_merge_organizatio…
Browse files Browse the repository at this point in the history
…n_classification

release_schema: add organization/details/classifications
  • Loading branch information
jpmckinney authored Mar 8, 2024
2 parents 8a5560a + 30526cc commit 7a7dcf0
Show file tree
Hide file tree
Showing 5 changed files with 131 additions and 1 deletion.
7 changes: 6 additions & 1 deletion docs/history/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,12 @@ Per the [normative and non-normative content and changes policy](../governance/n
* [#1210](https://github.com/open-contracting/standard/pull/1210) Add codes from the legal basis extension:
* 'CELEX'
* 'LEXML'
* [#1218](https://github.com/open-contracting/standard/pull/1218) Add codes from the organization classification extension:
* [#1218](https://github.com/open-contracting/standard/pull/1218) [#1679](https://github.com/open-contracting/standard/pull/1679) Add codes from the organization classification extension:
* 'COFOG'
* 'TED_CA_TYPE'
* 'TED_CE_ACTIVITY'
* 'eu-buyer-contracting-type'
* 'eu-main-activity'
* [#1452](https://github.com/open-contracting/standard/pull/1452) Add 'proClass'.
* [#1637](https://github.com/open-contracting/standard/pull/1637) Add 'sdg' and 'sdgTarget'.

Expand Down Expand Up @@ -210,6 +214,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
* [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier`
* [#1519](https://github.com/open-contracting/standard/pull/1519) `Value.amountNet` and `Value.amountGross`
* [#1490](https://github.com/open-contracting/standard/pull/1490) `contracts.identifiers`
* [#1679](https://github.com/open-contracting/standard/pull/1679) `Organization.details.classifications`

* Deprecate some fields:
* [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated.
Expand Down
4 changes: 4 additions & 0 deletions schema/codelists/classificationScheme.csv
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ COFOG,Classification of the Functions of Government,"A standard classifying the
proClass,ProClass,ProClass is a procurement classification scheme intended for use by local government in the United Kingdom.,https://proclass.org.uk/,item
sdg,Sustainable Development Goals,"The Sustainable Development Goals are a collection of 17 interlinked goals set by the United Nations General Assembly and designed to be a ""blueprint to achieve a better and more sustainable future for all"".",https://unstats.un.org/sdgs/indicators/indicators-list/,tender
sdgTarget,Sustainable Development Goal Targets,The Sustainable Development Goal Targets are specific targets for each Sustainable Development Goal.,https://unstats.un.org/sdgs/indicators/indicators-list/,tender
TED_CA_TYPE,EU Type of contracting authority (TED schema),The types of contracting authority within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in TED schema.,https://simap.ted.europa.eu/documents/10184/99173/EN_F01.pdf,organization
TED_CE_ACTIVITY,EU Main activity of contracting entity (TED schema),The main activity of the contracting entity within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in TED schema.,https://simap.ted.europa.eu/documents/10184/99173/EN_F04.pdf,organization
eu-buyer-contracting-type,EU Buyer contracting entity type,Whether or not the buyer is a contracting entity within the domain of public procurement according to the legislation of the European Parliament.,https://docs.ted.europa.eu/eforms/latest/reference/code-lists/buyer-contracting-type.html,organization
eu-main-activity,EU Main activity authority list (eForms),The main activity of the contracting entity within the domain of public procurement according to the legislation of the European Parliament. This scheme's codes match those in eForms.,https://op.europa.eu/en/web/eu-vocabularies/concept-scheme/-/resource?uri=http://publications.europa.eu/resource/authority/main-activity,organization
102 changes: 102 additions & 0 deletions schema/dereferenced-release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,57 @@
],
"codelist": "partyScale.csv",
"openCodelist": false
},
"classifications": {
"title": "Organization classifications",
"description": "The classifications that categorize the organization.",
"type": "array",
"items": {
"title": "Classification",
"description": "A classification consists of at least two parts: an identifier for the list (scheme) from which the classification is taken, and an identifier for the category from that list being applied. It is useful to also publish a text label and/or URI that users can draw on to interpret the classification.",
"type": "object",
"properties": {
"scheme": {
"title": "Scheme",
"description": "The scheme or codelist from which the classification code is taken, using the open [classificationScheme](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#classification-scheme) codelist.",
"type": [
"string",
"null"
],
"codelist": "classificationScheme.csv",
"openCodelist": true
},
"id": {
"title": "ID",
"description": "The classification code taken from the scheme. Although an integer is allowed, it is recommended to use a string.",
"type": [
"string",
"integer",
"null"
]
},
"description": {
"title": "Description",
"description": "A textual description or title for the classification code.",
"type": [
"string",
"null"
]
},
"uri": {
"title": "URI",
"description": "A URI to uniquely identify the classification code.",
"type": [
"string",
"null"
],
"format": "uri"
}
}
},
"uniqueItems": true,
"wholeListMerge": true,
"minItems": 1
}
}
}
Expand Down Expand Up @@ -33388,6 +33439,57 @@
],
"codelist": "partyScale.csv",
"openCodelist": false
},
"classifications": {
"title": "Organization classifications",
"description": "The classifications that categorize the organization.",
"type": "array",
"items": {
"title": "Classification",
"description": "A classification consists of at least two parts: an identifier for the list (scheme) from which the classification is taken, and an identifier for the category from that list being applied. It is useful to also publish a text label and/or URI that users can draw on to interpret the classification.",
"type": "object",
"properties": {
"scheme": {
"title": "Scheme",
"description": "The scheme or codelist from which the classification code is taken, using the open [classificationScheme](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#classification-scheme) codelist.",
"type": [
"string",
"null"
],
"codelist": "classificationScheme.csv",
"openCodelist": true
},
"id": {
"title": "ID",
"description": "The classification code taken from the scheme. Although an integer is allowed, it is recommended to use a string.",
"type": [
"string",
"integer",
"null"
]
},
"description": {
"title": "Description",
"description": "A textual description or title for the classification code.",
"type": [
"string",
"null"
]
},
"uri": {
"title": "URI",
"description": "A URI to uniquely identify the classification code.",
"type": [
"string",
"null"
],
"format": "uri"
}
}
},
"uniqueItems": true,
"wholeListMerge": true,
"minItems": 1
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions schema/release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,17 @@
],
"codelist": "partyScale.csv",
"openCodelist": false
},
"classifications": {
"title": "Organization classifications",
"description": "The classifications that categorize the organization.",
"type": "array",
"items": {
"$ref": "#/definitions/Classification"
},
"uniqueItems": true,
"wholeListMerge": true,
"minItems": 1
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions schema/versioned-release-validation-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,14 @@
],
"codelist": "partyScale.csv",
"openCodelist": false
},
"classifications": {
"type": "array",
"items": {
"$ref": "#/definitions/Classification"
},
"uniqueItems": true,
"minItems": 1
}
}
},
Expand Down

0 comments on commit 7a7dcf0

Please sign in to comment.