From 7f3d9ef9c6920888c1d35c5f462cc7f375e35fb6 Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 13 Feb 2026 08:10:33 +0000 Subject: [PATCH] [#325] Corrections diverses (!26) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | Numéro du ticket | Titre du ticket | |------------------|-----------------| | #325 | Corrections diverses | ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: https://gitea.malio.fr/MALIO-DEV/Ferme/pulls/26 Reviewed-by: Autin Co-authored-by: kevin Co-committed-by: kevin --- .idea/data_source_mapping.xml | 10 - .idea/workspace.xml | 216 +++++++++--------- CHANGELOG.md | 1 + .../reception/reception-bovine-received.vue | 2 +- .../components/reception/reception-form.vue | 10 +- .../reception/reception-product-received.vue | 2 +- .../components/reception/reception-weight.vue | 6 +- .../reception/update-merchandise.vue | 121 +++++----- .../components/reception/update-weight.vue | 88 +++++-- .../components/shipment/shipment-form.vue | 12 +- frontend/components/ui/UiNumberInput.vue | 4 +- frontend/layouts/admin.vue | 51 ++++- frontend/layouts/default.vue | 9 +- frontend/pages/admin/supplier/[[id]].vue | 13 +- .../pages/admin/supplier/supplier-list.vue | 2 +- frontend/pages/admin/user/[[id]].vue | 8 +- frontend/pages/reception/[[id]].vue | 2 +- frontend/pages/reception/update/[[id]].vue | 83 ++++--- frontend/pages/shipment/[[id]].vue | 2 +- frontend/services/dto/weight-data.ts | 1 + src/Entity/Carrier.php | 2 + src/Entity/Supplier.php | 5 +- src/State/UserPasswordProcessor.php | 8 +- 23 files changed, 384 insertions(+), 274 deletions(-) delete mode 100644 .idea/data_source_mapping.xml diff --git a/.idea/data_source_mapping.xml b/.idea/data_source_mapping.xml deleted file mode 100644 index 531f7a7..0000000 --- a/.idea/data_source_mapping.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 42ee722..3661a97 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,28 +4,10 @@ - - - - - - @@ -781,7 +770,13 @@ - @@ -791,10 +786,19 @@ 6 diff --git a/CHANGELOG.md b/CHANGELOG.md index dc8b257..55246f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Ajouter dans le fichier .env du frontend * [#276] Lister les expéditions terminées * [#324] Creation page admin listing clients * [#326] Admin modification creation client +* [#325] Correction diverses ### Changed diff --git a/frontend/components/reception/reception-bovine-received.vue b/frontend/components/reception/reception-bovine-received.vue index 4a928d2..c44e8cb 100644 --- a/frontend/components/reception/reception-bovine-received.vue +++ b/frontend/components/reception/reception-bovine-received.vue @@ -29,7 +29,7 @@ diff --git a/frontend/components/reception/reception-form.vue b/frontend/components/reception/reception-form.vue index 52ec0d3..14f10a5 100644 --- a/frontend/components/reception/reception-form.vue +++ b/frontend/components/reception/reception-form.vue @@ -119,7 +119,7 @@ @@ -342,7 +342,7 @@ onMounted(async () => { // Ajuste driver/vehicle quand le transporteur change (logique LIOT) watch( - () => [form.supplierId, suppliers.value], + () => [form.supplierId, form.addressId, suppliers.value], () => { if (!form.supplierId) { form.addressId = '' @@ -359,7 +359,11 @@ watch( (address) => String(address.id) === form.addressId ) if (!matches) { - form.addressId = '' + if (supplierAddresses.value.length === 1) { + form.addressId = String(supplierAddresses.value[0].id) + } else { + form.addressId = '' + } } }, {immediate: true} diff --git a/frontend/components/reception/reception-product-received.vue b/frontend/components/reception/reception-product-received.vue index 79c01e2..c455434 100644 --- a/frontend/components/reception/reception-product-received.vue +++ b/frontend/components/reception/reception-product-received.vue @@ -67,7 +67,7 @@ diff --git a/frontend/components/reception/reception-weight.vue b/frontend/components/reception/reception-weight.vue index 5547810..9ecb5dd 100644 --- a/frontend/components/reception/reception-weight.vue +++ b/frontend/components/reception/reception-weight.vue @@ -26,7 +26,7 @@ v-if="displayWeight !== null && !showGenerateReceipt" class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4" @click="saveWeight" - >Valider la pesée + >Valider +

+ v{{ version }} +

- +
@@ -66,7 +93,9 @@ import {useAuthStore} from '~/stores/auth' const auth = useAuthStore() -const { version } = useAppVersion() +const {version} = useAppVersion() + +const route = useRoute() const handleLogout = async () => { try { await auth.logout() diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index 5254dd3..d29dd95 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -1,6 +1,6 @@