Skip to content

Commit

Permalink
fields: Fix 3 asserts on BT-105-Procedure for subtype E5 (TEDEFO-3890)
Browse files Browse the repository at this point in the history 
Also update corresponding schematron rules.
  • Loading branch information
@bertrand-lorentz
bertrand-lorentz committed Nov 7, 2024
1 parent 7ecad4a commit ebd6bfd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions fields/fields.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3503,17 +3503,17 @@
"value" : "{ND-Root} ${TRUE}",
"severity" : "ERROR",
"constraints" : [ {
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('16','29','E5')) and (BT-105-Procedure is present)}",
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and ((OPP-070-notice in ('16','29')) or ((OPP-070-notice == 'E5') and (BT-01-notice in ('32014L0024','32018R1046')))) and (BT-105-Procedure is present)}",
"value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('open', 'restricted', 'neg-w-call')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00105-0110"
}, {
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('18','31','E5')) and (BT-105-Procedure is present)}",
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and ((OPP-070-notice in ('18','31')) or ((OPP-070-notice == 'E5') and (BT-01-notice == '32009L0081'))) and (BT-105-Procedure is present)}",
"value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('restricted', 'neg-w-call')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00105-0111"
}, {
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('17','30','E5')) and (BT-105-Procedure is present)}",
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and ((OPP-070-notice in ('17','30')) or ((OPP-070-notice == 'E5') and (BT-01-notice == '32014L0025'))) and (BT-105-Procedure is present)}",
"value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('open', 'restricted', 'neg-w-call','comp-dial')}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00105-0112"
Expand Down
6 changes: 3 additions & 3 deletions schematrons/dynamic/validation-stage-5.sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@
<assert id="BR-BT-00137-0202" role="ERROR" test="count(for $x in ., $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0202</assert>
</rule>
<rule context="/*/cac:TenderingProcess">
<assert id="BR-BT-00105-0110" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('16','29','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0110</assert>
<assert id="BR-BT-00105-0111" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('18','31','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0111</assert>
<assert id="BR-BT-00105-0112" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call','comp-dial')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('17','30','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0112</assert>
<assert id="BR-BT-00105-0110" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('16','29')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = ('32014L0024','32018R1046')))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0110</assert>
<assert id="BR-BT-00105-0111" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('18','31')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = '32009L0081'))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0111</assert>
<assert id="BR-BT-00105-0112" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call','comp-dial')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('17','30')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = '32014L0025'))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0112</assert>
<assert id="BR-BT-00634-0150" role="ERROR" diagnostics="BT-634-Procedure" test="((ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator = true()) and (not(../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cbc:TenderResultCode/normalize-space(text()) != 'clos-nw') or (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason/cbc:ReasonCode/normalize-space(text()) = 'cancel'))) or not(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator = true())">rule|text|BR-BT-00634-0150</assert>
</rule>
<rule context="/*/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID">
Expand Down
6 changes: 3 additions & 3 deletions schematrons/static/validation-stage-5.sch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@
<assert id="BR-BT-00137-0202" role="ERROR" test="count(for $x in ., $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0202</assert>
</rule>
<rule context="/*/cac:TenderingProcess">
<assert id="BR-BT-00105-0110" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('16','29','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0110</assert>
<assert id="BR-BT-00105-0111" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('18','31','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0111</assert>
<assert id="BR-BT-00105-0112" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call','comp-dial')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('17','30','E5')) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0112</assert>
<assert id="BR-BT-00105-0110" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('16','29')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = ('32014L0024','32018R1046')))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0110</assert>
<assert id="BR-BT-00105-0111" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('restricted','neg-w-call')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('18','31')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = '32009L0081'))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0111</assert>
<assert id="BR-BT-00105-0112" role="ERROR" diagnostics="BT-105-Procedure" test="(cbc:ProcedureCode/normalize-space(text()) = ('open','restricted','neg-w-call','comp-dial')) or not((cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/normalize-space(text()) = 'true') and ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('17','30')) or ((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = 'E5') and (../cbc:RegulatoryDomain/normalize-space(text()) = '32014L0025'))) and (cbc:ProcedureCode))">rule|text|BR-BT-00105-0112</assert>
<assert id="BR-BT-00634-0150" role="ERROR" diagnostics="BT-634-Procedure" test="((ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator = true()) and (not(../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cbc:TenderResultCode/normalize-space(text()) != 'clos-nw') or (../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason/cbc:ReasonCode/normalize-space(text()) = 'cancel'))) or not(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator = true())">rule|text|BR-BT-00634-0150</assert>
</rule>
<rule context="/*/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID">
Expand Down

0 comments on commit ebd6bfd

Please sign in to comment.