From 80cb7e90757289a8cf667e999024d1d98cc8cd90 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 18 Mar 2025 10:09:10 +0100
Subject: [PATCH 1/7] feat: refs #8775 enhance VnSelect component with nextTick
 for improved loading handling

---
 src/components/common/VnSelect.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 339f90e0ef8..6eda038919c 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
@@ -247,6 +247,7 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
+    if (isLoading.value) return update();
     if (!val && lastVal.value === val) {
         lastVal.value = val;
         return update();
@@ -294,6 +295,7 @@ async function onScroll({ to, direction, from, index }) {
         await arrayData.loadMore();
         setOptions(arrayData.store.data);
         vnSelectRef.value.scrollTo(lastIndex);
+        await nextTick();
         isLoading.value = false;
     }
 }

From dfdb9685d25c491dff393ac7b19b35533ecfa983 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 18 Mar 2025 12:09:46 +0100
Subject: [PATCH 2/7] fix: fixed sms when clients do not have phone

---
 src/i18n/locale/en.yml           |  2 ++
 src/i18n/locale/es.yml           |  2 ++
 src/pages/Route/RouteTickets.vue | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d7187371e4f..7ce4e49a140 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -893,6 +893,8 @@ components:
     VnLv:
         copyText: '{copyValue} has been copied to the clipboard'
     iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
+    VnNotes:
+        clientWithoutPhone: 'The following clients do not have a phone number and the message will not be sent to them: {clientWithoutPhone}'
 weekdays:
     sun: Sunday
     mon: Monday
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fc3018f3977..7ce2a446b32 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -980,6 +980,8 @@ components:
     VnLv:
         copyText: '{copyValue} se ha copiado al portapepeles'
     iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
+    VnNotes:
+        clientWithoutPhone: 'Estos clientes no tienen asociado número de télefono y el sms no les será enviado: {clientWithoutPhone}'
 weekdays:
     sun: Domingo
     mon: Lunes
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index adc7dfdaaad..c056a0b3d1b 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -199,12 +199,22 @@ const confirmRemove = (ticket) => {
 const openSmsDialog = async () => {
     const clientsId = [];
     const clientsPhone = [];
-
+    const clientWithoutPhone = [];
     for (let ticket of selectedRows.value) {
         clientsId.push(ticket?.clientFk);
         const { data: client } = await axios.get(`Clients/${ticket?.clientFk}`);
+        if (!client.phone) {
+            clientWithoutPhone.push(ticket?.clientFk);
+            continue;
+        }
         clientsPhone.push(client.phone);
     }
+    if (clientWithoutPhone.length) {
+        quasar.notify({
+            type: 'warning',
+            message: t('components.VnNotes.clientWithoutPhone', { clientWithoutPhone }),
+        });
+    }
 
     quasar.dialog({
         component: SendSmsDialog,

From 1caa3055f3318e825559d2ebcdd54524ef2985f3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 18 Mar 2025 13:59:13 +0100
Subject: [PATCH 3/7] fix: fixed department descriptor icon

---
 src/components/ui/CardDescriptor.vue          | 67 ++++++++++++++-----
 .../Account/Role/Card/RoleDescriptor.vue      |  1 +
 src/router/modules/worker.js                  |  1 +
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index a29d1d42971..168b69f42bf 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -5,7 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
 
@@ -38,10 +38,15 @@ const $props = defineProps({
         type: String,
         default: 'md-width',
     },
+    toModule: {
+        type: String,
+        default: null,
+    },
 });
 
 const state = useState();
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
@@ -50,6 +55,9 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const DESCRIPTOR_PROXY = 'DescriptorProxy';
+const moduleName = ref();
+const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -76,15 +84,18 @@ onBeforeMount(async () => {
     );
 });
 
-const routeName = computed(() => {
-    const DESCRIPTOR_PROXY = 'DescriptorProxy';
-
+function getName() {
     let name = $props.dataKey;
     if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
         name = name.split(DESCRIPTOR_PROXY)[0];
     }
-    return `${name}Summary`;
+    return name;
+}
+const routeName = computed(() => {
+    let routeName = getName();
+    return `${routeName}Summary`;
 });
+
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -120,20 +131,41 @@ function copyIdText(id) {
 
 const emit = defineEmits(['onFetch']);
 
-const iconModule = computed(() => route.matched[1].meta.icon);
-const toModule = computed(() =>
-    route.matched[1].path.split('/').length > 2
-        ? route.matched[1].redirect
-        : route.matched[1].children[0].redirect,
-);
+const iconModule = computed(() => {
+    moduleName.value = getName();
+    if ($props.toModule) {
+        return router
+            .getRoutes()
+            .find((r) => r.name && r.name.includes($props.toModule.name)).meta.icon;
+    }
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.meta?.icon;
+    } else {
+        return route.matched[1].meta.icon;
+    }
+});
+
+const toModule = computed(() => {
+    moduleName.value = getName();
+    if ($props.toModule) return $props.toModule;
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.redirect;
+    } else {
+        return route.matched[1].path.split('/').length > 2
+            ? route.matched[1].redirect
+            : route.matched[1].children[0].redirect;
+    }
+});
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action"
-                    ><QBtn
+                <slot name="header-extra-action">
+                    <QBtn
                         round
                         flat
                         dense
@@ -141,13 +173,13 @@ const toModule = computed(() =>
                         :icon="iconModule"
                         color="white"
                         class="link"
-                        :to="$attrs['to-module'] ?? toModule"
+                        :to="toModule"
                     >
                         <QTooltip>
                             {{ t('globals.goToModuleIndex') }}
                         </QTooltip>
-                    </QBtn></slot
-                >
+                    </QBtn>
+                </slot>
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                     round
@@ -158,6 +190,7 @@ const toModule = computed(() =>
                     color="white"
                     class="link"
                     v-if="summary"
+                    data-cy="openSummaryBtn"
                 >
                     <QTooltip>
                         {{ t('components.smartCard.openSummary') }}
@@ -172,6 +205,7 @@ const toModule = computed(() =>
                         icon="launch"
                         round
                         size="md"
+                        data-cy="goToSummaryBtn"
                     >
                         <QTooltip>
                             {{ t('components.cardDescriptor.summary') }}
@@ -230,7 +264,6 @@ const toModule = computed(() =>
             </div>
             <slot name="after" />
         </template>
-        <!-- Skeleton -->
         <SkeletonDescriptor v-if="!entity || isLoading" />
     </div>
     <QInnerLoading
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index 517517af0dd..051359702c4 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -37,6 +37,7 @@ const removeRole = async () => {
         :filter="{ where: { id: entityId } }"
         data-key="Role"
         :summary="$props.summary"
+        :to-module="{ name: 'AccountRoles' }"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeRole()">
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 3eb95a96ee2..9d68904e33e 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -271,6 +271,7 @@ export default {
                     path: 'department',
                     name: 'Department',
                     redirect: { name: 'WorkerDepartment' },
+                    meta: { title: 'department', icon: 'vn:greuge' },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                     children: [
                         {

From 092a338e72dd4deb9af4e9020f8bd45c9e31a124 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 18 Mar 2025 14:03:38 +0100
Subject: [PATCH 4/7] fix: card descriptor merge

---
 src/components/ui/CardDescriptor.vue | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9e1f58500c1..1bbd3c5f1bb 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -48,7 +48,6 @@ const $props = defineProps({
 const state = useState();
 const route = useRoute();
 const router = useRouter();
-const router = useRouter();
 const { t } = useI18n();
 const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
@@ -60,9 +59,6 @@ const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
 const DESCRIPTOR_PROXY = 'DescriptorProxy';
 const moduleName = ref();
 const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
-const DESCRIPTOR_PROXY = 'DescriptorProxy';
-const moduleName = ref();
-const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -89,7 +85,6 @@ onBeforeMount(async () => {
     );
 });
 
-function getName() {
 function getName() {
     let name = $props.dataKey;
     if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
@@ -97,17 +92,11 @@ function getName() {
     }
     return name;
 }
-const routeName = computed(() => {
-    let routeName = getName();
-    return `${routeName}Summary`;
-    return name;
-}
 const routeName = computed(() => {
     let routeName = getName();
     return `${routeName}Summary`;
 });
 
-
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -176,8 +165,6 @@ const toModule = computed(() => {
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action">
-                    <QBtn
                 <slot name="header-extra-action">
                     <QBtn
                         round
@@ -188,14 +175,11 @@ const toModule = computed(() => {
                         color="white"
                         class="link"
                         :to="toModule"
-                        :to="toModule"
                     >
                         <QTooltip>
                             {{ t('globals.goToModuleIndex') }}
                         </QTooltip>
                     </QBtn>
-                </slot>
-                    </QBtn>
                 </slot>
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
@@ -208,7 +192,6 @@ const toModule = computed(() => {
                     class="link"
                     v-if="summary"
                     data-cy="openSummaryBtn"
-                    data-cy="openSummaryBtn"
                 >
                     <QTooltip>
                         {{ t('components.smartCard.openSummary') }}
@@ -224,7 +207,6 @@ const toModule = computed(() => {
                         round
                         size="md"
                         data-cy="goToSummaryBtn"
-                        data-cy="goToSummaryBtn"
                     >
                         <QTooltip>
                             {{ t('components.cardDescriptor.summary') }}

From 42022889b2e52cdffdc3ef760af9ece3e34a6354 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 18 Mar 2025 14:13:01 +0100
Subject: [PATCH 5/7] fix: card descriptor imports

---
 src/components/ui/CardDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 1bbd3c5f1bb..168b69f42bf 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -6,7 +6,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute, useRouter } from 'vue-router';
-import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
 

From 9ae89eaf93d87c769f6d39b8cc18520f4e06a059 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 20 Mar 2025 09:24:56 +0100
Subject: [PATCH 6/7] refactor: deleted useless

---
 src/router/modules/worker.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 9d68904e33e..3eb95a96ee2 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -271,7 +271,6 @@ export default {
                     path: 'department',
                     name: 'Department',
                     redirect: { name: 'WorkerDepartment' },
-                    meta: { title: 'department', icon: 'vn:greuge' },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                     children: [
                         {

From b2eaf7543c2ba1dd638c37dd4d29ec814635a9b2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 20 Mar 2025 12:25:14 +0100
Subject: [PATCH 7/7] fix: refs #7323 department

---
 .../Worker/Department/Card/DepartmentDescriptorProxy.vue    | 1 +
 src/router/modules/worker.js                                | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
index 5b556f65549..c793e931955 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
@@ -16,6 +16,7 @@ const $props = defineProps({
             v-if="$props.id"
             :id="$props.id"
             :summary="DepartmentSummary"
+            data-key="DepartmentDescriptorProxy"
         />
     </QPopupProxy>
 </template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 3eb95a96ee2..ff3d483cf5e 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -271,12 +271,14 @@ export default {
                     path: 'department',
                     name: 'Department',
                     redirect: { name: 'WorkerDepartment' },
-                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                    meta: { title: 'department', icon: 'vn:greuge' },
                     children: [
                         {
+                            component: () =>
+                                import('src/pages/Worker/WorkerDepartment.vue'),
+                            meta: { title: 'department', icon: 'vn:greuge' },
                             name: 'WorkerDepartment',
                             path: 'list',
-                            meta: { title: 'department', icon: 'vn:greuge' },
                         },
                         departmentCard,
                     ],