From 5712810ae28548f97727adaeefed9aceb2015ca1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 12:00:20 +0200
Subject: [PATCH 1/3] fix: refs #6938 rollback phone

---
 src/pages/Worker/Card/WorkerBasicData.vue  |  3 --
 src/pages/Worker/Card/WorkerDescriptor.vue | 26 +++++++++++-
 src/pages/Worker/Card/WorkerSummary.vue    | 49 ++++++++++++++++++++--
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 775472065..c59f4281d 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -27,7 +27,6 @@ const workerFilter = {
         },
         { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
         { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: {fields:['phone']} },
     ],
 };
 const workersFilter = {
@@ -87,7 +86,6 @@ const maritalStatus = [
                     :label="t('Mobile extension')"
                     clearable
                 />
-                <VnInput v-model="data.client.phone" :label="t('Personal phone')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
@@ -159,7 +157,6 @@ es:
     Last name: Apellidos
     Business phone: Teléfono de empresa
     Mobile extension: Extensión móvil
-    Personal phone: Teléfono personal
     Boss: Jefe
     Marital status: Estado civil
     Married: Casado/a
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6f876b8fa..a20ad5546 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -31,7 +31,29 @@ const entityId = computed(() => {
 });
 
 const worker = ref();
-const filter = { where: { id: entityId } };
+const filter = {
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['email', 'name', 'nickname'],
+            },
+        },
+        {
+            relation: 'department',
+            scope: {
+                include: [
+                    {
+                        relation: 'department',
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'sip',
+        },
+    ],
+};
 
 const sip = ref(null);
 
@@ -60,7 +82,7 @@ const setData = (entity) => {
     <CardDescriptor
         module="Worker"
         data-key="workerData"
-        url="Workers/summary"
+        :url="`Workers/${entityId}`"
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 43c493565..dad21cda5 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -10,7 +10,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
-const { params } = useRoute();
+const route = useRoute();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -20,18 +20,53 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => $props.id || params.id);
+const entityId = computed(() => $props.id || route.params.id);
 const workerUrl = ref();
 
 onMounted(async () => {
     workerUrl.value = (await getUrl('')) + `worker/${entityId.value}/`;
 });
 
-const filter = { where: { id: entityId.value } };
+const filter = {
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['email', 'name', 'nickname', 'roleFk'],
+                include: {
+                    relation: 'role',
+                    scope: {
+                        fields: ['name'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'department',
+            scope: {
+                include: {
+                    relation: 'department',
+                    scope: {
+                        fields: ['name'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'boss',
+        },
+        {
+            relation: 'client',
+        },
+        {
+            relation: 'sip',
+        },
+    ],
+};
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`Workers/summary`" :filter="filter">
+    <CardSummary ref="summary" :url="`Workers/${entityId}`" :filter="filter">
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>
@@ -68,6 +103,12 @@ const filter = { where: { id: entityId.value } };
                         <VnLinkPhone :phone-number="worker.phone" />
                     </template>
                 </VnLv>
+                <VnLv :value="worker.client?.phone">
+                    <template #label>
+                        {{ t('worker.summary.personalPhone') }}
+                        <VnLinkPhone :phone-number="worker.client?.phone" />
+                    </template>
+                </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
             </QCard>
             <QCard class="vn-one">

From 0a71060f603ead9badd05d1f09b0424f4a14e012 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 15:28:00 +0200
Subject: [PATCH 2/3] fix: refs #6938 workerCard

---
 src/pages/Worker/Card/WorkerCard.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index e0047bf9e..d76ef6f59 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,15 +1,12 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-
-const filter = { where: {} };
 </script>
 <template>
     <VnCard
         data-key="Worker"
-        custom-url="Workers/Summary"
+        base-url="Workers"
         :descriptor="WorkerDescriptor"
-        :filter="filter"
         searchbar-data-key="WorkerList"
         searchbar-url="Workers/filter"
         searchbar-label="Search worker"

From 5e0db81a211b29b50ec27878434c9d63e76dc3fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 15:51:55 +0200
Subject: [PATCH 3/3] fix: refs #6938 conflicts

---
 src/pages/Worker/Card/WorkerBasicData.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 0b4250c68..4f1786a67 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -86,13 +86,6 @@ const maritalStatus = [
                     :label="t('Mobile extension')"
                     clearable
                 />
-                <<<<<<< HEAD
-                <VnInput
-                    v-model="data.client.phone"
-                    :label="t('Personal phone')"
-                    clearable
-                />
-                ======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">