Skip to content

Commit 5f10ae9

Browse files
Pull request #10: Release/0.4.0
Merge in TEDEFO/eforms-sdk from release/0.4.0 to main * commit 'a0f9cbaf232317d95d66d304843940e1c7a0ddbf': Various small improvements in the README and CHANGELOG Update ChangeLog for 0.4.0 README: Update description of the SDK content Add translations as XML files Add fields metadata JSON file Update notice examples and validation reports for 0.4.0 Update schematron files for 0.4.0
2 parents 31b0bfe + a0f9cba commit 5f10ae9

File tree

200 files changed

+275756
-5561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+275756
-5561
lines changed

CHANGELOG.md

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,62 @@
1-
# SDK 0.3.0 Release Notes
2-
3-
*Update: An older version of the schematron rules was included by mistake in version 0.3.0. Version 0.3.1 includes the latest version of the schematron rules.*
1+
# SDK 0.4.0 Release Notes
42

53
Below is a list of the major updates made to the SDK in this release.
64

7-
The documentation is available as separate Asciidoc files, one per section.
8-
The [eForms SDK Documentation](https://op-ted.github.io/eForms-SDK) website is generated from this source using [Antora](https://antora.org/).
5+
The documentation for the SDK is available at https://docs.ted.europa.eu.
6+
7+
The source for this documentation is now maintained in a separate repository: [eforms-doc](https://github.com/OP-TED/eforms-docs).
98

10-
Please note: in this release, the website is a single HTML page containing all the documentation.
11-
In the next release, the website will have separate HTML pages for each major section of the documentation.
129

13-
## Changes to the eForms schema
10+
## eForms schema
1411

15-
### Elements used to describe changes in a Change Notice and a Contract Modification Notice
16-
The elements in a Change Notice and a Contract Modification Notice were remodelled to better reflect the usage of Change Notices.
17-
* Element efac:Change was renamed to efac:Changes, and its cardinality restricted to "0 or 1".
18-
* Element efac:ChangedElement was renamed to efac:Change.
19-
* The cardinality of element efbc:ChangedSectionIdentifier was expanded to "0 to many".
20-
* The elements efbc:ProcurementDocumentChangeIndicator and efbc:ProcurementDocumentChangeDate were moved to occur inside element efac:Change.
21-
* The cardinality of element efac:ChangeReason was restricted to "0 or 1".
12+
* Add new elements for the identifiers of contracts and tenders used by the buyer (efac:ContractReference and efac:TenderReference).
13+
* Add missing efac:FieldsPrivacy​ under efac:ReceivedSubmissionsStatistics, to allow indicating that this information is not public.
14+
* Allow multiple occurrences of the contract title, so that it can be indicated in more than one language.
2215

23-
### Removed unused elements
24-
The elements efbc:PaidAmount and efbc:ReasonCode were removed from the schema as they were not being used.
2516

26-
## Changes to the schematron rules
17+
## Schematron rules
2718
The schematron rules have been updated to reflect the schema changes listed above, along with numerous improvements and corrections.
2819

29-
### Requiring use of time zones
30-
All dates or times specified in Notices must now include time zones. This is to ensure consistency, understanding and fairness in the published Notices.
20+
### Addition of conditional rules
21+
New rules have been added for information that must be present under certain conditions. These rules corresponding to the indication "CM" in the extended annex to the eForms Regulation.
22+
23+
In an upcoming version we will also add rules for information that must not be present under certain conditions.
24+
25+
### Addition of warnings
26+
For information that must be present if it exists, we have added rules that will indicate a warning (with `role="WARN"`) if the information is not present. These rules corresponding to the indication "EM" in the extended annex to the eForms Regulation.
27+
28+
### New rules enforcing consistency between values
29+
New rules have been added to check the consistency of the values indicated for:
30+
* dates for various steps in the procurement process
31+
* contract duration
32+
* number of lots allowed and awarded
33+
* highest and lowest tender value
3134

32-
## New rules enforcing use of code lists
33-
Many elements are used to define indicators or codes. The content of these elements should be limited to one of a set of values in each case. Code lists, taken from or derived from those published in [EU Vocabularies](https://op.europa.eu/en/web/eu-vocabularies/e-procurement/tables), define the acceptable values. New schematron rules have been added to restrict the content of many elements to the values in the relevant code lists. Please note this work is incomplete; more such rules will be implemented in future releases of this SDK.
35+
### New rules on languages used
36+
For textual information that can be indicated in multiple languages, new rules check the consistency of the languages used with the notice official languages (BT-702).
3437

35-
### New pattern-matching rules
36-
New schematron rules have been implemented which check that the content of some elements match specific patterns. These elements and patterns are listed in section "9. Identifiers and References" in the schema documentation.
37-
* Elements within the Notice Information section at the beginning of a Notice, identifying the UBL and Customization versions, the Notice Identifier, and the publication identifiers.
38-
* Elements identifying sections within a Notice, and elements which link to those sections.
39-
* Elements referencing previous Notices must use either the Publication Identifier or a combination of the Notice Identifier plus the Notice Version of the Notice being referred to.
38+
### Length restrictions on numerical values
39+
Rules that limit the number of characters for numerical values have been removed. They will be re-added in the future in the form of minimum and maximum allowed values.
40+
41+
### Corrections
42+
Several rules requiring the presence of specific parties (mediator, eSender, etc.) have been corrected.
4043

41-
### New length restrictions
42-
New schematron rules have been added which restrict the maximum length of the content of most elements. The limits chosen have been generous, and should not hinder notice creators from including sufficient details.
4344

4445
## Example Notices
4546
The XML notices in the "examples" folder have been updated to incorporate the schema changes listed above, and the updated schematron rules.
4647

47-
### Codes used for Exclusion Grounds
48-
The code list for Exclusion Grounds used in ESPD has been adopted into eForms. The notice examples have been updated to use these codes.
48+
A new notice example was added for a Contract Award Notice with multiple buyers.
49+
50+
The validation reports have been regenerated, incorporating all the changes listed above.
51+
52+
53+
## Fields
54+
The SDK now includes information on the fields that compose an eForms notice, in a structured format (JSON).
4955

50-
New Notice examples were added for:
51-
* PIN, Contract Notice and Contract Award Notice under Directive 2009/81/EC
56+
You can find more information about this in the [corresponding section of the documentation](https://docs.ted.europa.eu/eforms/0.4.0/fields/).
5257

53-
## Validation Reports
54-
The existing validation reports have been regenerated, incorporating all the changes listed above.
5558

56-
New validation reports have been generated for the new example notices listed above.
59+
## Translations
60+
The SDK now includes the translations of various labels and short texts used in eForms notices.
5761

62+
You can find more information about this in the [corresponding section of the documentation](https://docs.ted.europa.eu/eforms/0.4.0/translations/).

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ This project aims to provide the necessary tools for being able to build valid e
1010
It is composed of the following:
1111
- `schemas`: This folder contains a provisional release of the schemas. There are based on Pre-Award document types of the [UBL 2.3 standard](https://docs.oasis-open.org/ubl/UBL-2.3.html).
1212
The adopted approach is to keep the whole set of UBL elements but only support the use of a subset. It provides the advantage of having the rules outside of the schema. Adding extra fields for which a UBL element already exists will not require the definition of a new schema.
13-
- `docs`: This folder contains source files in Asciidoc format for the eForms documentation. The documentation is in English and provides explanations and snippets in addition to the schema. The documentation is available in readable HTML format from https://docs.ted.europa.eu.
1413
- `schematrons`: This folder contains Schematron rules which are used to check the validity of notices as per the eForms regulation. Any kind of rule or constraint is implemented in Schematron.
1514
- `examples`: This folder contains some notice examples together with their validation report in SVRL.
15+
- `fields`: This folder contains information on the fields that compose an eForms notice.
16+
- `translations`: This folder contains translations of various labels and short texts used in eForms notices.
17+
18+
The documentation is available at https://docs.ted.europa.eu.
1619

1720
# Versioning
1821

examples/notices/INVALID_can_24_stage-2.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<efbc:StatisticsCode listName="received-submission-type"></efbc:StatisticsCode>
1414
<efbc:StatisticsNumeric>0</efbc:StatisticsNumeric>
1515
</efac:ReceivedSubmissionsStatistics>
16+
<efac:SettledContract>
17+
<cbc:ID></cbc:ID>
18+
</efac:SettledContract>
1619
<efac:TenderLot>
1720
<cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
1821
</efac:TenderLot>
@@ -25,9 +28,15 @@
2528
<efac:TenderingParty>
2629
<cbc:ID></cbc:ID>
2730
</efac:TenderingParty>
31+
<efac:TenderReference>
32+
<cbc:ID></cbc:ID>
33+
</efac:TenderReference>
2834
</efac:LotTender>
2935
<efac:SettledContract>
3036
<cbc:ID></cbc:ID>
37+
<efac:ContractReference>
38+
<cbc:ID></cbc:ID>
39+
</efac:ContractReference>
3140
<efac:LotTender>
3241
<cbc:ID></cbc:ID>
3342
</efac:LotTender>
@@ -73,7 +82,7 @@
7382
</ext:UBLExtension>
7483
</ext:UBLExtensions>
7584
<cbc:UBLVersionID>2.3</cbc:UBLVersionID>
76-
<cbc:CustomizationID>eforms-sdk-0.3</cbc:CustomizationID>
85+
<cbc:CustomizationID>eforms-sdk-0.4</cbc:CustomizationID>
7786
<cbc:ID></cbc:ID>
7887
<cbc:ContractFolderID></cbc:ContractFolderID>
7988
<cbc:IssueDate>2020-01-23+01:00</cbc:IssueDate>
@@ -109,6 +118,7 @@
109118
<cac:ProcurementProject>
110119
<cbc:Name languageID="FRA"></cbc:Name>
111120
<cbc:Description languageID="FRA"></cbc:Description>
121+
<cbc:ProcurementTypeCode listName="contract-nature"></cbc:ProcurementTypeCode>
112122
</cac:ProcurementProject>
113123
<cac:ProcurementProjectLot>
114124
<cbc:ID schemeName="Lot"></cbc:ID>
@@ -123,6 +133,9 @@
123133
</cac:AwardingCriterion>
124134
</cac:AwardingTerms>
125135
<cac:AppealTerms>
136+
<cac:PresentationPeriod>
137+
<cbc:Description languageID="FRA"></cbc:Description>
138+
</cac:PresentationPeriod>
126139
<cac:AppealReceiverParty>
127140
<cac:PartyIdentification>
128141
<cbc:ID></cbc:ID>
@@ -150,6 +163,7 @@
150163
<cac:ProcurementProject>
151164
<cbc:Name languageID="FRA"></cbc:Name>
152165
<cbc:Description languageID="FRA"></cbc:Description>
166+
<cbc:ProcurementTypeCode listName="contract-nature"></cbc:ProcurementTypeCode>
153167
</cac:ProcurementProject>
154168
</cac:ProcurementProjectLot>
155169
<cac:TenderResult>

examples/notices/INVALID_cn_24_stage-2.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</ext:UBLExtension>
4040
</ext:UBLExtensions>
4141
<cbc:UBLVersionID>2.3</cbc:UBLVersionID>
42-
<cbc:CustomizationID>eforms-sdk-0.3</cbc:CustomizationID>
42+
<cbc:CustomizationID>eforms-sdk-0.4</cbc:CustomizationID>
4343
<cbc:ID></cbc:ID>
4444
<cbc:ContractFolderID></cbc:ContractFolderID>
4545
<cbc:IssueDate>2000-01-01+01:00</cbc:IssueDate>
@@ -83,6 +83,7 @@
8383
<cac:ProcurementProject>
8484
<cbc:Name languageID="ENG"></cbc:Name>
8585
<cbc:Description languageID="ENG"></cbc:Description>
86+
<cbc:ProcurementTypeCode listName="contract-nature"></cbc:ProcurementTypeCode>
8687
</cac:ProcurementProject>
8788
<cac:ProcurementProjectLot>
8889
<cbc:ID schemeName="Lot"></cbc:ID>
@@ -118,7 +119,15 @@
118119
<cac:ContractExecutionRequirement>
119120
<cbc:ExecutionRequirementCode listName="ecatalog-submission"></cbc:ExecutionRequirementCode>
120121
</cac:ContractExecutionRequirement>
122+
<cac:TenderRecipientParty>
123+
<cac:PartyIdentification>
124+
<cbc:ID></cbc:ID>
125+
</cac:PartyIdentification>
126+
</cac:TenderRecipientParty>
121127
<cac:AppealTerms>
128+
<cac:PresentationPeriod>
129+
<cbc:Description languageID="ENG"></cbc:Description>
130+
</cac:PresentationPeriod>
122131
<cac:AppealReceiverParty>
123132
<cac:PartyIdentification>
124133
<cbc:ID></cbc:ID>
@@ -154,6 +163,7 @@
154163
<cac:ProcurementProject>
155164
<cbc:Name languageID="ENG"></cbc:Name>
156165
<cbc:Description languageID="ENG"></cbc:Description>
166+
<cbc:ProcurementTypeCode listName="contract-nature"></cbc:ProcurementTypeCode>
157167
</cac:ProcurementProject>
158168
</cac:ProcurementProjectLot>
159169
</ContractNotice>

examples/notices/can-modif_24_duration.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,28 @@
4343
<efac:TenderingParty>
4444
<cbc:ID schemeName="tendering-party">TPA-0001</cbc:ID>
4545
</efac:TenderingParty>
46+
<efac:TenderReference>
47+
<cbc:ID>BID/BSO/2000-03</cbc:ID>
48+
</efac:TenderReference>
4649
</efac:LotTender>
4750
<efac:SettledContract>
4851
<cbc:ID schemeName="contract">CON-0001</cbc:ID>
4952
<cbc:AwardDate>2010-07-22+02:00</cbc:AwardDate>
5053
<cbc:IssueDate>2010-09-07+02:00</cbc:IssueDate>
5154
<cbc:Title languageID="ENG">Automated Laboratory Medicine Systems.</cbc:Title>
55+
<cac:SignatoryParty>
56+
<cac:PartyIdentification>
57+
<cbc:ID schemeName="organisation">ORG-0001</cbc:ID>
58+
</cac:PartyIdentification>
59+
</cac:SignatoryParty>
60+
<cac:SignatoryParty>
61+
<cac:PartyIdentification>
62+
<cbc:ID schemeName="organisation">ORG-0005</cbc:ID>
63+
</cac:PartyIdentification>
64+
</cac:SignatoryParty>
65+
<efac:ContractReference>
66+
<cbc:ID>BSO/2010/REV-01</cbc:ID>
67+
</efac:ContractReference>
5268
<efac:LotTender>
5369
<cbc:ID schemeName="tender">TEN-0001</cbc:ID>
5470
</efac:LotTender>
@@ -195,7 +211,7 @@
195211
</ext:UBLExtension>
196212
</ext:UBLExtensions>
197213
<cbc:UBLVersionID>2.3</cbc:UBLVersionID>
198-
<cbc:CustomizationID>eforms-sdk-0.3</cbc:CustomizationID>
214+
<cbc:CustomizationID>eforms-sdk-0.4</cbc:CustomizationID>
199215
<cbc:ID>1f8687c9-8cca-493a-b0ee-553ed23d8402</cbc:ID>
200216
<cbc:ContractFolderID>b492c659-4893-4796-b7db-4e511d85e0c8</cbc:ContractFolderID>
201217
<cbc:IssueDate>2010-10-07+01:00</cbc:IssueDate>

examples/notices/can-modif_24_value.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,27 @@
3636
<efac:TenderingParty>
3737
<cbc:ID schemeName="tendering-party">TPA-0001</cbc:ID>
3838
</efac:TenderingParty>
39+
<efac:TenderReference>
40+
<cbc:ID>CHG/2021/PWC</cbc:ID>
41+
</efac:TenderReference>
3942
</efac:LotTender>
4043
<efac:SettledContract>
4144
<cbc:ID schemeName="contract">CON-0001</cbc:ID>
4245
<cbc:AwardDate>2018-07-31+02:00</cbc:AwardDate>
4346
<cbc:IssueDate>2018-08-02+02:00</cbc:IssueDate>
47+
<cac:SignatoryParty>
48+
<cac:PartyIdentification>
49+
<cbc:ID schemeName="organisation">ORG-0001</cbc:ID>
50+
</cac:PartyIdentification>
51+
</cac:SignatoryParty>
52+
<cac:SignatoryParty>
53+
<cac:PartyIdentification>
54+
<cbc:ID schemeName="organisation">ORG-0004</cbc:ID>
55+
</cac:PartyIdentification>
56+
</cac:SignatoryParty>
57+
<efac:ContractReference>
58+
<cbc:ID>MOD/CON/02-CHG/2021/PWC</cbc:ID>
59+
</efac:ContractReference>
4460
</efac:SettledContract>
4561
<efac:TenderingParty>
4662
<cbc:ID schemeName="tendering-party">TPA-0001</cbc:ID>
@@ -178,7 +194,7 @@
178194
</ext:UBLExtension>
179195
</ext:UBLExtensions>
180196
<cbc:UBLVersionID>2.3</cbc:UBLVersionID>
181-
<cbc:CustomizationID>eforms-sdk-0.3</cbc:CustomizationID>
197+
<cbc:CustomizationID>eforms-sdk-0.4</cbc:CustomizationID>
182198
<cbc:ID>3572a106-eb30-4c7a-8ac5-b3502f71742a</cbc:ID>
183199
<cbc:ContractFolderID>8e8b5cf4-595b-4562-85b0-7c79922cb330</cbc:ContractFolderID>
184200
<cbc:IssueDate>2018-08-02+01:00</cbc:IssueDate>

0 commit comments

Comments
 (0)