Section III mapped for F01 through F21 #15
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpmckinney
reviewed
Aug 28, 2019
output/mapping/F01_2014.csv
Outdated
| /LEFTI/PERFORMANCE_CONDITIONS,other_conditions,III.2.2,,Map to `tender.contractTerms.termsPerformance` | ||
| /LEFTI/PERFORMANCE_STAFF_QUALIFICATION,staff_responsible_indicate,,,"" | ||
| /LEFTI/PERFORMANCE_STAFF_QUALIFICATION,staff_responsible_indicate,,,Set `tender.contractTerms.hasObligationStaffQualificationInformation` to `true` |
There was a problem hiding this comment.
This is very long. eForms uses "Performing Staff Qualification".
There was a problem hiding this comment.
And it probably shouldn't be in contractTerms. I had created tender.participationConditions, would it fit better there?
There was a problem hiding this comment.
I'm not 100% sure to what this relates. The form has it under "Conditions related to the contract", so I assume it's deliberately not under "Conditions for participation". eForms puts it under "Other requirements"; there is no relevant discussion on GitHub of its semantics or model. ESPD doesn't seem to include it…
Article 19 (Economic operators) of 2014/24/EU is directly relevant, which makes it seem more like a submission term:
legal persons may be required to indicate, in the tender or the request to participate, the names and relevant professional qualifications of the staff to be responsible for the performance of the contract in question.
I've asked Jachym via email, but for now I'll move it to Submission Terms.
There was a problem hiding this comment.
To be conservative, I'll actually move it to Other Requirements for now.
…upport into sectionIII
…cipationConditions
|
I think I have implemented all the changes. |
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
|
Quite a few tweaks: Field name changes:
Modelling changes:
Code changes:
All forms:
Other changes not related to this pull request:
|
|
Wow, you had a lot of editing to do on top of my work. Thanks! I'll try to pay more attention to eForms structure and wording. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main difficulty was with the field
/LEFTI/PARTICULAR_PROFESSIONthat has slightly different modelling rules depending on the form. Sometimes its a boolean (F01, type="services"), sometimes it's a string (F12, type="text_ft_multi_lines").The XML Schema doesn't help much. I'd be grateful if could have a look at it.
Didn't map for: