Merge pull request #9 from OP-TED/develop

Develop
OP-TED · Jul 28, 2022 · 05c978f · 05c978f
2 parents ffd43b2 + ab915d7
commit 05c978f
Show file tree

Hide file tree

Showing 63 changed files with 20,083 additions and 1,999 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,17 @@
-# TED XML Data Converter 0.3.0 Release Notes
-Below is a list of the updates made to the Converter repository in this release. 
 
-## Contract Notices
-Templates have been added to convert elements in TED XML Contract Notice forms F05, F12, F21, F22, F23, F24
+# TED XML Data Converter 0.4.0 Release Notes
 
-## Bug fixes and minor changes
+## Contract Award Notices - TED form F03
 
-* Missing listName attributes have been added, and some listName attribute values have been corrected.
-* Additional CPV codes are now included
-* TED XML element ADDRESS_FURTHER_INFO_IDEM included in conversion
-* NUTS2021 codes are now included
-* Country codes are now converted from 2-letter codes in TED XML to 3-letter codes from "Countries" codelist in eForms XML
-* Namespace declarations are now harmonised across all XSLT files
+The majority of changes included in this release are for the conversion of TED form F03, a Contract Award Notice. A new XSLT stylesheet, notice-result.xslt, has been created for this.
+
+New mappings for "direct-award-justification", "non-award-justification" and "received-submission-type" have been added to other-mappings.xslt 
+
+
+## Minor changes
+
+Minor fixes for:
+* Buyer Legal Type (BT-11)
+* Buyer Contracting Entity (BT-740)
+* Electronic Auction (BT-767)
+* PIN Competition Termination (BT-756)
diff --git a/README.md b/README.md
@@ -48,9 +48,11 @@ The versioning scheme which will be adopted for the TED XML Data Converter will
 
 Feedback on this converter is welcome. Please address questions, comments and bug reports using [Github Discussions](https://github.com/OP-TED/ted-xml-data-converter/discussions).
 
-## Current status
-All Contract Notice TED XML forms (F02, F05, F12, F21, F22, F23 and F24) are supported. See [usage-information.md](usage-information.md) for more details.
 
-Work will begin on Contract Award notice forms in the near future.
+## What's next?
+All Contract Notice TED XML forms (F02, F05, F12, F21, F22, F23 and F24) are convertible.
 
+The F03 Contract Award Notice form is convertible.
+
+Work will begin on the remaining Contract Award notice forms (F06, F13, F15, F21, F22, F23, F24 and F25) in the near future.
 
diff --git a/development-notices/README.md b/development-notices/README.md
@@ -37,6 +37,17 @@ This table lists the TED XML files selected to test development of the Converter
 | 353820_2021.xml | F02 | CN |  |  |
 | 352444_2021.xml | F02 | CN |  |  |
 | 352458_2021.xml | F02 | CN |  |  |
+| 354625_2021.xml | F12 | CN |  |  |
+| 354626_2021.xml | F12 | CN |  |  |
+| 354823_2021.xml | F12 | CN |  |  |
+| 352425_2021.xml | F03 | CAN | Contract award | PT_AWARD_CONTRACT_WITHOUT_CALL |
+| 353237_2021.xml | F03 | CAN | Contract award | TERMINATION_PIN |
+| 20-157399-001-EXP.xml | F03 | CAN | SettledContract | No DPS, no FRAMEWORK |
+| 20-157543-001-EXP.xml | F03 | CAN | SettledContract | FRAMEWORK |
+| 22-086633-001-EXP.xml | F03 | CAN | SettledContract | Multiple AWARD_CONTRACT collated into one SettledContract |
+| 22-091559-001-EXP.xml | F03 | CAN | SettledContract | NO_AWARDED_CONTRACT |
+
+
 
 
 
diff --git a/development-notices/eforms-xml/20-155018-001-EXP.xml b/development-notices/eforms-xml/20-155018-001-EXP.xml
@@ -15,11 +15,12 @@
                <efac:NoticeSubType>
                   <cbc:SubTypeCode listName="notice-subtype">4</cbc:SubTypeCode>
                </efac:NoticeSubType>
-               <!-- efac:Organizations here -->
+               <!-- efac:Organizations -->
                <efac:Organizations>
                   <efac:Organization><!--Organization Subrole (BT-770) : Group leader (Buyer)--><!--Organization Role : Acquiring CPB-->
                      <efac:Company><!--Organization Internet Address (BT-505)-->
                         <cbc:WebsiteURI>www.veitshoechheim.de</cbc:WebsiteURI>
+                        <!--Winner Size (BT-165)-->
                         <!--Organization Technical Identifier (OPT-200)-->
                         <cac:PartyIdentification>
                            <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
@@ -52,7 +53,7 @@
                      </efac:Company>
                   </efac:Organization>
                </efac:Organizations>
-               <!-- efac:Publication here -->
+               <!-- efac:Publication -->
                <efac:Publication><!--Notice Publication ID (OPP-010)-->
                   <efbc:NoticePublicationID schemeName="ojs-notice-id">12345678-2023</efbc:NoticePublicationID>
                   <!--OJEU Identifier (OPP-011)-->
@@ -84,21 +85,20 @@
    <cbc:NoticeTypeCode listName="competition">cn-standard</cbc:NoticeTypeCode>
    <!--Notice Official Language (BT-702) (first)-->
    <cbc:NoticeLanguageCode>DEU</cbc:NoticeLanguageCode>
-   <!-- cac:ContractingParty here -->
-   <cac:ContractingParty><!--Buyer Profile URL (BT-508)--><!--Buyer Legal Type (BT-11) and Buyer Contracting Entity (BT-740)--><!--Buyer Legal Type (BT-11)-->
+   <!-- cac:ContractingParty -->
+   <cac:ContractingParty><!--Buyer Profile URL (BT-508)--><!--Buyer Legal Type (BT-11)-->
       <cac:ContractingPartyType>
          <cbc:PartyTypeCode listName="buyer-legal-type">ra</cbc:PartyTypeCode>
       </cac:ContractingPartyType>
       <!--Buyer Contracting Entity (BT-740)-->
-      <!--WARNING: "Buyer contracting type" codelist not yet available. Value "not-cont-ent" used as a default-->
       <cac:ContractingPartyType>
          <cbc:PartyTypeCode listName="buyer-contracting-type">not-cont-ent</cbc:PartyTypeCode>
       </cac:ContractingPartyType>
-      <!--Activity Authority (BT-10) and Activity Entity (BT-610)-->
       <!--Activity Authority (BT-10)-->
       <cac:ContractingActivity>
          <cbc:ActivityTypeCode listName="authority-activity">gen-pub</cbc:ActivityTypeCode>
       </cac:ContractingActivity>
+      <!--Activity Entity (BT-610)-->
       <cac:Party><!--Buyer Technical Identifier Reference (OPT-300)-->
          <cac:PartyIdentification>
             <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
@@ -112,9 +112,9 @@
          <!--Reference (Technical ID) to the legal organization acting as a Buyer.-->
       </cac:Party>
    </cac:ContractingParty>
-   <!-- cac:TenderingTerms here -->
+   <!-- cac:TenderingTerms -->
    <cac:TenderingTerms><!--Cross Border Law (BT-09)--><!--BT-01 Legal Basis Local - Text--><!--Exclusion Grounds (BT-67)--><!--Lots Max Awarded (BT-33)--><!--Lots Max Allowed (BT-31)--><!--Group Identifier (BT-330)--><!--Group Lot Identifier (BT-1375)--></cac:TenderingTerms>
-   <!-- cac:TenderingProcess here -->
+   <!-- cac:TenderingProcess -->
    <cac:TenderingProcess>
       <ext:UBLExtensions>
          <ext:UBLExtension>
@@ -133,7 +133,7 @@
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
    </cac:TenderingProcess>
-   <!-- cac:ProcurementProject here -->
+   <!-- cac:ProcurementProject -->
    <cac:ProcurementProject><!--Internal Identifier (BT-22)--><!--Title (BT-21)-->
       <cbc:Name languageID="DEU">Gemeinde Veitshöchheim, Sportplatzbauarbeiten an der Freisportanlage</cbc:Name>
       <!--Description (BT-24)-->
@@ -155,44 +155,12 @@
       <!--Place Performance Street (BT-5101)-->
       <!--Place Performance Country Code (BT-5141)-->
    </cac:ProcurementProject>
-   <!-- multiple cac:ProcurementProjectLot here -->
-   <cac:ProcurementProjectLot><!--Only one Lot in the TED notice-->
-      <cbc:ID schemeName="Lot">LOT-0001</cbc:ID>
-      <!-- Lot cac:TenderingTerms here -->
-      <cac:TenderingTerms>
-         <ext:UBLExtensions>
-            <ext:UBLExtension>
-               <ext:ExtensionContent>
-                  <efext:EformsExtension><!--Selection Criteria Second Stage Invite (BT-40)--><!--Selection Criteria Second Stage Invite Number Weight (BT-7531)--><!--Selection Criteria Second Stage Invite Number Threshold (BT-7532)--><!--Selection Criteria Second Stage Invite Number (BT-752)--></efext:EformsExtension>
-               </ext:ExtensionContent>
-            </ext:UBLExtension>
-         </ext:UBLExtensions>
-         <!--Variants (BT-63)-->
-         <!--EU Funds (BT-60)-->
-         <!--Performing Staff Qualification (BT-79)-->
-         <!--Recurrence (BT-94)-->
-         <!--Recurrence Description (BT-95)-->
-         <!--Security Clearance Deadline (BT-78)-->
-         <!--Multiple Tenders (BT-769)-->
-         <!--Documents Restricted Justification (BT-707)-->
-         <!--Documents Official Language (BT-708)-->
-         <!--Documents Unofficial Language (BT-737)-->
-         <!--Terms Financial (BT-77)-->
-         <!--Reserved Participation (BT-71)-->
-         <!--Reserved Participation (BT-71)-->
-         <!--Tenderer Legal Form (BT-761)-->
-         <!--Tenderer Legal Form Description (BT-76)-->
-         <!--Late Tenderer Information (BT-771)-->
-         <!--Subcontracting Tender Indication (BT-651)-->
-         <!--Subcontracting Obligation (BT-65)-->
-         <!--Subcontracting Obligation Maximum (BT-729)-->
-         <!--Subcontracting Obligation Minimum (BT-64)-->
-         <!--Reserved Execution (BT-736)-->
-         <!--Electronic Invoicing (BT-743)-->
-         <!--Terms Performance (BT-70)-->
-         <!--Submission Electronic Catalog (BT-764)-->
-         <!--Submission Electronic Signature (BT-744)-->
-         <cac:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--*** start of cac:AwardingCriterion ***--><!--Award Criteria Order Justification (BT-733)--><!--Award Criteria Complicated (BT-543)--><!--Award Criterion Number Weight (BT-5421)--><!--Award Criterion Number Fixed (BT-5422)--><!--Award Criterion Number Threshold (BT-5423)--><!--Award Criterion Number (BT-541)--><!--Award Criterion Type (BT-539)--><!--Award Criterion Name (BT-734)--><!--Award Criterion Description (BT-540)--><!--*** end of cac:AwardingCriterion ***--><!--Jury Member Name (BT-46)--><!--Prize information (Prize Rank (BT-44), Rewards Other (BT-45), Value Prize (BT-644))--></cac:AwardingTerms>
+   <!-- multiple cac:ProcurementProjectLot -->
+   <cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!--Only one Lot in the TED notice-->
+      <cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
+      <!-- Lot cac:TenderingTerms -->
+      <cac:TenderingTerms><!--Selection Criteria Type (BT-747)--><!--Selection Criteria Name (BT-749)--><!--Selection Criteria Description (BT-750)--><!--Selection Criteria Used (BT-748)--><!--Selection Criteria Second Stage Invite (BT-40)--><!--Selection Criteria Second Stage Invite Number Weight (BT-7531)--><!--Selection Criteria Second Stage Invite Number Threshold (BT-7532)--><!--Selection Criteria Second Stage Invite Number (BT-752)--><!--Variants (BT-63)--><!--EU Funds (BT-60)--><!--Performing Staff Qualification (BT-79)--><!--Recurrence (BT-94)--><!--Recurrence Description (BT-95)--><!--Security Clearance Deadline (BT-78)--><!--Multiple Tenders (BT-769)--><!--Documents Restricted Justification (BT-707)--><!--Documents Official Language (BT-708)--><!--Documents Unofficial Language (BT-737)--><!--Terms Financial (BT-77)--><!--Reserved Participation (BT-71)--><!--Reserved Participation (BT-71)--><!--Tenderer Legal Form (BT-761)--><!--Tenderer Legal Form Description (BT-76)--><!--Late Tenderer Information (BT-771)--><!--Subcontracting Tender Indication (BT-651)--><!--Subcontracting Obligation (BT-65)--><!--Subcontracting Obligation Maximum (BT-729)--><!--Subcontracting Obligation Minimum (BT-64)--><!--Reserved Execution (BT-736)--><!--Electronic Invoicing (BT-743)--><!--Terms Performance (BT-70)--><!--Submission Electronic Catalog (BT-764)--><!--Submission Electronic Signature (BT-744)-->
+         <cac:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--Award Criteria Order Justification (BT-733)--><!--Award Criteria Complicated (BT-543)--><!--Award Criterion Number Weight (BT-5421)--><!--Award Criterion Number Fixed (BT-5422)--><!--Award Criterion Number Threshold (BT-5423)--><!--Award Criterion Number (BT-541)--><!--Award Criterion Type (BT-539)--><!--Award Criterion Name (BT-734)--><!--Award Criterion Description (BT-540)--><!--Jury Member Name (BT-46)--><!--Prize information (Prize Rank (BT-44), Rewards Other (BT-45), Value Prize (BT-644))--></cac:AwardingTerms>
          <cac:AdditionalInformationParty>
             <cac:PartyIdentification>
                <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
@@ -201,18 +169,16 @@
          <!--Submission URL (BT-18)-->
          <!--Tender Validity Deadline (BT-98)-->
          <!--Review Deadline Description (BT-99)-->
-         <!--*** start of cac:AppealTerms ***-->
          <!--cac:PresentationPeriod: Review Deadline Description (BT-99)-->
          <!--cac:AppealInformationParty: Review Information Providing Organization-->
          <!--cac:AppealReceiverParty: Review organization-->
          <!--cac:MediationParty: Mediation organization-->
-         <!--*** end of cac:AppealTerms ***-->
          <!--Submission Language (BT-97)-->
          <!--Participant Name (BT-47)-->
          <!--Security Clearance Code (BT-578)-->
          <!--Security Clearance Description (BT-732)-->
       </cac:TenderingTerms>
-      <!-- cac:TenderingProcess here -->
+      <!-- cac:TenderingProcess -->
       <cac:TenderingProcess>
          <ext:UBLExtensions>
             <ext:UBLExtension>
@@ -249,7 +215,7 @@
          <!--Framework Agreement (BT-765)-->
          <!--Dynamic Purchasing System (BT-766)-->
       </cac:TenderingProcess>
-      <!-- cac:ProcurementProject here -->
+      <!-- cac:ProcurementProject -->
       <cac:ProcurementProject><!--Internal Identifier (BT-22)--><!--WARNING: Internal ID (BT-22) is required but there is no equivalent element in TED XML.-->
          <cbc:ID schemeName="InternalID"/>
          <!--Title (BT-21)-->