diff --git a/ESPD/examples/espd.json b/ESPD/examples/espd.json index d66ec92..012a1be 100644 --- a/ESPD/examples/espd.json +++ b/ESPD/examples/espd.json @@ -2,139 +2,51 @@ "versions": { "v3.3.0": { "exclusion_criteria": { - "convictions": [ - "crime-org", - "corruption", - "fraud", - "terr-offenct", - "finan-laund", - "human-traffic" - ], + "convictions": [ "crime-org", "corruption", "fraud", "terr-offenct", "finan-laund", "human-traffic"], "contributions": ["tax-pay", "socsec-pay"], "social": ["envir-law", "scosec-law", "labour-law"], - "business": [ - "bankruptcy", - "insolvency", - "cred-arran", - "bankr-nat", - "liq-admin", - "susp-act" - ], + "business": ["bankruptcy", "insolvency", "cred-arran", "bankr-nat", "liq-admin", "susp-act"], "misconduct": ["disortion"], - "conflict_of_interest": [ - "paric-confl", - "prep-confl", - "sanction", - "misinterpr" - ], + "conflict_of_interest": [ "paric-confl", "prep-confl", "sanction", "misinterpr"], "national": ["nati-ground"] }, "selection_criteria": { - "suitability": [ - "prof-regist", - "trade-regist", - "authorisation", - "membership" - ], + "suitability": [ "prof-regist", "trade-regist", "authorisation", "membership"], "economic_financial_standing": { - "turnover": [ - "gen-year-to", - "aver-year-to", - "spec-aver-to", - "sped-year-to" - ], - "economic_financial_standing": [ - "finan-rat", - "indem-insu", - "finan-requ" - ] + "turnover": [ "gen-year-to", "aver-year-to", "spec-aver-to", "sped-year-to"], + "economic_financial_standing": [ "finan-rat", "indem-insu", "finan-requ" ] }, "technical_professional_ability": { "references": ["work-perform", "supply-perform", "service-perform"], - "technical": [ - "qual-cont-tech", - "work-tech", - "qual-facil", - "research-fac", - "chain-manage", - "qualification", - "envir-measure", - "tech-equip", - "spec-req-check" - ], - "management": [ - "manage-staff", - "year-manpower", - "suncont-port", - "wo-authent", - "w-autent" - ], - "certificates": [ - "qa-cerif-inst", - "qu-certif-indep", - "envir-certif-indep" - ] + "technical": ["qual-cont-tech", "work-tech", "qual-facil", "research-fac", "chain-manage", "qualification", "envir-measure", "tech-equip", "spec-req-check"], + "management": [ "manage-staff", "year-manpower", "suncont-port", "wo-authent", "w-autent"], + "certificates": [ "qa-cerif-inst", "qu-certif-indep", "envir-certif-indep"] } }, "model": { "source": "ESPD/model/espd_edm_v3.3.0.json" }, "partI": { - "A": [], - "B": [], - "C": [] + "A": ["PI-SA"], + "B": ["PI-SB"], + "C": ["PI-SC"] }, "partII": { - "A": ["C65", "C57", "C58", "C59"], - "B": [], + "A": ["PII-SA", "C65", "C57", "C58", "C59"], + "B": ["PII-SB"], "C": ["C60"], "D": ["C61"] }, "partIII": { "A": ["C1", "C2", "C3", "C4", "C5", "C6"], "B": ["C7", "C8"], - "C": [ - "C9", - "C10", - "C11", - "C12", - "C13", - "C14", - "C15", - "C16", - "C17", - "C18", - "C19", - "C20", - "C21", - "C22", - "C23" - ], + "C": ["C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "C17", "C18", "C19", "C20", "C21", "C22", "C23"], "D": ["C24"] }, "partIV": { "A": ["C25", "C26", "C27", "C28"], "B": ["C29", "C30", "C31", "C32", "C34", "C35", "C36"], - "C": [ - "C37", - "C38", - "C39", - "C40", - "C41", - "C42", - "C43", - "C44", - "C45", - "C46", - "C47", - "C48", - "C49", - "C50", - "C51", - "C52", - "C53", - "C54" - ], + "C": ["C37","C38", "C39", "C40", "C41", "C42", "C43", "C44", "C45", "C46", "C47", "C48", "C49", "C50", "C51", "C52", "C53", "C54"], "D": ["C55", "C56"] }, "partV": { @@ -143,139 +55,51 @@ }, "v4.0.0": { "exclusion_criteria": { - "convictions": [ - "crime-org", - "corruption", - "fraud", - "terr-offenct", - "finan-laund", - "human-traffic" - ], + "convictions": [ "crime-org", "corruption", "fraud", "terr-offenct", "finan-laund", "human-traffic" ], "contributions": ["tax-pay", "socsec-pay"], "social": ["envir-law", "scosec-law", "labour-law"], - "business": [ - "bankruptcy", - "insolvency", - "cred-arran", - "bankr-nat", - "liq-admin", - "susp-act" - ], + "business": [ "bankruptcy", "insolvency", "cred-arran", "bankr-nat", "liq-admin", "susp-act" ], "misconduct": ["disortion"], - "conflict_of_interest": [ - "paric-confl", - "prep-confl", - "sanction", - "misinterpr" - ], + "conflict_of_interest": [ "paric-confl", "prep-confl", "sanction", "misinterpr"], "national": ["nati-ground"] }, "selection_criteria": { - "suitability": [ - "prof-regist", - "trade-regist", - "authorisation", - "membership" - ], + "suitability": [ "prof-regist", "trade-regist", "authorisation", "membership" ], "economic_financial_standing": { - "turnover": [ - "gen-year-to", - "aver-year-to", - "spec-aver-to", - "sped-year-to" - ], - "economic_financial_standing": [ - "finan-rat", - "indem-insu", - "finan-requ" - ] + "turnover": [ "gen-year-to", "aver-year-to", "spec-aver-to", "sped-year-to" ], + "economic_financial_standing": ["finan-rat", "indem-insu", "finan-requ" ] }, "technical_professional_ability": { "references": ["work-perform", "supply-perform", "service-perform"], - "technical": [ - "qual-cont-tech", - "work-tech", - "qual-facil", - "research-fac", - "chain-manage", - "qualification", - "envir-measure", - "tech-equip", - "spec-req-check" - ], - "management": [ - "manage-staff", - "year-manpower", - "suncont-port", - "wo-authent", - "w-autent" - ], - "certificates": [ - "qa-cerif-inst", - "qu-certif-indep", - "envir-certif-indep" - ] + "technical": [ "qual-cont-tech", "work-tech", "qual-facil", "research-fac", "chain-manage", "qualification", "envir-measure", "tech-equip", "spec-req-check" ], + "management": [ "manage-staff", "year-manpower", "suncont-port", "wo-authent", "w-autent" ], + "certificates": [ "qa-cerif-inst", "qu-certif-indep", "envir-certif-indep" ] } }, "model": { "source": "ESPD/model/espd_edm_v4.0.0.json" }, "partI": { - "A": [], - "B": [], - "C": [] + "A": ["PI-SA"], + "B": ["PI-SB"], + "C": ["PI-SC"] }, "partII": { - "A": ["C65", "C57", "C58", "C59"], - "B": [], + "A": ["PII-SA", "C65", "C57", "C58", "C59"], + "B": ["PII-SB"], "C": ["C60"], "D": ["C61"] }, "partIII": { "A": ["C1", "C2", "C3", "C4", "C5", "C6"], "B": ["C7", "C8"], - "C": [ - "C9", - "C10", - "C11", - "C12", - "C13", - "C14", - "C15", - "C16", - "C17", - "C18", - "C19", - "C20", - "C21", - "C22", - "C23" - ], + "C": ["C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "C17", "C18", "C19", "C20", "C21", "C22", "C23"], "D": ["C24"] }, "partIV": { "A": ["C25", "C26", "C27", "C28"], "B": ["C29", "C30", "C31", "C32", "C34", "C35", "C36"], - "C": [ - "C37", - "C38", - "C39", - "C40", - "C41", - "C42", - "C43", - "C44", - "C45", - "C46", - "C47", - "C48", - "C49", - "C50", - "C51", - "C52", - "C53", - "C54" - ], + "C": ["C37", "C38", "C39", "C40", "C41", "C42", "C43", "C44", "C45", "C46", "C47", "C48", "C49", "C50", "C51", "C52", "C53", "C54"], "D": ["C55", "C56"] }, "partV": { diff --git a/ESPD/examples/procedureComponent.js b/ESPD/examples/procedureComponent.js index 1f18338..d842982 100644 --- a/ESPD/examples/procedureComponent.js +++ b/ESPD/examples/procedureComponent.js @@ -1,136 +1,39 @@ Vue.component('procedureComponent', { data() { return { - publication: { - received_notice_number: '', - OJS_notice_number: '', - OJS_URL: '', - national_official_journal: '' - }, - procurer: { - name: '', - country: '', - website: '', - vat: '', - city: '', - street_and_number: '', - postcode: '', - contact_person: '', - telephone: '', - email: '' - }, - procedure: { - title: '', - short_description: '', - file_reference: '', - number_of_lots: 1 - }, - seller: { - name: '', - country: '', - website: '', - vat: '', - city: '', - street_and_number: '', - postcode: '', - contact_person: '', - telephone: '', - email: '' - }, - poa: { - name: '', - familyname: '', - dateofbirth: '', - placeofbirth: '', - country: '', - website: '', - role: '', - details: '', - city: '', - street_and_number: '', - postcode: '', - telephone: '', - email: '' - }, espd_structure: { - partII: { - A: [], - B: [], - C: [], - D: [] - } + partI:{ A:[], B:[], C:[]}, + partII: { A: [], B: [], C: [], D: []} }, - 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 } }, - watch: { - procurer: [function (oldV, newV) { - window.espd_doc.procurer = this.procurer - }], - procedure: [function (oldV, newV) { - window.espd_doc.procedure = this.procedure - }], - publication: [function (oldV, newV) { - window.espd_doc.publication = this.publication - }], - seller: [function (oldV, newV) { - window.espd_doc.seller = this.seller - }], - poa: [function (oldV, newV) { - window.espd_doc.poa = this.poa - }] + methods: { + updateData(componentdata){ + console.log(componentdata) + } }, - created() { - - this.procurer.country = window.espd_doc.country - this.seller.country = window.espd_doc.country - this.poa.country = window.espd_doc.country - - window.espd_doc.publication = this.publication - window.espd_doc.procurer = this.procurer - window.espd_doc.procedure = this.procedure - window.espd_doc.seller = this.seller - window.espd_doc.poa = this.poa - - - //Initialize form data - this.publication.received_notice_number = 'EU1234' - this.publication.OJS_notice_number = '2024/S001-123123' - this.publication.OJS_URL = 'https://docs.ted.europa.eu/ESPD-EDM/latest/index.html' - this.publication.national_official_journal = 'EU0001' - - this.procurer.name = 'TED-OP' - this.procurer.website = 'https://ted.europa.eu/en/' - this.procurer.vat = 'EU0123456789' - this.procurer.city = 'Luxembourg' - this.procurer.street_and_number = '20 Rue de Reims' - this.procurer.postcode = '2417' - this.procurer.contact_person = 'Help Desk' - this.procurer.telephone = '0080067891011' - this.procurer.email = 'OPESPD@publications.europa.eu' - - this.procedure.title = 'Example of ESPD Request' - this.procedure.short_description = 'This is an example ESPD Request created with ESPD Demo application.' - this.procedure.file_reference = 'REF0001' - //Build the UI part for each Criteria + for (const key in this.meta_espd_doc.partI) { + if (Object.hasOwn(this.meta_espd_doc.partI, key)) { + for (const el of this.meta_espd_doc.partI[key]) { + this.espd_structure.partI[key].push(`${el}`) + } + } + } if(window.espd_doc.role == 'eo'){ for (const key in this.meta_espd_doc.partII) { if (Object.hasOwn(this.meta_espd_doc.partII, key)) { for (const el of this.meta_espd_doc.partII[key]) { - this.espd_structure.partII[key].push(`${window.espd_doc.espd_version}-${el}`) + this.espd_structure.partII[key].push(el.startsWith("PII")?el:`${window.espd_doc.espd_version}-${el}`) } } } } - }, template: ` @@ -151,19 +54,8 @@ Vue.component('procedureComponent', { A. Information about publication - - - - - - - - - - - - - + + @@ -173,38 +65,8 @@ Vue.component('procedureComponent', { B. Identity of the procurer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -214,19 +76,8 @@ Vue.component('procedureComponent', { C. Information about the procurement procedure - - - - - - - - - - - - - + + @@ -248,40 +99,6 @@ Vue.component('procedureComponent', { A: Information about the economic operator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -296,51 +113,10 @@ Vue.component('procedureComponent', { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - @@ -361,7 +137,7 @@ Vue.component('procedureComponent', { - + diff --git a/ESPD/examples/startComponent.js b/ESPD/examples/startComponent.js index 001643b..b5b2dad 100644 --- a/ESPD/examples/startComponent.js +++ b/ESPD/examples/startComponent.js @@ -50,6 +50,11 @@ Vue.component("startComponent", { } }, + beforeDestroy(){ + console.log(this.espd_version); + + }, + created(){ const dataURL = ['ESPD/examples/'] @@ -88,16 +93,16 @@ Vue.component("startComponent", { template: `