cardinality added to view, alpha SC removed

OP-TED · Jun 19, 2024 · 721825b · 721825b
1 parent 53908b1
commit 721825b
Show file tree

Hide file tree

Showing 6 changed files with 1,121 additions and 1,093 deletions.
diff --git a/ESPD/examples/ESPDdownload.js b/ESPD/examples/ESPDdownload.js
@@ -233,7 +233,7 @@ Vue.component('ESPDdownload',{
         <b-card-header header-tag="header" class="p-1" role="tab">
             <b-button block v-b-toggle.accordion-fn1 variant="info">A. Save ESPD</b-button>
         </b-card-header>
-        <b-collapse id="accordion-fn1" accordion="my-accordion" role="tabpanel">
+        <b-collapse id="accordion-fn1" visible accordion="my-accordion" role="tabpanel">
             <b-card-body class='text-center'>
             <b-button variant="warning" @click="exportExample()">Download ESPD {{ window.espd_doc.role=='ca'?'Request':'Response'}}</b-button>
             </b-card-body>

diff --git a/ESPD/examples/espd.json b/ESPD/examples/espd.json
@@ -1,12 +1,6 @@
 {
     "versions": {
         "v3.3.0": {
-            "start":{
-                "context":["actor"]
-            },
-            "procedure":{
-                "context":["publication", "procurer", "procurement_procedure"]
-            },
             "exclusion_criteria":{
                 "convictions": ["crime-org", "corruption", "fraud", "terr-offenct", "finan-laund", "human-traffic"],
                 "contributions": [ "tax-pay", "socsec-pay"],

diff --git a/ESPD/examples/procedureComponent.js b/ESPD/examples/procedureComponent.js
@@ -28,6 +28,8 @@ Vue.component('procedureComponent',{
             country_list: [
                 { value: 'EUR', text: 'European Union' }
             ],
+            meta_espd_doc: window.raw_data[window.espd_doc.espd_version],
+            espd_model: window.espd_model,
             show: true
         }
     },
@@ -104,7 +106,7 @@ Vue.component('procedureComponent',{
         <b-card-header header-tag="header" class="p-1" role="tab">
             <b-button block v-b-toggle.accordion-p1 variant="info">A. Information about publication</b-button>
         </b-card-header>
-        <b-collapse id="accordion-p1" accordion="my-accordion" role="tabpanel">
+        <b-collapse id="accordion-p1" visible accordion="my-accordion" role="tabpanel">
             <b-card-body>
             <b-form-group id="flds-ron" label-cols-sm="4" label-cols-lg="3" description="Please specify the received notice number." label="Received notice number" label-for="inp-received_notice_number">
                 <b-form-input id="inp-received_notice_number" v-model="publication.received_notice_number"></b-form-input>
@@ -187,6 +189,66 @@ Vue.component('procedureComponent',{
     </div>
     </b-col>
     </b-row>
+    <b-row v-if="window.espd_doc.role=='eo'">
+        <b-col>
+        <div>
+        <h6>Part II: Information concerning the economic operator</h6>
+        </div>
+        </b-col>
+    </b-row>
+    <b-row v-if="window.espd_doc.role=='eo'">
+        <b-col>
+        <div class="accordion" role="tablist">
+            <b-card no-body class="mb-1">
+            <b-card-header header-tag="header" class="p-1" role="tab">
+                <b-button block v-b-toggle.accordion-p4 variant="info">A: Information about the economic operator</b-button>
+            </b-card-header>
+            <b-collapse id="accordion-p4" accordion="my-accordion" role="tabpanel">
+            <b-card-body v-for="item in meta_espd_doc['partII']['A']">
+                <strong>{{ espd_model[item].name }}</strong>
+                <p>{{ espd_model[item].description }}</p>
+            </b-card-body>
+            </b-collapse>
+            </b-card>
+
+            <b-card no-body class="mb-1">
+            <b-card-header header-tag="header" class="p-1" role="tab">
+                <b-button block v-b-toggle.accordion-p5 variant="info">B: Information about representatives of the economic operator</b-button>
+            </b-card-header>
+            <b-collapse id="accordion-p5" accordion="my-accordion" role="tabpanel">
+                <b-card-body v-for="item in meta_espd_doc['partII']['B']">
+                    <strong>{{ espd_model[item].name }}</strong>
+                    <p>{{ espd_model[item].description }}</p>
+                </b-card-body>
+            </b-collapse>
+            </b-card>
+
+            <b-card no-body class="mb-1">
+            <b-card-header header-tag="header" class="p-1" role="tab">
+                <b-button block v-b-toggle.accordion-p6 variant="info">C: Information about reliance on the capacities of other entities</b-button>
+            </b-card-header>
+            <b-collapse id="accordion-p6" accordion="my-accordion" role="tabpanel">
+                <b-card-body v-for="item in meta_espd_doc['partII']['C']">
+                    <strong>{{ espd_model[item].name }}</strong>
+                    <p>{{ espd_model[item].description }}</p>
+                </b-card-body>
+            </b-collapse>
+            </b-card>
+
+            <b-card no-body class="mb-1">
+            <b-card-header header-tag="header" class="p-1" role="tab">
+                <b-button block v-b-toggle.accordion-p7 variant="info">D: Information concerning subcontractors on whose capacity the economic operator does not rely</b-button>
+            </b-card-header>
+            <b-collapse id="accordion-p7" accordion="my-accordion" role="tabpanel">
+                <b-card-body v-for="item in meta_espd_doc['partII']['D']">
+                    <strong>{{ espd_model[item].name }}</strong>
+                    <p>{{ espd_model[item].description }}</p>
+                </b-card-body>
+            </b-collapse>
+            </b-card>
+        </div>
+        </b-col>
+    </b-row>
     </b-container>
     </template>
     `

diff --git a/ESPD/examples/selectionCriteria.js b/ESPD/examples/selectionCriteria.js
@@ -3,11 +3,6 @@ Vue.component('selectionCriteria',{
         return {
             meta_espd_doc: window.raw_data[window.espd_doc.espd_version],
             espd_model: window.espd_model,
-            SIV_a: false,
-            optYN: [
-                { text: 'YES', value: false },
-                { text: 'NO', value: true }
-            ],
             show: true
         }
     },
@@ -24,30 +19,7 @@ Vue.component('selectionCriteria',{
     </b-row>
     <b-row>
     <b-col>
-        <div>
-        <p>Contracting authorities must indicate which selection criteria will be applied by 'ticking' the checkbox placed before the relevant criterion.</p>
-        <b-form-group label="Do you want to use the selection criteria from A to D?" v-slot="{ ariaDescribedby }">
-        <b-form-radio-group id="radio-group-1" v-model="SIV_a" :options="optYN" :aria-describedby="ariaDescribedby" name="radio-options"></b-form-radio-group>
-        </div>
-    </b-col>
-    </b-row
-    <b-row>
-    <b-col>
-    <div v-if="SIV_a" class="accordion" role="tablist">
-        <b-card no-body class="mb-1">
-        <b-card-header header-tag="header" class="p-1" role="tab">
-            <b-button block v-b-toggle.accordion-sa1 variant="info">ɑ: Global indication for all selection criteria</b-button>
-        </b-card-header>
-        <b-collapse id="accordion-sa1" accordion="my-accordion" role="tabpanel">
-        <b-card-body>
-            <strong>Concerning the selection criteria the economic operator declares that</strong>
-            <p>It satisfies all the required selection criteria</p>
-        </b-card-body>
-        </b-collapse>
-        </b-card>
-
-    </div>
-    <div v-else class="accordion" role="tablist">
+    <div class="accordion" role="tablist">
         <b-card no-body class="mb-1">
         <b-card-header header-tag="header" class="p-1" role="tab">
             <b-button block v-b-toggle.accordion-s1 variant="info">A: Suitability</b-button>

diff --git a/ESPD/examples/startComponent.js b/ESPD/examples/startComponent.js
@@ -74,7 +74,7 @@ Vue.component("startComponent", {
         <b-card-header header-tag="header" class="p-1" role="tab">
             <b-button block v-b-toggle.accordion-st1 variant="info">A. Select initial parameters</b-button>
         </b-card-header>
-        <b-collapse id="accordion-st1" accordion="my-accordion" role="tabpanel">
+        <b-collapse id="accordion-st1" visible accordion="my-accordion" role="tabpanel">
             <b-card-body>
                 <b-form-group id="fieldset-espd" label-cols-sm="4" label-cols-lg="3" description="Select ESPD version" label="ESPD version" label-for="sel-espd">
                     <b-form-select id="sel-espd" v-model="espd_version" :options="versions"></b-form-select>