diff --git a/backend/exporter/template_tags/resource.py b/backend/exporter/template_tags/resource.py index c8dac1a..8f7092e 100644 --- a/backend/exporter/template_tags/resource.py +++ b/backend/exporter/template_tags/resource.py @@ -9,42 +9,43 @@ from exporter.tag import TemplateTag, argument, template CHECKS = { - "coherent.period", - "coherent.procurement_method_vs_number_of_tenderers", - "coherent.tender_status", + "coherent.amendments_dates", "coherent.awards_status", "coherent.contracts_status", - "coherent.milestone_status", - "coherent.value_realistic", "coherent.dates", - "coherent.milestones_dates", - "coherent.amendments_dates", "coherent.documents_dates", - "consistent.number_of_tenderers", - "consistent.tender_value", - "consistent.contracts_value", + "coherent.milestone_status", + "coherent.milestones_dates", + "coherent.period", + "coherent.procurement_method_vs_number_of_tenderers", + "coherent.release_date", + "coherent.tender_status", + "coherent.value_realistic", + "consistent.buyer_in_parties_roles", + "consistent.buyer_name_in_parties", "consistent.contracts_implementation_transactions_value", + "consistent.contracts_value", + "consistent.number_of_tenderers", "consistent.parties_roles", - "consistent.period_duration_in_days", - "consistent.buyer_in_parties_roles", - "consistent.supplier_in_parties_roles", - "consistent.tenderer_in_parties_roles", - "consistent.procuring_entity_in_parties_roles", - "consistent.payer_in_parties_roles", "consistent.payee_in_parties_roles", - "consistent.buyer_name_in_parties", "consistent.payee_name_in_parties", + "consistent.payer_in_parties_roles", "consistent.payer_name_in_parties", + "consistent.period_duration_in_days", + "consistent.procuring_entity_in_parties_roles", "consistent.procuring_entity_name_in_parties", + "consistent.supplier_in_parties_roles", "consistent.supplier_name_in_parties", + "consistent.tender_value", + "consistent.tenderer_in_parties_roles", "consistent.tenderer_name_in_parties", "reference.buyer_in_parties", + "reference.contract_in_awards", "reference.payee_in_parties", "reference.payer_in_parties", "reference.procuring_entity_in_parties", "reference.supplier_in_parties", "reference.tenderer_in_parties", - "reference.contract_in_awards", } diff --git a/frontend/src/components/ResourceLevelList.vue b/frontend/src/components/ResourceLevelList.vue index 3b1640f..839ead7 100644 --- a/frontend/src/components/ResourceLevelList.vue +++ b/frontend/src/components/ResourceLevelList.vue @@ -93,6 +93,7 @@ export default { "coherent.contracts_status", "coherent.milestone_status", "coherent.dates", + "coherent.release_date", "coherent.milestones_dates", "coherent.amendments_dates", "coherent.documents_dates", diff --git a/frontend/src/messages/en.js b/frontend/src/messages/en.js index 5253262..0e070c3 100644 --- a/frontend/src/messages/en.js +++ b/frontend/src/messages/en.js @@ -416,7 +416,12 @@ export const messages = { dates: { name: "Contracting process timeline", description: - "
All dates relating to stages of the contracting process follow a coherent timeline.
tender.tenderPeriod.endDate <= tender.contractPeriod.startDate
: The last day for submissions isn't after the contract's anticipated start date.tender.tenderPeriod.endDate <= awards[].date
: The last day for submissions isn't after an award's date.tender.tenderPeriod.endDate <= contracts[].dateSigned
: The last day for submissions isn't after a contract's signature date.awards[i].date <= contracts[].dateSigned
: An award's date isn't after the signature date of any of its related contracts.contracts[].dateSigned <= contracts[].implementation.transactions[].date
: A contract's signature date isn't after the date of any of its related transactions.Also, each award's date
and each contract's dateSigned
aren't after the release date.
Since the test operates on multiple dates, the test silently ignores any dates that can't be parsed.
", + "All dates relating to stages of the contracting process follow a coherent timeline.
tender.tenderPeriod.endDate <= tender.contractPeriod.startDate
: The last day for submissions isn't after the contract's anticipated start date.tender.tenderPeriod.endDate <= awards[].date
: The last day for submissions isn't after an award's date.tender.tenderPeriod.endDate <= contracts[].dateSigned
: The last day for submissions isn't after a contract's signature date.awards[i].date <= contracts[].dateSigned
: An award's date isn't after the signature date of any of its related contracts.contracts[].dateSigned <= contracts[].implementation.transactions[].date
: A contract's signature date isn't after the date of any of its related transactions.Also, each award's date
and each contract's dateSigned
aren't after the release date.
Since the test operates on multiple dates, the test silently ignores any dates that can't be parsed.
", + }, + release_date: { + name: "Release date", + description: + "No past date is after the release date.
date
isn't after the release date.dateSigned
isn't after the release date.dateModified
and dateMet
aren't after the release date.date
isn't after the release date.datePublished
and dateModified
aren't after the release date.Since the test operates on multiple dates, the test silently ignores any dates that can't be parsed.
", }, milestones_dates: { name: "Milestone dates",