Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update generated files #640

Merged
merged 13 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions examples/notices/CEI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,6 @@ Applicants must provide evidence of their ability, skills, experience and compet
<cbc:TendererRequirementTypeCode listName="reserved-procurement">none</cbc:TendererRequirementTypeCode>
</cac:SpecificTendererRequirement>
</cac:TendererQualificationRequest>-->
<cac:AllowedSubcontractTerms>
<!-- New codelist, always false for CEI? -->
<cbc:SubcontractingConditionsCode listName="subcontracting-allowed">false</cbc:SubcontractingConditionsCode>
</cac:AllowedSubcontractTerms>
<cac:ContractExecutionRequirement>
<cbc:ExecutionRequirementCode listName="reserved-execution">not-known</cbc:ExecutionRequirementCode>
</cac:ContractExecutionRequirement>
Expand Down
4 changes: 0 additions & 4 deletions examples/reports/CEI.svrl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<svrl:fired-rule context="//cbc:ProcedureCode"/>
<svrl:fired-rule context="//cbc:ProcurementTypeCode"/>
<svrl:fired-rule context="//cbc:ProcurementTypeCode"/>
<svrl:fired-rule context="//cbc:SubcontractingConditionsCode"/>
<svrl:fired-rule context="//cbc:SubmissionMethodCode"/>
<svrl:fired-rule context="//cbc:TendererRequirementTypeCode"/>
<svrl:active-pattern id="EFORMS-validation-stage-1b"/>
Expand Down Expand Up @@ -82,7 +81,6 @@
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed'][/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = 'CEI']"/>
Expand Down Expand Up @@ -118,7 +116,6 @@
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference"/>
Expand Down Expand Up @@ -216,7 +213,6 @@
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode"/>
<svrl:fired-rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode"/>
<svrl:fired-rule context="/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cbc:ServiceTypeCode"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']/cbc:SubcontractingConditionsCode"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID/@schemeName"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID/@schemeName"/>
<svrl:fired-rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID/@schemeName"/>
Expand Down
104 changes: 9 additions & 95 deletions fields/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"ublVersion" : "2.3",
"sdkVersion" : "eforms-sdk-1.9.0-SNAPSHOT",
"metadataDatabase" : {
"version" : "1.8.226",
"createdOn" : "2023-07-28T15:56:57"
"version" : "1.8.233",
"createdOn" : "2023-08-08T11:17:52"
},
"xmlStructure" : [ {
"id" : "ND-Root",
Expand Down Expand Up @@ -411,20 +411,13 @@
"xpathRelative" : "cac:TenderingTerms",
"xsdSequenceOrder" : [ { "cac:TenderingTerms" : 8 } ],
"repeatable" : false
}, {
"id" : "ND-AllowedSubcontracting",
"parentId" : "ND-LotTenderingTerms",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
"xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
"xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
"repeatable" : false
}, {
"id" : "ND-SubcontractingObligation",
"parentId" : "ND-LotTenderingTerms",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
"xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
"xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
"repeatable" : false
"repeatable" : true
}, {
"id" : "ND-LotReviewTerms",
"parentId" : "ND-LotTenderingTerms",
Expand Down Expand Up @@ -713,7 +706,7 @@
"xsdSequenceOrder" : [ { "cac:PaymentTerms" : 34 } ],
"repeatable" : false
}, {
"id" : "ND-PostAwarProcess",
"id" : "ND-PostAwardProcess",
"parentId" : "ND-LotTenderingTerms",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
"xpathRelative" : "cac:PostAwardProcess",
Expand Down Expand Up @@ -2710,21 +2703,6 @@
"value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('25','26','27','28') and BT-105-Procedure == 'neg-wo-call') or not(OPP-070-notice in ('25','26','27','28')) or not(BT-105-Procedure is present)}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00105-0109"
}, {
"condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) 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 ('3','6','9','18','22','27','31')) 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 ('2','5','8','11','13','15','17','21','24','26','30','34','37','39')) and (BT-105-Procedure is present)}",
"value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure == 'open'}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00105-0112"
} ]
}
}, {
Expand Down Expand Up @@ -23015,15 +22993,6 @@
"value" : true,
"severity" : "ERROR"
} ]
},
"assert" : {
"value" : "{ND-Root} ${TRUE}",
"severity" : "ERROR",
"constraints" : [ {
"value" : "{ND-SecondStage} ${(BT-40-Lot == TRUE) or not(BT-51-Lot is present)}",
"severity" : "ERROR",
"message" : "rule|text|BR-BT-00051-0100"
} ]
}
}, {
"id" : "BT-510(a)-Business",
Expand Down Expand Up @@ -24431,7 +24400,7 @@
"value" : false,
"severity" : "ERROR",
"constraints" : [ {
"noticeTypes" : [ "4", "5", "6", "X01", "X02" ],
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
"value" : true,
"severity" : "ERROR"
} ]
Expand Down Expand Up @@ -27211,7 +27180,7 @@
"value" : false,
"severity" : "ERROR",
"constraints" : [ {
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
"value" : true,
"severity" : "ERROR"
} ]
Expand Down Expand Up @@ -29076,7 +29045,7 @@
"value" : false,
"severity" : "ERROR",
"constraints" : [ {
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
"value" : true,
"severity" : "ERROR"
} ]
Expand Down Expand Up @@ -33068,7 +33037,7 @@
}
}, {
"id" : "BT-92-Lot",
"parentNodeId" : "ND-PostAwarProcess",
"parentNodeId" : "ND-PostAwardProcess",
"name" : "Electronic Ordering",
"btId" : "BT-92",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicOrderUsageIndicator",
Expand Down Expand Up @@ -33107,7 +33076,7 @@
}
}, {
"id" : "BT-93-Lot",
"parentNodeId" : "ND-PostAwarProcess",
"parentNodeId" : "ND-PostAwardProcess",
"name" : "Electronic Payment",
"btId" : "BT-93",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicPaymentUsageIndicator",
Expand Down Expand Up @@ -35689,61 +35658,6 @@
"severity" : "ERROR"
} ]
}
}, {
"id" : "OPT-150-Lot",
"parentNodeId" : "ND-AllowedSubcontracting",
"name" : "Subcontracting Allowed",
"btId" : "OPT-150",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']/cbc:SubcontractingConditionsCode",
"xpathRelative" : "cbc:SubcontractingConditionsCode",
"xsdSequenceOrder" : [ { "cbc:SubcontractingConditionsCode" : 6 } ],
"type" : "code",
"attributes" : [ "OPT-150-Lot-List" ],
"repeatable" : {
"value" : false,
"severity" : "ERROR"
},
"forbidden" : {
"value" : false,
"severity" : "ERROR",
"constraints" : [ {
"noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
"value" : true,
"severity" : "ERROR"
} ]
},
"mandatory" : {
"value" : false,
"severity" : "ERROR",
"constraints" : [ {
"noticeTypes" : [ "CEI" ],
"value" : true,
"severity" : "ERROR"
} ]
},
"codeList" : {
"value" : {
"id" : "indicator",
"type" : "flat"
},
"severity" : "ERROR"
}
}, {
"id" : "OPT-150-Lot-List",
"parentNodeId" : "ND-AllowedSubcontracting",
"name" : "Subcontracting Allowed Listname",
"btId" : "OPT-150",
"xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']/cbc:SubcontractingConditionsCode/@listName",
"xpathRelative" : "cbc:SubcontractingConditionsCode/@listName",
"xsdSequenceOrder" : [ { "cbc:SubcontractingConditionsCode" : 6 } ],
"type" : "text",
"attributeName" : "listName",
"attributeOf" : "OPT-150-Lot",
"presetValue" : "indicator",
"repeatable" : {
"value" : false,
"severity" : "ERROR"
}
}, {
"id" : "OPT-155-LotResult",
"parentNodeId" : "ND-ProcurementStatistics",
Expand Down
34 changes: 17 additions & 17 deletions notice-types/10.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"ublVersion" : "2.3",
"sdkVersion" : "1.9.0-SNAPSHOT",
"metadataDatabase" : {
"version" : "1.8.212",
"createdOn" : "2023-07-21T14:07:13"
"version" : "1.8.233",
"createdOn" : "2023-08-08T11:17:52"
},
"noticeId" : "10",
"metadata" : [ {
Expand Down Expand Up @@ -1508,21 +1508,21 @@
"description" : "Late Tenderer Information Description",
"_label" : "field|name|BT-772-Lot"
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
}, {
"id" : "GR-Lot-Variants",
Expand Down
34 changes: 17 additions & 17 deletions notice-types/11.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"ublVersion" : "2.3",
"sdkVersion" : "1.9.0-SNAPSHOT",
"metadataDatabase" : {
"version" : "1.8.212",
"createdOn" : "2023-07-21T14:07:13"
"version" : "1.8.233",
"createdOn" : "2023-08-08T11:17:52"
},
"noticeId" : "11",
"metadata" : [ {
Expand Down Expand Up @@ -1515,21 +1515,21 @@
"description" : "Late Tenderer Information Description",
"_label" : "field|name|BT-772-Lot"
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
}, {
"id" : "GR-Lot-Variants",
Expand Down
34 changes: 17 additions & 17 deletions notice-types/12.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"ublVersion" : "2.3",
"sdkVersion" : "1.9.0-SNAPSHOT",
"metadataDatabase" : {
"version" : "1.8.212",
"createdOn" : "2023-07-21T14:07:13"
"version" : "1.8.233",
"createdOn" : "2023-08-08T11:17:52"
},
"noticeId" : "12",
"metadata" : [ {
Expand Down Expand Up @@ -1496,21 +1496,21 @@
"description" : "Late Tenderer Information Description",
"_label" : "field|name|BT-772-Lot"
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
} ]
}, {
"id" : "GR-ReservedParticipation",
"contentType" : "group",
"nodeId" : "ND-LotReservedProcurement",
"displayType" : "GROUP",
"description" : "Reserved Procurement",
"_label" : "group|name|ND-LotReservedProcurement",
"_repeatable" : true,
"content" : [ {
"id" : "BT-71-Lot",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Reserved Participation",
"_label" : "field|name|BT-71-Lot"
} ]
}, {
"id" : "GR-Lot-Variants",
Expand Down
Loading