Skip to content

Commit

Permalink
Review PR
Browse files Browse the repository at this point in the history 
Field name changes:

* Fix `type` to `documentType`
* Rename `minimumLevel` to `minimum`, to be more flexible for future criteria, which might set minimum values, percentages, ratios, etc.
* Rename `participationConditions` to `otherRequirements`
  * As mentioned by Giampaollo Sellitto in eForms/eForms#296 (comment), "participation criteria" or "participation conditions" are easy to confuse with "selection criteria" from a legal perspective. This is the reason ESPD uses "other criteria" and eForms uses "other requirements".
* Rename `reservedTo` to `reservedParticipation`, mirroring `hasReservedExecution`
* Rename `termsPerformance` to `performanceTerms`, to put words in regular order
* Rename `hasPerformingStaffQualification` to `requiresStaffNamesQualifications`, for clarity
* Rename `objectiveRulesCriteria` to `reductionCriteria`, see 2014/24/EU Article 65
* Rename `hasGuaranteeRequired` to `hasRequiredGuarantees`, to put words in regular order, and to allow multiple guarantees (like in some countries) open-contracting/standard#900

Modelling changes:

* Change `selectionCriteria` to an object, with a `criteria` array as a sub-field, like with `awardCriteria`
* Remove `isReservedToProfession` and rename `reservedToProfession` to `reservedExecution`, then use `hasReservedExecution` and `reservedExecution` for both sheltered employment programmes and professions
* Move `hasRequiredGuarantees` from `otherRequirements` to `submissionTerms`, see eForms
* Move `tendererLegalForm` from `otherRequirements` to `contractTerms`, see eForms

Code changes:

* Rename 'economicFinancial' to 'economic', to be consistent with the new `documentType.csv` code
* Rename 'economicCriteriaSelection' to 'economicSelectionCriteria', to put words in regular order
* Rename 'technicalCriteriaSelection' to 'technicalSelectionCriteria', to put words in regular order
* Rename 'publicServiceMission' to 'publicServiceMissionOrganization' and 'shelteredWorkshops' to 'shelteredWorkshop', so that codes describe a singular organization type

All forms:

* Copy mappings across forms

Other changes not related to this pull request:

* Rename `maximumNumberParticipants` to `maximumParticipants`
* Rename `durationRationale` to `periodRationale`
* Fix `electronicInvoicing` to `electronicInvoicingPolicy`
* Fix `electronicCatalogue` to `electronicCataloguePolicy`
* Use "nearest earlier `date`" construction
* Fix single quotes instead of backticks for code
* Remove trailing whitespace
  • Loading branch information
@jpmckinney
jpmckinney committed Aug 30, 2019
1 parent 71f782c commit f08f6f3
Show file tree
Hide file tree
Showing 18 changed files with 187 additions and 187 deletions.
38 changes: 19 additions & 19 deletions output/mapping/F01_2014.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,28 @@ xpath,label-key,index,comment,guidance
/OBJECT_CONTRACT/OBJECT_DESCR/NO_EU_PROGR_RELATED,_no,,,"Discard. If there's no party with the role 'funder' and the name 'European Union', then the procurement isn't related to a project and/or programme financed by European Union funds."
/OBJECT_CONTRACT/OBJECT_DESCR/INFO_ADD,info_additional,II.2.14,,"Append to the lot's `.description`, and append to the item's `.description`\n\nThis results in a loss of structure. (WARNING #28)"
/OBJECT_CONTRACT/DATE_PUBLICATION_NOTICE,date_of_contract_notice,II.3,,Map to `tender.communication.futureNoticeDate`
/LEFTI,info_legal,III,,"The standard forms express exclusion grounds and selection criteria in this section as unstructured text. In the [introductory note](https://github.com/eForms/eForms/raw/master/20180604_eForms_consultation_introduction.docx) to its [eForms consultation](https://github.com/eForms/eForms), the European Commission proposes to create an extension to eForms to implement the [European Single Procurement Document (ESPD)](http://ec.europa.eu/growth/single-market/public-procurement/e-procurement/espd/), which expresses this information as structured data, following the model of the [Core Criterion and Core Evidence Vocabulary](https://joinup.ec.europa.eu/solution/core-criterion-and-core-evidence-vocabulary). With respect to OCDS, work on this section is postponed until either the extension to eForms is available or until the [ESPD Exchange Data Model](https://github.com/ESPD/ESPD-EDM) is stable."
/LEFTI/SUITABILITY,info_evaluating_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria` array. Map to `.description`, and set its '.type' to 'suitability'"
/LEFTI/ECONOMIC_CRITERIA_DOC,criteria_selection_docs,,,"Add a `Document` object to the `tender.documents` array, set its `.type` to 'economicCriteriaSelection', and set its `.id`."
/LEFTI/ECONOMIC_FINANCIAL_INFO,info_evaluating_weth_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria` array. Map to `.description`, and set its '.type' to 'economicFinancial'"
/LEFTI/ECONOMIC_FINANCIAL_MIN_LEVEL,min_standards_required,,,""In the `SelectionCriterion` object whose `.type` equals 'economicFinancial', map to `.minimumLevel`"
/LEFTI/TECHNICAL_CRITERIA_DOC,criteria_selection_docs,,"Add a `Document` object to the `tender.documents` array, set its `.type` to 'technicalCriteriaSelection', and set its `.id`."
/LEFTI/TECHNICAL_PROFESSIONAL_INFO,info_evaluating_weth_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria` array. Map to `.description`, and set its '.type' to 'technical'"
/LEFTI/TECHNICAL_PROFESSIONAL_MIN_LEVEL,min_standards_required,,,"In the `SelectionCriterion` object whose `.type` equals 'technical', map to `.minimumLevel`"
/LEFTI/RESTRICTED_SHELTERED_WORKSHOP,restricted_sheltered_workshop,,,"Set `tender.participationConditions.reservedTo` to 'shelteredWorkshops'"
/LEFTI/RESTRICTED_SHELTERED_PROGRAM,restricted_sheltered_program,,,Set `tender.contractTerms.hasReservedExecution` to `true`
/LEFTI/PARTICULAR_PROFESSION,particular_profession_reserved,,,Set `tender.contractTerms.isReservedToProfession` to `true`
/LEFTI/REFERENCE_TO_LAW,ref_law_reg_prov,,,Map to `tender.contractTerms.reservedToProfession`
/LEFTI/PERFORMANCE_CONDITIONS,other_conditions,III.2.2,,Map to `tender.contractTerms.termsPerformance`
/LEFTI/PERFORMANCE_STAFF_QUALIFICATION,staff_responsible_indicate,,,Set `tender.participationConditions.hasPerformingStaffQualification` to `true`
/LEFTI,info_legal,III,,"The standard forms express exclusion grounds and selection criteria in this section as unstructured text. In the introductory note to its [eForms consultation](https://github.com/eForms/eForms), the European Commission had proposed to create an extension to eForms to implement the [European Single Procurement Document (ESPD)](http://ec.europa.eu/growth/single-market/public-procurement/e-procurement/espd/) [Exchange Data Model](https://github.com/ESPD/ESPD-EDM), which expresses this information as structured data, following the model of the [Core Criterion and Core Evidence Vocabulary](https://joinup.ec.europa.eu/solution/core-criterion-and-core-evidence-vocabulary)."
/LEFTI/SUITABILITY,info_evaluating_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria.criteria` array, set its `.type` to 'suitability', and map to its `.description`."
/LEFTI/ECONOMIC_CRITERIA_DOC,criteria_selection_docs,,,"Add a `Document` object to the `tender.documents` array, set its `.documentType` to 'economicSelectionCriteria', and set its `.id`."
/LEFTI/ECONOMIC_FINANCIAL_INFO,info_evaluating_weth_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria.criteria` array, set its `.type` to 'economic', and map to its `.description`."
/LEFTI/ECONOMIC_FINANCIAL_MIN_LEVEL,min_standards_required,,,"Get the `SelectionCriterion` object whose `.type` is 'economic', and map to its `.minimum`"
/LEFTI/TECHNICAL_CRITERIA_DOC,criteria_selection_docs,,,"Add a `Document` object to the `tender.documents` array, set its `.documentType` to 'technicalSelectionCriteria', and set its `.id`."
/LEFTI/TECHNICAL_PROFESSIONAL_INFO,info_evaluating_weth_requir,,,"Add a `SelectionCriterion` object to the `tender.selectionCriteria.criteria` array, set its `.type` to 'technical', and map to its `.description`."
/LEFTI/TECHNICAL_PROFESSIONAL_MIN_LEVEL,min_standards_required,,,"Get the `SelectionCriterion` object whose `.type` is 'technical', and map to its `.minimum`"
/LEFTI/RESTRICTED_SHELTERED_WORKSHOP,restricted_sheltered_workshop,,,"Set `tender.otherRequirements.reservedParticipation` to 'shelteredWorkshop'"
/LEFTI/RESTRICTED_SHELTERED_PROGRAM,restricted_sheltered_program,,,"Set `tender.contractTerms.hasReservedExecution` to `true`, and set `tender.contractTerms.reservedExecution` to 'Sheltered employment programmes'"
/LEFTI/PARTICULAR_PROFESSION,particular_profession_reserved,,,Set `tender.contractTerms.hasReservedExecution` to `true`
/LEFTI/REFERENCE_TO_LAW,ref_law_reg_prov,,,Map to `tender.contractTerms.reservedExecution`
/LEFTI/PERFORMANCE_CONDITIONS,other_conditions,III.2.2,,Map to `tender.contractTerms.performanceTerms`
/LEFTI/PERFORMANCE_STAFF_QUALIFICATION,staff_responsible_indicate,,,Set `tender.otherRequirements.requiresStaffNamesQualifications` to `true`
/PROCEDURE,procedure,IV,,""
/PROCEDURE/PT_RESTRICTED,proctype_restricted,,,"Set `tender.procurementMethod` to 'selective', and set `tender.procurementMethodDetails` to 'Restricted procedure'"
/PROCEDURE/PT_COMPETITIVE_NEGOTIATION,proctype_comp_negotiation,,,"Set `tender.procurementMethod` to 'selective', and set `tender.procurementMethodDetails` to 'Competitive procedure with negotiation'"
/PROCEDURE/FRAMEWORK,notice_involves_framework,,,Set `tender.techniques.hasFrameworkAgreement` to `true`
/PROCEDURE/FRAMEWORK/SEVERAL_OPERATORS,framework_several,,,"If *Envisaged maximum number of participants to the framework agreement* isn't set, set `tender.techniques.frameworkAgreement.maximumNumberParticipants` to 1e9999 (which parses to infinity)"
/PROCEDURE/FRAMEWORK/NB_PARTICIPANTS,framework_particip_envis,,,Map to `tender.techniques.frameworkAgreement.maximumNumberParticipants`
/PROCEDURE/FRAMEWORK/SINGLE_OPERATOR,framework_single,,,Set `tender.techniques.frameworkAgreement.maximumNumberParticipants` to 1
/PROCEDURE/FRAMEWORK/JUSTIFICATION,framework_just_four,,,Map to `tender.techniques.frameworkAgreement.durationRationale`
/PROCEDURE/FRAMEWORK/SEVERAL_OPERATORS,framework_several,,,"If *Envisaged maximum number of participants to the framework agreement* isn't set, set `tender.techniques.frameworkAgreement.maximumParticipants` to 1e9999 (which parses to infinity)"
/PROCEDURE/FRAMEWORK/NB_PARTICIPANTS,framework_particip_envis,,,Map to `tender.techniques.frameworkAgreement.maximumParticipants`
/PROCEDURE/FRAMEWORK/SINGLE_OPERATOR,framework_single,,,Set `tender.techniques.frameworkAgreement.maximumParticipants` to 1
/PROCEDURE/FRAMEWORK/JUSTIFICATION,framework_just_four,,,Map to `tender.techniques.frameworkAgreement.periodRationale`
/PROCEDURE/DPS,notice_involves_dps,,,Set `tender.techniques.hasDynamicPurchasingSystem` to `true`
/PROCEDURE/DPS_ADDITIONAL_PURCHASERS,dps_purchasers,,,Set `tender.techniques.dynamicPurchasingSystem.type` to 'open'
/PROCEDURE/EAUCTION_USED,eauction_will_used,,,Set `tender.techniques.hasElectronicAuction` to `true`
Expand All @@ -121,7 +121,7 @@ xpath,label-key,index,comment,guidance
/PROCEDURE/DATE_AWARD_SCHEDULED,award_scheduled,IV.2.5,,Map to `tender.awardPeriod.startDate`
/COMPLEMENTARY_INFO,info_complement,VI,,""
/COMPLEMENTARY_INFO/EORDERING,eordering_used,,https://github.com/open-contracting-archive/trade/tree/master/draft_extensions/tender_ElectronicWorkflows,Set `tender.contractTerms.hasElectronicOrdering` to `true`
/COMPLEMENTARY_INFO/EINVOICING,einvoicing_used,,https://github.com/open-contracting-archive/trade/tree/master/draft_extensions/tender_ElectronicWorkflows https://github.com/eForms/eForms/issues/88,Set `tender.contractTerms.electronicInvoicing` to 'allowed'
/COMPLEMENTARY_INFO/EINVOICING,einvoicing_used,,https://github.com/open-contracting-archive/trade/tree/master/draft_extensions/tender_ElectronicWorkflows https://github.com/eForms/eForms/issues/88,Set `tender.contractTerms.electronicInvoicingPolicy` to 'allowed'
/COMPLEMENTARY_INFO/EPAYMENT,epayment_used,,https://github.com/open-contracting-archive/trade/tree/master/draft_extensions/tender_ElectronicWorkflows https://github.com/eForms/eForms/issues/88,Set `tender.contractTerms.hasElectronicPayment` to `true`
/COMPLEMENTARY_INFO/INFO_ADD,info_additional,VI.3,,Map to `description`
/COMPLEMENTARY_INFO/ADDRESS_REVIEW_BODY,appeals_body,VI.4.1,https://github.com/open-contracting-archive/trade/tree/master/draft_extensions/tender_ReviewProcedure,"[Add a party](../operations#add-a-party), and add 'reviewBody' to its `.roles`"
Expand Down
Loading

0 comments on commit f08f6f3

Please sign in to comment.