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.

Sign up for GitHub

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

schema: add submissionTerms.electronicSubmissionPolicy to tender #1654

Merged
merged 7 commits into from
Nov 21, 2023
Merged

schema: add submissionTerms.electronicSubmissionPolicy to tender #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad5f405
schema: add submissionTerms.electronicSubmissionPolicy to tender
odscjen Oct 20, 2023
7321198
schema/: electronicCataloguePolicy to electronicCatalogPolicy
odscjen Oct 20, 2023
212d86d
update changelog.md
odscjen Oct 20, 2023
fe2bd41
schema/: remove electronicCatalogPolicy, add electronicSubmissionPolicy
odscjen Oct 20, 2023
952e21c
Update schema/release-schema.json
odscjen Nov 16, 2023
cd723bc
Merge branch '1.2-dev' into 1183_add_electronicSubmissionPolicy
jpmckinney Nov 21, 2023
d55ac6e
chore: Run manage.py pre-commit
jpmckinney Nov 21, 2023
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
1 change: 1 addition & 0 deletions docs/history/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,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) `tender.identifiers` and `contracts.identifiers`
* [#1654](https://github.com/open-contracting/standard/pull/1654) `tender.submissionTerms.electronicSubmissionPolicy`

* 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/permission.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Code,Title,Description
required,Required,The activity is required.
allowed,Allowed,The activity is allowed.
notAllowed,Not allowed,The activity is not allowed.
46 changes: 46 additions & 0 deletions schema/dereferenced-release-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4729,6 +4729,29 @@
"null"
]
},
"submissionTerms": {
"title": "Submission terms",
"description": "Information about how, when and where tenderers need to submit their bids.",
"type": "object",
"properties": {
"electronicSubmissionPolicy": {
"title": "Electronic submission policy",
"description": "Whether tenderers are required, allowed or not allowed to submit bids electronically.",
"type": [
"string",
"null"
],
"codelist": "permission.csv",
"openCodelist": false,
"enum": [
"required",
"allowed",
"notAllowed",
null
]
}
}
},
"datePublished": {
"description": "The date on which the tender was published.",
"format": "date-time",
Expand Down Expand Up @@ -18257,6 +18280,29 @@
"null"
]
},
"submissionTerms": {
"title": "Submission terms",
"description": "Information about how, when and where tenderers need to submit their bids.",
"type": "object",
"properties": {
"electronicSubmissionPolicy": {
"title": "Electronic submission policy",
"description": "Whether tenderers are required, allowed or not allowed to submit bids electronically.",
"type": [
"string",
"null"
],
"codelist": "permission.csv",
"openCodelist": false,
"enum": [
"required",
"allowed",
"notAllowed",
null
]
}
}
},
"datePublished": {
"description": "The date on which the tender was published.",
"format": "date-time",
Expand Down
23 changes: 23 additions & 0 deletions schema/release-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,29 @@
"null"
]
},
"submissionTerms": {
"title": "Submission terms",
"description": "Information about how, when and where tenderers need to submit their bids.",
"type": "object",
"properties": {
"electronicSubmissionPolicy": {
"title": "Electronic submission policy",
"description": "Whether tenderers are required, allowed or not allowed to submit bids electronically.",
"type": [
"string",
"null"
],
"codelist": "permission.csv",
"openCodelist": false,
"enum": [
"required",
"allowed",
"notAllowed",
null
]
}
}
},
"datePublished": {
"description": "The date on which the tender was published.",
"format": "date-time",
Expand Down
40 changes: 40 additions & 0 deletions schema/versioned-release-validation-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,46 @@
"submissionMethodDetails": {
"$ref": "#/definitions/StringNullVersioned"
},
"submissionTerms": {
"type": "object",
"properties": {
"electronicSubmissionPolicy": {
"type": "array",
"items": {
"type": "object",
"properties": {
"releaseDate": {
"format": "date-time",
"type": "string"
},
"releaseID": {
"type": "string"
},
"value": {
"type": [
"string",
"null"
],
"codelist": "permission.csv",
"openCodelist": false,
"enum": [
"required",
"allowed",
"notAllowed",
null
]
},
"releaseTag": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
}
},
"datePublished": {
"$ref": "#/definitions/StringNullDateTimeVersioned"
},
Expand Down