Merge branch '1.1' into 1.2. Omit codelist additions and correspondin…

…g readme changes.
open-contracting-extensions · Oct 10, 2024 · 9289f07 · 9289f07
2 parents 5831641 + 6b56eac
commit 9289f07
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2,15 +2,7 @@
 
 Implements fields and codes that are specific to European law.
 
-For complete guidance on meeting the disclosure requirements of European law, see [OCDS for European Union](https://standard.open-contracting.org/profiles/eu/master/en/).
-
-## Guidance
-
-If items have at most one delivery address, use the [Location](https://extensions.open-contracting.org/en/extensions/location/) extension instead ([see discussion](https://github.com/open-contracting/ocds-extensions/issues/115)).
-
-## Legal context
-
-In the European Union, this extension's fields correspond to [eForms BT-99 (Review Deadline Description), BT-163 (Concession Value Description), BT-109 (Framework Duration Justification), BT-505 (Organisation Internet Address), BT-508 (Buyer Profile URL) and BG-708 (Place of Performance)](https://docs.ted.europa.eu/eforms/latest/reference/business-terms/). See [OCDS for the European Union](http://standard.open-contracting.org/profiles/eu/master/en/) for the correspondences to Tenders Electronic Daily (TED).
+For complete guidance on meeting the disclosure requirements of European law, see [OCDS for eForms](https://standard.open-contracting.org/profiles/eforms/latest/en/) for the 2019 regulation, or [OCDS for European Union](https://standard.open-contracting.org/profiles/eu/latest/en/) for the 2015 regulation.
 
 ## Example
 
@@ -37,6 +29,9 @@ In the European Union, this extension's fields correspond to [eForms BT-99 (Revi
     }
   ],
   "tender": {
+    "contractPeriod": {
+      "description": "unknown"
+    },
     "reviewDetails": "NHS Wales Shared Services Partnership on behalf of Cardiff and Vale University Local Health Board will allow a minimum 10 calendar day standstill period between notifying the award decision and awarding the contract.",
     "valueCalculationMethod": "Income from the sales of tickets over the duration of the contract minus the fees paid to the procuring entity.",
     "items": [
@@ -77,6 +72,9 @@ In the European Union, this extension's fields correspond to [eForms BT-99 (Revi
           "durationInDays": 30,
           "startDate": "2020-11-06T00:00:00Z",
           "endDate": "2020-12-06T00:00:00Z"
+        },
+        "contractPeriod": {
+          "description": "unknown"
         }
       }
     ],
@@ -86,7 +84,17 @@ In the European Union, this extension's fields correspond to [eForms BT-99 (Revi
         "type": "securityClearanceDeadline",
         "dueDate": "2020-11-19T00:00:00Z"
       }
-    ]
+    ],
+    "selectionCriteria": {
+      "sources": [
+        "epo-notice"
+      ]
+    },
+    "exclusionGrounds": {
+      "sources": [
+        "epo-notice"
+      ]
+    }
   },
   "awards": [
     {
@@ -118,6 +126,25 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 
 ## Changelog
 
+### 2024-10-08
+
+* Add fields:
+  * `SelectionCriteria.sources`
+  * `ExclusionGrounds.sources`
+* Add `sources.csv` codelist
+
+### 2023-08-01
+
+* Add fields:
+  * `Organization.eDeliveryGateway`
+  * `Lot.hasAccessibilityCriteria`
+  * `Lot.noAccessibilityCriteriaRationale`
+  * `Lot.reviewDetails`
+
+### 2023-06-30
+
+* Add `Period.description` field.
+
 ### 2022-05-27
 
 * Move `Lot.minimumValue` to the Lots extension as `Lot.minValue`.

diff --git a/codelists/sources.csv b/codelists/sources.csv
@@ -0,0 +1,4 @@
+Code,Title,Description
+epo-notice,Notice,Notice
+epo-procurement-document,Procurement Document,Procurement Document
+epo-sub-espd,European Single Procurement Document (ESPD),European Single Procurement Document (ESPD)
diff --git a/extension.json b/extension.json
@@ -14,11 +14,15 @@
   "schemas": [
     "release-schema.json"
   ],
+  "codelists": [
+    "sources.csv"
+  ],
   "contactPoint": {
     "name": "Open Contracting Partnership",
     "email": "[email protected]"
   },
   "testDependencies": [
-    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_lots_extension/master/extension.json"
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_lots_extension/master/extension.json",
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_document_publisher_extension/master/extension.json"
   ]
 }
diff --git a/release-schema.json b/release-schema.json
@@ -27,8 +27,8 @@
           "items": {
             "$ref": "#/definitions/LegislativeReference"
           },
-          "uniqueItems": true,
           "wholeListMerge": true,
+          "uniqueItems": true,
           "minItems": 1
         }
       }
@@ -56,6 +56,15 @@
               "minLength": 1
             }
           }
+        },
+        "eDeliveryGateway": {
+          "title": "eDelivery gateway",
+          "description": "The organization's URL for the exchange of data and documents with eDelivery.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "format": "uri"
         }
       }
     },
@@ -103,12 +112,25 @@
           "items": {
             "$ref": "#/definitions/Address"
           },
-          "uniqueItems": true,
           "wholeListMerge": true,
+          "uniqueItems": true,
           "minItems": 1
         }
       }
     },
+    "Period": {
+      "properties": {
+        "description": {
+          "title": "Description",
+          "description": "The description of the period.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "minLength": 1
+        }
+      }
+    },
     "LegislativeReference": {
       "title": "Legislative reference",
       "description": "Legislative reference and associated contact point",
@@ -146,6 +168,74 @@
           "title": "Award period",
           "description": "The period for decision making regarding the contract award for the lot. The end date should be the date on which an award decision is due to be finalized. The start date may be used to indicate the start of an evaluation period.",
           "$ref": "#/definitions/Period"
+        },
+        "hasAccessibilityCriteria": {
+          "title": "Has accessibility criteria",
+          "description": "Whether the technical specifications for the lot include accessibility criteria for people with disabilities.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "noAccessibilityCriteriaRationale": {
+          "title": "No accessibility criteria rationale",
+          "description": "The rationale for not including accessibility criteria when the object of the lot is intended for use by natural persons.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "minLength": 1
+        },
+        "reviewDetails": {
+          "title": "Review details",
+          "description": "Precise information concerning the time limits for the review procedures for the lot or contact information from which it can be obtained.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "minLength": 1
+        }
+      }
+    },
+    "ExclusionGrounds": {
+      "properties": {
+        "sources": {
+          "title": "Sources",
+          "description": "The sources in which the exclusion grounds are defined.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "epo-notice",
+              "epo-procurement-document",
+              "epo-sub-espd"
+            ]
+          },
+          "codelist": "sources.csv",
+          "openCodelist": false,
+          "uniqueItems": true,
+          "minItems": 1
+        }
+      }
+    },
+    "SelectionCriteria": {
+      "properties": {
+        "sources": {
+          "title": "Sources",
+          "description": "The sources in which the selection criteria are defined.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "epo-notice",
+              "epo-procurement-document",
+              "epo-sub-espd"
+            ]
+          },
+          "codelist": "sources.csv",
+          "openCodelist": false,
+          "uniqueItems": true,
+          "minItems": 1
         }
       }
     }