From 4cf954823485ebcfbf5bcf85466701e70690c5e7 Mon Sep 17 00:00:00 2001 From: Kevin Martinez Date: Sun, 28 Jan 2024 15:40:57 -0300 Subject: [PATCH] Fix shelving module --- .../Shelving/Card/ShelvingDescriptorMenu.vue | 26 ++++++++----------- src/pages/Shelving/Card/ShelvingFilter.vue | 2 ++ src/pages/Shelving/Card/ShelvingSearchbar.vue | 2 +- src/pages/Shelving/Card/ShelvingSummary.vue | 10 ++++--- src/pages/Shelving/ShelvingList.vue | 8 +----- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue index 6290cda75..684a46807 100644 --- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue +++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue @@ -21,19 +21,19 @@ function confirmRemove() { .dialog({ component: VnConfirm, componentProps: { - title: t('confirmDeletion'), - message: t('confirmDeletionMessage'), - promise: remove, + title: t('Confirm deletion'), + message: t('Are you sure you want to delete this shelving?'), + promise: remove }, }) - .onOk(async () => await router.push({ name: 'ShelvingList' })); } async function remove() { - if (!$props.shelving.value.id) { + if (!$props.shelving.id) { return; } - await axios.delete(`Shelvings/${$props.shelving.value.id}`); + await axios.delete(`Shelvings/${$props.shelving.id}`); + await router.push({ name: 'ShelvingList' }); quasar.notify({ message: t('globals.dataDeleted'), type: 'positive', @@ -45,17 +45,13 @@ async function remove() { - {{ t('deleteShelving') }} + {{ t('Delete Shelving') }} -{ - "en": { - "deleteShelving": "Delete Shelving" - }, - "es": { - "deleteShelving": "Eliminar carro" - } -} +es: + Confirm deletion: Confirmar eliminación + Are you sure you want to delete this shelving?: ¿Seguro que quieres eliminar este carro? + Delete Shelving: Eliminar carro diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue index 423402f89..d4ec41e15 100644 --- a/src/pages/Shelving/Card/ShelvingFilter.vue +++ b/src/pages/Shelving/Card/ShelvingFilter.vue @@ -112,9 +112,11 @@ en: parkingFk: Parking userFk: Worker isRecyclable: Recyclable + search: Search es: params: parkingFk: Parking userFk: Trabajador isRecyclable: Reciclable + search: Contiene diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue index 89a4de01e..829d7719c 100644 --- a/src/pages/Shelving/Card/ShelvingSearchbar.vue +++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue @@ -7,12 +7,12 @@ const { t } = useI18n(); - es: Search shelving: Buscar carros diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue index f1f914385..5f93c4a02 100644 --- a/src/pages/Shelving/Card/ShelvingSummary.vue +++ b/src/pages/Shelving/Card/ShelvingSummary.vue @@ -24,7 +24,7 @@ const hideRightDrawer = () => { if (!isDialog) { stateStore.rightDrawer = false; } -} +}; onMounted(hideRightDrawer); onUnmounted(hideRightDrawer); const filter = { @@ -69,9 +69,13 @@ const filter = {