diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83cf615f..b3da5099 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,7 @@ name: Build and deploy (test) on: + workflow_dispatch: push: branches: - "test" @@ -12,7 +13,6 @@ on: - '*.example' - 'netlify.toml' - '*.md' - workflow_dispatch: jobs: deploy: diff --git a/README.md b/README.md index 4949752a..7e95d88a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CartoBio -Application de suivi et de certificaton du parcellaire bio à destination des _opérateurs bio_[^1] et aux _organismes de certification_. +Application de suivi et de certificaton du parcellaire bio à destination des _opérateurs bio_[^1] et des _organismes de certification_. Cette application implémente [la maquette Figma CartoBio][maquette-figma] ainsi que le [Système de Design de l'État](https://www.systeme-de-design.gouv.fr/) avec [Vue 3], [Vue Router], [Vue Pages] et [Pinia]. diff --git a/package-lock.json b/package-lock.json index 5b85bb93..563ccad6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@agencebio/cartobio-front", - "version": "2.25.6", + "version": "2.26.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@agencebio/cartobio-front", - "version": "2.25.6", + "version": "2.26.0", "dependencies": { "@agencebio/rosetta-cultures": "^2.1.0", "@algolia/autocomplete-js": "^1.8.3", @@ -34,7 +34,7 @@ "vue-matomo": "^4.1.0", "vue-router": "^4.0.12", "vue3-toastify": "^0.1.11", - "xlsx": "git+https://git.sheetjs.com/sheetjs/sheetjs.git#semver:^v0.20.2" + "xlsx": "git+https://git.sheetjs.com/sheetjs/sheetjs.git" }, "devDependencies": { "@agencebio/cartobio-types": "^1.6.1", @@ -12328,9 +12328,8 @@ } }, "node_modules/xlsx": { - "version": "0.20.2", - "resolved": "git+https://git.sheetjs.com/sheetjs/sheetjs.git#a0bed2a97dcb1e3b76049be91abf3747f333c975", - "license": "Apache-2.0", + "version": "0.20.3", + "resolved": "git+https://git.sheetjs.com/sheetjs/sheetjs.git#2669c7cf1c8a119f667d2d58c183c35073bb6e2f", "bin": { "xlsx": "bin/xlsx.njs" }, diff --git a/package.json b/package.json index 8a941658..eb23e54d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@agencebio/cartobio-front", - "version": "2.25.6", + "version": "2.26.0", "private": true, "type": "module", "scripts": { @@ -47,7 +47,7 @@ "vue-matomo": "^4.1.0", "vue-router": "^4.0.12", "vue3-toastify": "^0.1.11", - "xlsx": "git+https://git.sheetjs.com/sheetjs/sheetjs.git#semver:^v0.20.2" + "xlsx": "git+https://git.sheetjs.com/sheetjs/sheetjs.git" }, "devDependencies": { "@agencebio/cartobio-types": "^1.6.1", diff --git a/src/components/forms/EditVersionForm.vue b/src/components/forms/EditVersionForm.vue index 6887a9e9..856150ac 100644 --- a/src/components/forms/EditVersionForm.vue +++ b/src/components/forms/EditVersionForm.vue @@ -21,9 +21,19 @@ useFocus(autofocusedElement, { initialValue: true }) const patch = reactive({ version_name: record.version_name, audit_date: record.audit_date, + certification_date_debut: record.certification_date_debut, certification_date_fin: record.certification_date_fin }) +const datesCertificationConflict = computed(() => { + if (!patch.certification_date_debut || !patch.certification_date_fin) { + return false; + } + const debutCertificationDate = new Date(patch.certification_date_debut) + const finCertificationDate = new Date(patch.certification_date_fin) + return debutCertificationDate >= finCertificationDate +}) + const dateConflict = computed(() => { let newDate try { @@ -38,6 +48,7 @@ function save() { recordStore.updateInfo({ version_name: patch.version_name, ...(patch.audit_date && { audit_date: patch.audit_date }), + ...(patch.certification_date_debut && { certification_date_debut: patch.certification_date_debut }), ...(patch.certification_date_fin && { certification_date_fin: patch.certification_date_fin }) }) @@ -79,19 +90,25 @@ function save() {
- +
- + +
+ +
+

+ La date de début de validé du certificat doit être antérieure à la date de fin de validité de celui-ci. +