fields: Fix typo in codition for BT-31-Procedure (TEDEFO-2867)

Also update affected schematron rules.
OP-TED · Mar 27, 2024 · 1243f04 · 1243f04
1 parent d4117b9
commit 1243f04
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/fields/fields.json b/fields/fields.json
@@ -21385,7 +21385,7 @@
       "severity" : "ERROR",
       "constraints" : [ {
         "noticeTypes" : [ "16", "17" ],
-        "condition" : "{ND-ProcedureTerms} ${not(BT-763-Procedure == 'All') and count(/BT-137-Lot) > 1}",
+        "condition" : "{ND-ProcedureTerms} ${not(BT-763-Procedure == 'all') and count(/BT-137-Lot) > 1}",
         "value" : true,
         "severity" : "ERROR"
       } ]

diff --git a/schematrons/dynamic/validation-stage-4-16.sch b/schematrons/dynamic/validation-stage-4-16.sch
@@ -256,7 +256,7 @@
 	</rule>
 	<rule context="/*/cac:TenderingTerms[$noticeSubType = '16']">
 		<assert id="BR-BT-00031-0022" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00031-0022</assert>
-		<assert id="BR-BT-00031-0073" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'All') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0073</assert>
+		<assert id="BR-BT-00031-0073" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'all') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0073</assert>
 	</rule>
 	<rule context="/*/cac:TenderingTerms/cac:LotDistribution[$noticeSubType = '16']">
 		<assert id="BR-BT-00033-0022" role="ERROR" diagnostics="BT-33-Procedure" test="count(cbc:MaximumLotsAwardedNumeric) &gt; 0 or (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00033-0022</assert>

diff --git a/schematrons/dynamic/validation-stage-4-17.sch b/schematrons/dynamic/validation-stage-4-17.sch
@@ -254,7 +254,7 @@
 	</rule>
 	<rule context="/*/cac:TenderingTerms[$noticeSubType = '17']">
 		<assert id="BR-BT-00031-0023" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00031-0023</assert>
-		<assert id="BR-BT-00031-0074" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'All') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0074</assert>
+		<assert id="BR-BT-00031-0074" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'all') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0074</assert>
 	</rule>
 	<rule context="/*/cac:TenderingTerms/cac:LotDistribution[$noticeSubType = '17']">
 		<assert id="BR-BT-00033-0023" role="ERROR" diagnostics="BT-33-Procedure" test="count(cbc:MaximumLotsAwardedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00033-0023</assert>

diff --git a/schematrons/static/validation-stage-4-16.sch b/schematrons/static/validation-stage-4-16.sch
@@ -256,7 +256,7 @@
 	</rule>
 	<rule context="/*/cac:TenderingTerms[$noticeSubType = '16']">
 		<assert id="BR-BT-00031-0022" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00031-0022</assert>
-		<assert id="BR-BT-00031-0073" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'All') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0073</assert>
+		<assert id="BR-BT-00031-0073" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'all') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0073</assert>
 	</rule>
 	<rule context="/*/cac:TenderingTerms/cac:LotDistribution[$noticeSubType = '16']">
 		<assert id="BR-BT-00033-0022" role="ERROR" diagnostics="BT-33-Procedure" test="count(cbc:MaximumLotsAwardedNumeric) &gt; 0 or (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00033-0022</assert>

diff --git a/schematrons/static/validation-stage-4-17.sch b/schematrons/static/validation-stage-4-17.sch
@@ -254,7 +254,7 @@
 	</rule>
 	<rule context="/*/cac:TenderingTerms[$noticeSubType = '17']">
 		<assert id="BR-BT-00031-0023" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00031-0023</assert>
-		<assert id="BR-BT-00031-0074" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'All') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0074</assert>
+		<assert id="BR-BT-00031-0074" role="ERROR" diagnostics="ND-ProcedureTerms_BT-31-Procedure" test="count(cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric) &gt; 0 or not(not(../cac:TenderingProcess/cbc:PartPresentationCode/normalize-space(text()) = 'all') and count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1)">rule|text|BR-BT-00031-0074</assert>
 	</rule>
 	<rule context="/*/cac:TenderingTerms/cac:LotDistribution[$noticeSubType = '17']">
 		<assert id="BR-BT-00033-0023" role="ERROR" diagnostics="BT-33-Procedure" test="count(cbc:MaximumLotsAwardedNumeric) = 0 or not(count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) &lt; 2)">rule|text|BR-BT-00033-0023</assert>