Fixes for reserved participation

anskaffelser · Feb 9, 2024 · 74d473f · 74d473f
1 parent b777fcd
commit 74d473f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/bin/process-fields b/bin/process-fields
@@ -96,7 +96,7 @@ removed = config.fetch('removed', [])
 
 source['xmlStructure'] = source['xmlStructure'].map do |obj|
   if removed.include? obj['id']
-    puts obj['id']
+    #puts obj['id']
     obj['active'] = false
   else
     obj['active'] = true
@@ -107,7 +107,7 @@ end
 
 source['fields'] = source['fields'].map do |obj|
   if removed.include? obj['id']
-    puts obj['id']
+    #puts obj['id']
     obj['forbidden'] = {
       'value' => false,
       'severity' => 'ERROR',

diff --git a/src/fields/national.yaml b/src/fields/national.yaml
@@ -89,8 +89,6 @@ removed:
   # Other Requirements
   - BG-705
   - BT-1379
-  # - BT-71-Lot
-  # - BT-71-Part
   # - BT-79-Lot
   - BT-578-Lot
   - BT-78-Lot
@@ -102,6 +100,12 @@ removed:
   - GR-Lot-Requirements2SecurityClearance1
   - GR-Lot-SecurityClearance2
   - GR-Nda
+  - ND-LotReservedParticipation
+  - ND-LotReservedParticipation_BT-71-Lot
+  - ND-PartReservedParticipation_BT-71-Part
+  - BT-71-Lot
+  - BT-71-Part
+
 
   # Group Framework Maximum Value
   - BG-556

diff --git a/src/tests/national/test/2023-100298-varmeanlegg.xml b/src/tests/national/test/2023-100298-varmeanlegg.xml
@@ -4,7 +4,6 @@
 Errors:
 EFORMS-NOR-R801
 BR-BT-00022-0175
-ND-NonUBLTenderingTerms-16
 
 Warnings:
 BR-OPP-00050-0022 x 2

diff --git a/src/xslt/sch-cleanup-national.xslt b/src/xslt/sch-cleanup-national.xslt
@@ -22,7 +22,7 @@
     <xsl:template match="sch:rule[@context = '/*/cac:AdditionalNoticeLanguage/cbc:ID']" />
 
     <!-- Remove removed fields -->
-    <xsl:template match="sch:assert[@diagnostics = $removed_parsed or @id = $removed_parsed]"/>
+    <xsl:template match="sch:assert[@diagnostics = $removed_parsed or @id = $removed_parsed]" priority="1000"/>
 
     <!-- Remove schema types -->
     <xsl:template match="sch:rule[contains(@context, 'noticeSubType = ''1''')]" priority="100"/>