Merge pull request #741 from OP-TED/prepare/1.8.1

Prepare SDK 1.8.1
OP-TED · Oct 27, 2023 · 6612ac9 · 6612ac9
2 parents 695ec7e + 461dbd3
commit 6612ac9
Show file tree

Hide file tree

Showing 292 changed files with 177,977 additions and 33,928 deletions.
diff --git a/.ted/teden2/snippets/default-values.json b/.ted/teden2/snippets/default-values.json
@@ -111,11 +111,12 @@
          "displayType":"TEXTAREA"
       },
       {
-         "groupId":"GR-Part",
+         "id":"GR-Part",
          "contentType":"group",
          "_label":"group|name|ND-Part",
          "description":"Part",
-         "fields":[
+         "displayType":"GROUP",
+         "content":[
             {
                "id":"BT-708-Part",
                "contentType":"field",
@@ -127,11 +128,12 @@
          ]
       },
       {
-         "groupId":"GR-Lot",
+         "id":"GR-Lot",
          "contentType":"group",
          "_label":"group|name|ND-Lot",
          "description":"Lot",
-         "fields":[
+         "displayType":"GROUP",
+         "content":[
             {
                "id":"BT-708-Lot",
                "contentType":"field",
@@ -151,4 +153,4 @@
          ]
       }
    ]
-}
+}
diff --git a/.ted/tedweb/report-metadata.json b/.ted/tedweb/report-metadata.json
@@ -1,22 +1,22 @@
 {
 	"CA": {
-		"efx": "{ND-Root} ${/BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-Buyer]}",
+		"efx": "{ND-Root} ${/BT-500-Organization-Company[(BT-500-Organization-Company/@languageID is not empty) and (OPT-200-Organization-Company == OPT-300-Procedure-Buyer)]}",
 		"comment": "Buyer name"
 	},
 	"CN": {
 		"efx": "{ND-Root, text:$vRES} ${/BT-150-Contract[OPT-316-Contract == OPT-315-LotResult[BT-13713-LotResult == '$vRES']]}",
 		"comment": "List of 'Contract Identifier' of the result of a specific Result"
 	},
 	"CT": {
-		"efx": "{ND-Root, text:$vRES} ${/BT-721-Contract[OPT-316-Contract == OPT-315-LotResult [BT-13713-LotResult == '$vRES']]}",
+		"efx": "{ND-Root, text:$vRES} ${/BT-721-Contract[(BT-721-Contract/@languageID is not empty) and (OPT-316-Contract == OPT-315-LotResult [BT-13713-LotResult == '$vRES'])]}",
 		"comment": "List of 'name of Contract' of the result of a specific result"
 	},
 	"Con_award_list": {
 		"efx": "{ND-Root, text:$vRES} ${/OPT-310-Tender[(OPT-321-Tender == OPT-320-LotResult[BT-13713-LotResult == '$vRES']) and (OPT-321-Tender == BT-3202-Contract)]}",
 		"comment": "Tendering Party ID Reference of a specific result"
 	},
 	"Con_award_names": {
-		"efx": "{ND-Root, text:$vTPA} ${/BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == '$vTPA']]}",
+		"efx": "{ND-Root, text:$vTPA} ${/BT-500-Organization-Company[(BT-500-Organization-Company/@languageID is not empty) and (OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == '$vTPA'])]}",
 		"comment": "Contractor awarded (winning tenderer)"
 	},
 	"Currency": {
@@ -60,7 +60,7 @@
 		"comment": "Procedure Type"
 	},
 	"TN": {
-		"efx": "{ND-Root}  ${/BT-21-Procedure}",
+		"efx": "{ND-Root}  ${/BT-21-Procedure[BT-21-Procedure/@languageID is not empty]}",
 		"comment": "Procurement title"
 	},
 	"NoticePublicationID": {

diff --git a/.ted/tedweb/search-metadata.json b/.ted/tedweb/search-metadata.json
@@ -132,7 +132,7 @@
 		"comment": "Languages in which tenders may be submitted"
 	},
 	"TI-Title": {
-		"efx": "{ND-Root} ${/BT-21-Procedure}",
+		"efx": "{ND-Root} ${/BT-21-Procedure[BT-21-Procedure/@languageID is not empty]}",
 		"comment": "(TI) Title (Title of the document)"
 	},
 	"TI-CPV": {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# SDK 1.8.1 Release Notes
+
+This release brings the following corrections in the validation rules, making them more permissive:
+
+* Remove 3 rules (BR-BT-00262-0211, BR-BT-00262-0212, and BR-BT-00262-0213) so there is no constraint on the nature (works, services or supplies) of subsidised contracts.
+* Remove incorrect rule on BT-137-LotsGroup and framework agreements.
+* Remove mandatory constraints on BT-132 for notice subtype 16 and 17 were incorrect.
+* Remove redundant rule checking that preferred publication date is after the dispatch date.
+* Correct rule BR-BT-00738-0053 to allow the preferred publication date (BT-738) to be equal to the dispatch date (BT-05).
+
+This release also includes updated translations and updated notice visualisation templates.
+
+A comprehensive list of changes between SDK 1.8.0 and SDK 1.8.1 can be seen at <https://github.com/OP-TED/eForms-SDK/compare/1.8.0...1.8.1>
+
 # SDK 1.8.0 Release Notes
 
 This release of the SDK does not contain any backwards incompatible changes: software that was able to use version 1.7.0 should also be able to use this version.

diff --git a/fields/fields.json b/fields/fields.json
@@ -1,6 +1,6 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "eforms-sdk-1.8.0",
+  "sdkVersion" : "eforms-sdk-1.8.1",
   "metadataDatabase" : {
     "version" : "1.8.0",
     "createdOn" : "2023-07-21T15:00:00"
@@ -2216,15 +2216,6 @@
     "pattern" : {
       "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-Root} ${(BT-05(a)-notice < BT-738-notice) or not(BT-738-notice is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00005-0150"
-      } ]
     }
   }, {
     "id" : "BT-05(b)-notice",
@@ -3549,15 +3540,6 @@
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16", "17" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "pattern" : {
       "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
@@ -3605,15 +3587,6 @@
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16", "17" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "pattern" : {
       "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
@@ -3900,10 +3873,6 @@
         "value" : "{ND-LotsGroup} ${BT-137-LotsGroup is unique in /BT-137-LotsGroup}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00137-0203"
-      }, {
-        "value" : "{ND-LotsGroup} ${number:BT-157-LotsGroup <= sum(for text:$groupID in BT-137-LotsGroup, number:$lotValue in BT-27-Lot[BT-137-Lot in BT-1375-Procedure[(BT-330-Procedure == $groupID) and (BT-765-Lot in ('fa-mix','fa-w-rc','fa-wo-rc'))]] return $lotValue)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0204"
       }, {
         "value" : "{ND-LotsGroup} ${(BT-137-LotsGroup in BT-330-Procedure)}",
         "severity" : "ERROR",
@@ -13627,11 +13596,6 @@
         "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00262-0209"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0212"
       } ]
     }
   }, {
@@ -13696,11 +13660,6 @@
         "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00262-0210"
-      }, {
-        "condition" : "{ND-PartProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0213"
       } ]
     }
   }, {
@@ -13775,11 +13734,6 @@
         "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00262-0208"
-      }, {
-        "condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0211"
       } ]
     }
   }, {
@@ -20820,7 +20774,7 @@
       "severity" : "ERROR",
       "constraints" : [ {
         "condition" : "{ND-Root} ${BT-738-notice is present}",
-        "value" : "{ND-Root} ${((BT-738-notice - BT-05(a)-notice) < P60D) and ((BT-738-notice - BT-05(a)-notice) >= P2D)}",
+        "value" : "{ND-Root} ${((BT-738-notice - BT-05(a)-notice) < P60D) and ((BT-738-notice - BT-05(a)-notice) >= P0D)}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00738-0053"
       } ]

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-sdk</artifactId>
-  <version>1.8.0</version>
+  <version>1.8.1</version>
   <packaging>jar</packaging>
 
   <name>eForms SDK</name>
@@ -48,7 +48,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2023-07-26T10:23:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-10-26T12:38:48Z</project.build.outputTimestamp>
 
     <sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
 

diff --git a/schematrons/dynamic/validation-stage-4.sch b/schematrons/dynamic/validation-stage-4.sch
@@ -1729,14 +1729,10 @@
 		<assert id="BR-BT-00132-0080" role="ERROR" diagnostics="BT-132_t_-Lot" test="count(cbc:OccurrenceTime) = 0 or (../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0080</assert>
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent[$noticeSubType = '16']">
-		<assert id="BR-BT-00132-0022" role="ERROR" diagnostics="BT-132_d_-Lot" test="count(cbc:OccurrenceDate) &gt; 0 or not(../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0022</assert>
-		<assert id="BR-BT-00132-0074" role="ERROR" diagnostics="BT-132_t_-Lot" test="count(cbc:OccurrenceTime) &gt; 0 or not(../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0074</assert>
 		<assert id="BR-BT-00132-0105" role="ERROR" diagnostics="BT-132_d_-Lot" test="count(cbc:OccurrenceDate) = 0 or (../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0105</assert>
 		<assert id="BR-BT-00132-0107" role="ERROR" diagnostics="BT-132_t_-Lot" test="count(cbc:OccurrenceTime) = 0 or (../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0107</assert>
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent[$noticeSubType = '17']">
-		<assert id="BR-BT-00132-0023" role="ERROR" diagnostics="BT-132_d_-Lot" test="count(cbc:OccurrenceDate) &gt; 0 or not(../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0023</assert>
-		<assert id="BR-BT-00132-0075" role="ERROR" diagnostics="BT-132_t_-Lot" test="count(cbc:OccurrenceTime) &gt; 0 or not(../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0075</assert>
 		<assert id="BR-BT-00132-0106" role="ERROR" diagnostics="BT-132_d_-Lot" test="count(cbc:OccurrenceDate) = 0 or (../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0106</assert>
 		<assert id="BR-BT-00132-0108" role="ERROR" diagnostics="BT-132_t_-Lot" test="count(cbc:OccurrenceTime) = 0 or (../../../cac:TenderingProcess/cbc:ProcedureCode/normalize-space(text()) = 'open')">rule|text|BR-BT-00132-0108</assert>
 	</rule>