From 0114de4db55d935d40d5a420516807bce1bed787 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 24 Nov 2023 09:41:57 +0100
Subject: [PATCH 1/3] feat(preview): refs #6475 add preview icon on descriptor

---
 src/components/ui/CardDescriptor.vue          | 53 +++++++++++--------
 .../Customer/Card/CustomerDescriptorProxy.vue |  2 +-
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f63b75de6..cfba0dfe1 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,9 +1,10 @@
 <script setup>
 import { onMounted, useSlots, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-
+import CustomerSummaryDialog from '../../pages/Customer/Card/CustomerSummaryDialog.vue';
 const $props = defineProps({
     url: {
         type: String,
@@ -25,8 +26,12 @@ const $props = defineProps({
         type: Number,
         default: 0,
     },
+    preview: {
+        type: Boolean,
+        default: false,
+    },
 });
-
+const quasar = useQuasar();
 const slots = useSlots();
 const { t } = useI18n();
 const entity = ref();
@@ -52,27 +57,36 @@ watch($props, async () => {
     entity.value = null;
     await fetch();
 });
+
+function viewSummary(id) {
+    quasar.dialog({
+        component: CustomerSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity">
-            <div class="header bg-primary q-pa-sm">
-                <RouterLink :to="{ name: `${module}List` }">
-                    <QBtn
-                        round
-                        flat
-                        dense
-                        size="md"
-                        icon="view_list"
-                        color="white"
-                        class="link"
-                    >
-                        <QTooltip>
-                            {{ t('components.cardDescriptor.mainList') }}
-                        </QTooltip>
-                    </QBtn>
-                </RouterLink>
+            <div class="header bg-primary q-pa-sm justify-between">
+                <QBtn
+                    @click.stop="viewSummary(entity.id)"
+                    round
+                    flat
+                    dense
+                    size="md"
+                    icon="preview"
+                    color="white"
+                    class="link"
+                    v-if="preview"
+                >
+                    <QTooltip>
+                        {{ t('components.smartCard.openSummary') }}
+                    </QTooltip>
+                </QBtn>
                 <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
                     <QBtn
                         round
@@ -88,7 +102,6 @@ watch($props, async () => {
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-
                 <QBtn
                     v-if="slots.menu"
                     size="md"
@@ -211,8 +224,6 @@ watch($props, async () => {
     width: 256px;
     .header {
         display: flex;
-        justify-content: space-between;
-        align-items: stretch;
     }
     .icons {
         margin: 0 10px;
diff --git a/src/pages/Customer/Card/CustomerDescriptorProxy.vue b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
index 84a69c026..a78726e21 100644
--- a/src/pages/Customer/Card/CustomerDescriptorProxy.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
@@ -10,6 +10,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <CustomerDescriptor v-if="$props.id" :id="$props.id" />
+        <CustomerDescriptor v-if="$props.id" :id="$props.id" :preview="true" />
     </QPopupProxy>
 </template>

From fd1f46ffc61ac0426f6347374816927af6d7e6b8 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 7 Dec 2023 12:51:47 +0100
Subject: [PATCH 2/3] feat(claimList): refs #6475 claimList add links

---
 src/components/ui/CardDescriptor.vue          | 12 ++--
 src/pages/Claim/ClaimList.vue                 | 58 ++++++++++++++-----
 .../Customer/Card/CustomerDescriptor.vue      |  5 ++
 .../Customer/Card/CustomerDescriptorProxy.vue |  7 ++-
 4 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index cfba0dfe1..2e706a56c 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-import CustomerSummaryDialog from '../../pages/Customer/Card/CustomerSummaryDialog.vue';
+
 const $props = defineProps({
     url: {
         type: String,
@@ -26,9 +26,9 @@ const $props = defineProps({
         type: Number,
         default: 0,
     },
-    preview: {
-        type: Boolean,
-        default: false,
+    summary: {
+        type: Object,
+        default: null,
     },
 });
 const quasar = useQuasar();
@@ -60,7 +60,7 @@ watch($props, async () => {
 
 function viewSummary(id) {
     quasar.dialog({
-        component: CustomerSummaryDialog,
+        component: $props.summary,
         componentProps: {
             id,
         },
@@ -81,7 +81,7 @@ function viewSummary(id) {
                     icon="preview"
                     color="white"
                     class="link"
-                    v-if="preview"
+                    v-if="summary"
                 >
                     <QTooltip>
                         {{ t('components.smartCard.openSummary') }}
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 79afc7e91..cbc51174f 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -5,12 +5,13 @@ import { useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
+import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
+import WorkerSummaryDialog from 'src/pages/Worker/Card/WorkerSummaryDialog.vue';
+import CustomerSummaryDialog from 'src/pages/Customer/Card/CustomerSummaryDialog.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -27,9 +28,25 @@ function navigate(id) {
     router.push({ path: `/claim/${id}` });
 }
 
-function viewSummary(id) {
+function viewSummary(id, summaryDialog) {
+    let dialogComponent;
+
+    switch (summaryDialog) {
+        case 'worker':
+            dialogComponent = WorkerSummaryDialog;
+            break;
+        case 'customer':
+            dialogComponent = CustomerSummaryDialog;
+            break;
+        case 'claim':
+            dialogComponent = ClaimSummaryDialog;
+            break;
+        default:
+            return;
+    }
+
     quasar.dialog({
-        component: ClaimSummaryDialog,
+        component: dialogComponent,
         componentProps: {
             id,
         },
@@ -86,12 +103,24 @@ function viewSummary(id) {
                             <VnLv label="ID" :value="row.id" />
                             <VnLv
                                 :label="t('claim.list.customer')"
-                                :value="row.clientName"
-                            />
+                                @click.stop="viewSummary(row.clientFk, 'customer')"
+                            >
+                                <template #value>
+                                    <span class="link">
+                                        {{ row.clientName }}
+                                    </span>
+                                </template>
+                            </VnLv>
                             <VnLv
                                 :label="t('claim.list.assignedTo')"
-                                :value="row.workerName"
-                            />
+                                @click.stop="viewSummary(row.workerFk, 'worker')"
+                            >
+                                <template #value>
+                                    <span class="link">
+                                        {{ row.workerName }}
+                                    </span>
+                                </template>
+                            </VnLv>
                             <VnLv
                                 :label="t('claim.list.created')"
                                 :value="toDate(row.created)"
@@ -118,18 +147,15 @@ function viewSummary(id) {
                                     {{ t('components.smartCard.openCard') }}
                                 </QTooltip>
                             </QBtn>
-                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
+                            <QBtn
+                                flat
+                                icon="preview"
+                                @click.stop="viewSummary(row.id, 'claim')"
+                            >
                                 <QTooltip>
                                     {{ t('components.smartCard.openSummary') }}
                                 </QTooltip>
                             </QBtn>
-                            <QBtn flat icon="vn:client" @click.stop>
-                                <QTooltip>
-                                    {{ t('components.smartCard.viewDescription') }}
-                                </QTooltip>
-
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
                         </template>
                     </CardList>
                 </template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 23e6228ee..4a793404d 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -34,6 +38,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :title="data.title"
         :subtitle="data.subtitle"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #body="{ entity }">
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
diff --git a/src/pages/Customer/Card/CustomerDescriptorProxy.vue b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
index a78726e21..9cdafdb9d 100644
--- a/src/pages/Customer/Card/CustomerDescriptorProxy.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerSummaryDialog from './CustomerSummaryDialog.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <CustomerDescriptor v-if="$props.id" :id="$props.id" :preview="true" />
+        <CustomerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="CustomerSummaryDialog"
+        />
     </QPopupProxy>
 </template>

From 1c3fc57e3d60a75898c88624b18405414efb48fc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 11 Dec 2023 06:35:54 +0100
Subject: [PATCH 3/3] feat: refs #6475 open descriptor proxy an show summary
 dialog button

---
 src/pages/Claim/Card/ClaimDescriptor.vue      |  5 +-
 src/pages/Claim/ClaimList.vue                 | 51 +++++++------------
 .../Customer/Card/CustomerDescriptorProxy.vue |  1 +
 src/pages/Worker/Card/WorkerDescriptor.vue    |  7 ++-
 .../Worker/Card/WorkerDescriptorProxy.vue     |  7 ++-
 test/cypress/integration/ticketBoxing.spec.js | 14 -----
 6 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index af7e84d38..dafdfacdd 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -7,6 +7,7 @@ import { useState } from 'src/composables/useState';
 
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -113,7 +114,7 @@ const setData = (entity) => {
                 <template #value>
                     <span class="link">
                         {{ entity.worker.user.name }}
-                        <WorkerDescriptorProxy :id="entity.worker.userFk" />
+                        <WorkerDescriptorProxy :id="entity.worker.user.id" />
                     </span>
                 </template>
             </VnLv>
@@ -121,7 +122,7 @@ const setData = (entity) => {
                 <template #value>
                     <span class="link">
                         {{ entity.client.salesPersonUser.name }}
-                        <WorkerDescriptorProxy :id="entity.client.salesPersonFk" />
+                        <CustomerDescriptorProxy :id="entity.client.salesPersonFk" />
                     </span>
                 </template>
             </VnLv>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index cbc51174f..096da642e 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -10,8 +10,8 @@ import ClaimFilter from './ClaimFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
-import WorkerSummaryDialog from 'src/pages/Worker/Card/WorkerSummaryDialog.vue';
-import CustomerSummaryDialog from 'src/pages/Customer/Card/CustomerSummaryDialog.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -28,25 +28,18 @@ function navigate(id) {
     router.push({ path: `/claim/${id}` });
 }
 
-function viewSummary(id, summaryDialog) {
-    let dialogComponent;
-
-    switch (summaryDialog) {
-        case 'worker':
-            dialogComponent = WorkerSummaryDialog;
-            break;
-        case 'customer':
-            dialogComponent = CustomerSummaryDialog;
-            break;
-        case 'claim':
-            dialogComponent = ClaimSummaryDialog;
-            break;
-        default:
-            return;
-    }
-
+function viewSummary(id) {
     quasar.dialog({
-        component: dialogComponent,
+        component: ClaimSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
+
+function viewDescriptor(id) {
+    quasar.dialog({
+        component: CustomerDescriptorProxy,
         componentProps: {
             id,
         },
@@ -101,23 +94,19 @@ function viewSummary(id, summaryDialog) {
                     >
                         <template #list-items>
                             <VnLv label="ID" :value="row.id" />
-                            <VnLv
-                                :label="t('claim.list.customer')"
-                                @click.stop="viewSummary(row.clientFk, 'customer')"
-                            >
+                            <VnLv :label="t('claim.list.customer')" @click.stop>
                                 <template #value>
                                     <span class="link">
                                         {{ row.clientName }}
+                                        <CustomerDescriptorProxy :id="row.clientFk" />
                                     </span>
                                 </template>
                             </VnLv>
-                            <VnLv
-                                :label="t('claim.list.assignedTo')"
-                                @click.stop="viewSummary(row.workerFk, 'worker')"
-                            >
+                            <VnLv :label="t('claim.list.assignedTo')" @click.stop>
                                 <template #value>
                                     <span class="link">
                                         {{ row.workerName }}
+                                        <WorkerDescriptorProxy :id="row.workerFk" />
                                     </span>
                                 </template>
                             </VnLv>
@@ -147,11 +136,7 @@ function viewSummary(id, summaryDialog) {
                                     {{ t('components.smartCard.openCard') }}
                                 </QTooltip>
                             </QBtn>
-                            <QBtn
-                                flat
-                                icon="preview"
-                                @click.stop="viewSummary(row.id, 'claim')"
-                            >
+                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
                                 <QTooltip>
                                     {{ t('components.smartCard.openSummary') }}
                                 </QTooltip>
diff --git a/src/pages/Customer/Card/CustomerDescriptorProxy.vue b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
index 9cdafdb9d..0341f66a0 100644
--- a/src/pages/Customer/Card/CustomerDescriptorProxy.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorProxy.vue
@@ -9,6 +9,7 @@ const $props = defineProps({
     },
 });
 </script>
+
 <template>
     <QPopupProxy>
         <CustomerDescriptor
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index ba64a5abb..a4dd8b55a 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -12,6 +12,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -51,7 +55,7 @@ const sip = computed(() => worker.value.sip && worker.value.sip.extension);
 
 function getWorkerAvatar() {
     const token = getToken();
-    return `/api/Images/user/160x160/${route.params.id}/download?access_token=${token}`;
+    return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
 }
 const data = ref(useCardDescription());
 const setData = (entity) =>
@@ -64,6 +68,7 @@ const setData = (entity) =>
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
+        :summary="$props.summary"
         @on-fetch="
             (data) => {
                 worker = data;
diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
index 8d372b6de..98b06ad6e 100644
--- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import WorkerDescriptor from './WorkerDescriptor.vue';
+import WorkerSummaryDialog from './WorkerSummaryDialog.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,10 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummaryDialog"
+        />
     </QPopupProxy>
 </template>
diff --git a/test/cypress/integration/ticketBoxing.spec.js b/test/cypress/integration/ticketBoxing.spec.js
index 7b3bd36cc..c4d85e945 100755
--- a/test/cypress/integration/ticketBoxing.spec.js
+++ b/test/cypress/integration/ticketBoxing.spec.js
@@ -17,18 +17,4 @@ describe('TicketBoxing', () => {
         cy.get('div[class="q-item__label text-h6"]').eq(0).click();
         cy.get('.q-notification__message').should('have.text', 'No videos available');
     });
-
-    it('should show select time and video if have video list', () => {
-        cy.intercept(
-            {
-                method: 'GET',
-                url: '/api/Boxings/*',
-            },
-            ['2022-01-01T01-01-00.mp4', '2022-02-02T02-02-00.mp4', '2022-03-03T03-03-00.mp4']
-        ).as('getVideoList');
-        cy.get('.q-list').eq(3).find('.q-item').eq(2).click();
-
-        cy.get('.q-list').eq(3).find('.q-item').eq(0).find('.q-range');
-        cy.get('.q-list').eq(3).find('.q-item').eq(1).find('.q-select');
-    });
 });