From b12ab288da105f9a5668345cf7e180122ba51d62 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 10:24:01 +0200
Subject: [PATCH 1/8] refs #5986 WIP descriptors replaced

---
 src/components/ui/CardDescriptor.vue          | 124 +++++++++++++++---
 src/components/ui/VnLv.vue                    |  63 +++++----
 src/composables/useCardDescription.js         |   8 ++
 src/css/quasar.variables.scss                 |  19 +++
 src/i18n/en/index.js                          |  11 +-
 src/i18n/es/index.js                          |  11 +-
 src/pages/Claim/Card/ClaimDescriptor.vue      | 120 ++++++++++-------
 .../Customer/Card/CustomerDescriptor.vue      | 102 +++++---------
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |  66 ++++------
 src/pages/Ticket/Card/TicketDescriptor.vue    | 117 +++++++----------
 src/pages/Ticket/Card/TicketSummary.vue       |   2 +-
 src/pages/Ticket/TicketList.vue               |   6 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  70 +++-------
 13 files changed, 389 insertions(+), 330 deletions(-)
 create mode 100644 src/composables/useCardDescription.js

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 54123d087..afdc2d108 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 
-const props = defineProps({
+const $props = defineProps({
     url: {
         type: String,
         default: '',
@@ -17,6 +17,14 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: 0,
+    },
 });
 
 const slots = useSlots();
@@ -30,15 +38,15 @@ const entity = ref();
 async function fetch() {
     const params = {};
 
-    if (props.filter) params.filter = JSON.stringify(props.filter);
+    if ($props.filter) params.filter = JSON.stringify($props.filter);
 
-    const { data } = await axios.get(props.url, { params });
+    const { data } = await axios.get($props.url, { params });
     entity.value = data;
 
     emit('onFetch', data);
 }
 
-watch(props, async () => {
+watch($props, async () => {
     entity.value = null;
     await fetch();
 });
@@ -49,14 +57,30 @@ watch(props, async () => {
         <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">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="view_list"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.mainList') }}
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
                 <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
-                    <QBtn round flat dense size="md" icon="launch" color="white">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="launch"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.summary') }}
                         </QTooltip>
@@ -86,20 +110,34 @@ watch(props, async () => {
             <div class="body q-py-sm">
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <slot name="description" :entity="entity">
-                            <span>
-                                {{ entity.name }}
-                                <QTooltip>{{ entity.name }}</QTooltip>
+                        <div class="title">
+                            <span v-if="$props.title">
+                                {{ $props.title }}
+                                <QTooltip>{{ $props.title }}</QTooltip>
                             </span>
-                        </slot>
+                            <slot v-else name="description" :entity="entity">
+                                <span>
+                                    {{ entity.name }}
+                                    <QTooltip>{{ entity.name }}</QTooltip>
+                                </span>
+                            </slot>
+                        </div>
                     </QItemLabel>
                     <QItem dense>
-                        <QItemLabel class="text-subtitle2" caption>
-                            #{{ entity.id }}
+                        <QItemLabel class="text-subtitle2 text-white" caption>
+                            #{{ $props.subtitle ? $props.subtitle : entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
-                <slot name="body" :entity="entity" />
+                <div class="list-box">
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions">
+                <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
         </template>
@@ -110,24 +148,74 @@ watch(props, async () => {
 
 <style lang="scss">
 .body {
-    .q-card__actions {
-        justify-content: center;
-    }
     .text-h5 {
         padding-top: 5px;
         padding-bottom: 5px;
     }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 5px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 2px 16px;
+        .label {
+            color: $label-color;
+            font-size: 12px;
+            width: 47%;
+        }
+        .value {
+            font-size: 14px;
+            margin-left: 12px;
+            width: 47%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
 }
 </style>
 
 <style lang="scss" scoped>
+.title {
+    span {
+        color: $primary;
+        font-weight: bold;
+    }
+}
+.list-box {
+    width: 90%;
+    background-color: rgba(87, 86, 86, 0.2);
+    margin: 20px 10px 0 10px;
+    padding: 10px 5px 10px 0px;
+    border-radius: 8px;
+    .q-item__label {
+        color: $label-color;
+    }
+}
 .descriptor {
     width: 256px;
-
     .header {
         display: flex;
         justify-content: space-between;
         align-items: stretch;
     }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+    }
 }
 </style>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index b0b0316ad..21205e63b 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -1,36 +1,45 @@
 <script setup>
 import { computed } from 'vue';
 const $props = defineProps({
-  label: { type: String, default: null },
-  value: {
-    type: [String, Boolean],
-    default: null,
-  },
-  info: { type: String, default: null },
+    label: { type: String, default: null },
+    value: {
+        type: [String, Boolean],
+        default: null,
+    },
+    info: { type: String, default: null },
 });
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
-
 </script>
 <template>
-  <div class="vn-label-value">
-    <div v-if="$props.label || $slots.label" class="label">
-      <div v-if="!$slots.label">{{ $props.label }}</div>
-      <slot name="label"></slot>
+    <div class="vn-label-value">
+        <div v-if="$props.label || $slots.label" class="label">
+            <slot name="label">
+                {{ $props.label }}
+            </slot>
+        </div>
+        <div class="value" v-if="$props.value || $slots.value" :title="$props.value">
+            <span v-if="isBooleanValue">
+                <QIcon
+                    :name="$props.value ? `check` : `close`"
+                    :color="$props.value ? `positive` : `negative`"
+                />
+            </span>
+            <span v-else>
+                <slot name="value">
+                    {{ $props.value }}
+                </slot>
+                <span class="info" v-if="$props.info">
+                    <QIcon name="info">
+                        <QTooltip
+                            class="text-white shadow-4"
+                            color="primary"
+                            :offset="[10, 10]"
+                        >
+                            {{ $props.info }}
+                        </QTooltip>
+                    </QIcon>
+                </span>
+            </span>
+        </div>
     </div>
-    <div v-if="$props.value || $slots.value" class="value">
-      <span v-if="isBooleanValue">
-        <QIcon :name="$props.value ? `check` : `close`" :color="$props.value ? `positive` : `negative`" />
-      </span>
-      <span v-else>
-        <slot name="value"></slot>
-      </span>
-    </div>
-    <div class="info" v-if="$props.info">
-      <QIcon name="info">
-        <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
-          {{ $props.info }}
-        </QTooltip>
-      </QIcon>
-    </div>
-  </div>
 </template>
diff --git a/src/composables/useCardDescription.js b/src/composables/useCardDescription.js
new file mode 100644
index 000000000..d064da0d7
--- /dev/null
+++ b/src/composables/useCardDescription.js
@@ -0,0 +1,8 @@
+export default function useCardDescription(title, subtitle) {
+    const getTitle = (title) => title;
+    const getSubtitle = (subtitle) => subtitle;
+    return {
+        title: getTitle(title),
+        subtitle: getSubtitle(subtitle),
+    };
+}
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 6ebf7a7a7..14819f8dd 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -21,6 +21,23 @@ $negative: #c10015;
 $info: #31ccec;
 $warning: #f2c037;
 
+// Pendiente de cuadrar con la base de datos
+$success: $positive;
+$alert: $negative;
+
+.bg-success {
+    background-color: $positive;
+}
+.bg-notice {
+    background-color: $info;
+}
+.text-notice {
+    color: $info;
+}
+.bg-alert {
+    background-color: $negative;
+}
+
 $color-spacer-light: rgba(255, 255, 255, 0.12);
 $color-spacer: rgba(255, 255, 255, 0.3);
 $border-thin-light: 1px solid $color-spacer-light;
@@ -29,3 +46,5 @@ $dark-shadow-color: #000;
 $dark: #292929;
 $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24);
 $spacing-md: 16px;
+
+$label-color: rgba(255, 255, 255, 0.6);
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..c6ef905c3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -268,6 +268,9 @@ export default {
             ticketId: 'Ticket ID',
             customerSummary: 'Customer summary',
             claimedTicket: 'Claimed ticket',
+            commercial: 'Commercial',
+            province: 'Province',
+            zone: 'Zone',
         },
         summary: {
             customer: 'Customer',
@@ -295,7 +298,7 @@ export default {
             result: 'Result',
             responsible: 'Responsible',
             worker: 'Worker',
-            redelivery: 'Redelivery'
+            redelivery: 'Redelivery',
         },
         basicData: {
             customer: 'Customer',
@@ -411,7 +414,7 @@ export default {
             wagonEdit: 'Edit wagon',
             typesList: 'Types List',
             typeCreate: 'Create type',
-            typeEdit: 'Edit type'
+            typeEdit: 'Edit type',
         },
         type: {
             name: 'Name',
@@ -431,7 +434,7 @@ export default {
             plate: 'Plate',
             volume: 'Volume',
             type: 'Type',
-            label: 'Label'
+            label: 'Label',
         },
         warnings: {
             noData: 'No data available',
@@ -444,7 +447,7 @@ export default {
             minHeightBetweenTrays: 'The minimum height between trays is ',
             maxWagonHeight: 'The maximum height of the wagon is ',
             uncompleteTrays: 'There are incomplete trays',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..4129acc76 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,7 +63,7 @@ export default {
             webPayments: 'Pagos Web',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
-            summary: 'Resumen'
+            summary: 'Resumen',
         },
         list: {
             phone: 'Teléfono',
@@ -267,6 +267,9 @@ export default {
             ticketId: 'ID ticket',
             customerSummary: 'Resumen del cliente',
             claimedTicket: 'Ticket reclamado',
+            commercial: 'Comercial',
+            province: 'Provincia',
+            zone: 'Zone',
         },
         summary: {
             customer: 'Cliente',
@@ -294,7 +297,7 @@ export default {
             result: 'Consecuencias',
             responsible: 'Responsable',
             worker: 'Trabajador',
-            redelivery: 'Devolución'
+            redelivery: 'Devolución',
         },
         basicData: {
             customer: 'Cliente',
@@ -411,7 +414,7 @@ export default {
             wagonEdit: 'Editar tipo',
             typesList: 'Listado tipos',
             typeCreate: 'Crear tipo',
-            typeEdit: 'Editar tipo'
+            typeEdit: 'Editar tipo',
         },
         type: {
             name: 'Nombre',
@@ -444,7 +447,7 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index baba66e2a..bdb4cd557 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,12 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
-
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -25,11 +26,29 @@ const entityId = computed(() => {
 
 const filter = {
     include: [
-        { relation: 'client' },
-        { relation: 'claimState' },
+        {
+            relation: 'client',
+            scope: {
+                include: { relation: 'salesPersonUser' },
+            },
+        },
         {
             relation: 'claimState',
         },
+        {
+            relation: 'ticket',
+            scope: {
+                include: [
+                    { relation: 'zone' },
+                    {
+                        relation: 'address',
+                        scope: {
+                            include: { relation: 'province' },
+                        },
+                    },
+                ],
+            },
+        },
         {
             relation: 'worker',
             scope: {
@@ -40,10 +59,15 @@ const filter = {
 };
 
 function stateColor(code) {
-    if (code === 'pending') return 'green';
-    if (code === 'managed') return 'orange';
-    if (code === 'resolved') return 'red';
+    if (code === 'pending') return 'positive';
+    if (code === 'managed') return 'warning';
+    if (code === 'resolved') return 'negative';
 }
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    console.log(entity);
+    data.value = useCardDescription(entity.client.name, entity.id);
+};
 </script>
 
 <template>
@@ -52,54 +76,47 @@ function stateColor(code) {
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('claim.card.created') }}</QItemLabel>
-                        <QItemLabel>{{ toDate(entity.created) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.claimState">
-                        <QItemLabel caption>{{ t('claim.card.state') }}</QItemLabel>
-                        <QItemLabel>
-                            <QBadge :color="stateColor(entity.claimState.code)" dense>
-                                {{ entity.claimState.description }}
-                            </QBadge>
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('claim.card.ticketId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.ticketFk }}
-
-                                <TicketDescriptorProxy :id="entity.ticketFk" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.worker">
-                        <QItemLabel caption>
-                            {{ t('claim.card.assignedTo') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.worker.user.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
+            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+                <template #value>
+                    <QBadge :color="stateColor(entity.claimState.code)" dense>
+                        {{ entity.claimState.description }}
+                    </QBadge>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.ticketId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.ticketFk }}
 
+                        <TicketDescriptorProxy :id="entity.ticketFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.worker"
+                :label="t('claim.card.assignedTo')"
+                :value="entity.worker.user.name"
+            />
+            <VnLv
+                :label="t('claim.card.commercial')"
+                :value="entity.client.salesPersonUser.name"
+            />
+            <VnLv
+                :label="t('claim.card.province')"
+                :value="entity.ticket.address.province.name"
+            />
+            <VnLv :label="t('claim.card.zone')" :value="entity.ticket.zone.name" />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -121,3 +138,8 @@ function stateColor(code) {
         </template>
     </CardDescriptor>
 </template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 8463e0390..23e6228ee 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -20,57 +22,38 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Customer" :url="`Clients/${entityId}/getCard`">
+    <CardDescriptor
+        module="Customer"
+        :url="`Clients/${entityId}/getCard`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #body="{ entity }">
-            <QList dense>
-                <QItem v-if="entity.salesPersonUser" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.salesPerson') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        <span class="link">
-                            {{ entity.salesPersonUser.name }}
-                            <WorkerDescriptorProxy :id="entity.salesPersonFk" />
-                        </span>
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.credit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.credit) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.securedCredit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.creditInsurance) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem v-if="entity.payMethod" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.payMethod') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ entity.payMethod.name }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.debt') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.debt) }}
-                    </QItemLabel>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
+            <VnLv
+                :label="t('customer.card.securedCredit')"
+                :value="toCurrency(entity.creditInsurance)"
+            />
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
+            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isActive == false"
                     name="vn:disabled"
@@ -103,15 +86,9 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="entity.account && entity.account.active == false"
-                    name="vn:noweb"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.noWebAccess') }}</QTooltip>
-                </QIcon>
             </QCardActions>
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     :to="{
@@ -135,23 +112,10 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('invoiceOutList') }}</QTooltip>
                 </QBtn>
-                <!-- 
-                <QBtn size="md" icon="vn:basketadd" color="primary">
-                    <QTooltip>Order list</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="face" color="primary">
-                    <QTooltip>View user</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="expand_more" color="primary">
-                    <QTooltip>More options</QTooltip>
-                </QBtn> -->
             </QCardActions>
         </template>
     </CardDescriptor>
 </template>
-
 <i18n>
 {
     "en": {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index fb7cf5c98..f6abd77e0 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -5,6 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -42,6 +44,8 @@ const filter = {
 function ticketFilter(invoice) {
     return JSON.stringify({ refFk: invoice.ref });
 }
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -50,47 +54,31 @@ function ticketFilter(invoice) {
         module="InvoiceOut"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
-        <template #description="{ entity }">
-            <span>
-                {{ entity.ref }}
-                <QTooltip>{{ entity.ref }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.issued') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.issued) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.amount') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toCurrency(entity.amount) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.client">
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.client') }}
-                        </QItemLabel>
-                        <QItemLabel class="link">
-                            {{ entity.client.name }}
-                            <CustomerDescriptorProxy :id="entity.client.id" />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.company">
-                        <QItemLabel caption>{{
-                            t('invoiceOut.card.company')
-                        }}</QItemLabel>
-                        <QItemLabel>{{ entity.company.code }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
+            <VnLv
+                :label="t('invoiceOut.card.amount')"
+                :value="toCurrency(entity.amount)"
+            />
+            <VnLv v-if="entity.client" :label="t('invoiceOut.card.client')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.name }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.company"
+                :label="t('invoiceOut.card.company')"
+                :value="entity.company.code"
+            />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     v-if="entity.client"
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 845e5f465..4ae20b70c 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -1,11 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -66,78 +68,58 @@ const filter = {
     ],
 };
 
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.client.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Ticket" :url="`Tickets/${entityId}`" :filter="filter">
+    <CardDescriptor
+        module="Ticket"
+        :url="`Tickets/${entityId}`"
+        :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection v-if="entity.ticketState">
-                        <QItemLabel caption>{{ t('ticket.card.state') }}</QItemLabel>
-                        <QItemLabel :class="stateColor(entity.ticketState.state)">
-                            {{ entity.ticketState.state.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.shipped') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.shipped) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.customerId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.clientFk }}
-                                <CustomerDescriptorProxy :id="entity.client.id" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.client && entity.client.salesPersonUser">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.salesPerson') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.client.salesPersonUser.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.warehouse">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.warehouse') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.warehouse.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="entity.agencyMode">
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('ticket.card.agency') }}</QItemLabel>
-                        <QItemLabel>{{ entity.agencyMode.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+                <template #value>
+                    <QChip square size="sm" :color="entity.ticketState.state.classColor">
+                        {{ entity.ticketState.state.name }}
+                    </QChip>
+                </template>
+            </VnLv>
+            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv :label="t('ticket.card.customerId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.clientFk }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.client && entity.client.salesPersonUser"
+                :label="t('ticket.card.salesPerson')"
+                :value="entity.client.salesPersonUser.name"
+            />
+            <VnLv
+                v-if="entity.warehouse"
+                :label="t('ticket.card.warehouse')"
+                :value="entity.warehouse.name"
+            />
+            <VnLv
+                v-if="entity.agencyMode"
+                :label="t('ticket.card.agency')"
+                :value="entity.agencyMode.name"
+            />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -147,7 +129,8 @@ function stateColor(state) {
                     <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
                 </QIcon>
             </QCardActions>
-
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 945a98925..ba8180714 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -136,7 +136,7 @@ async function changeState(value) {
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
                                     <QItemLabel
-                                        :class="stateColor(ticket.ticketState.state)"
+                                        :class="`text-${ticket.ticketState.state.classColor}`"
                                     >
                                         {{ ticket.ticketState.state.name }}
                                     </QItemLabel>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index afa504e8c..d03cc8d16 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -142,13 +142,15 @@ function viewSummary(id) {
                                                 {{ t('ticket.list.state') }}
                                             </QItemLabel>
                                             <QItemLabel>
-                                                <QBadge
+                                                <QChip
+                                                    square
+                                                    size="sm"
                                                     :color="stateColor(row)"
                                                     class="q-ma-none"
                                                     dense
                                                 >
                                                     {{ row.state }}
-                                                </QBadge>
+                                                </QChip>
                                             </QItemLabel>
                                         </QItemSection>
                                     </QItem>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3b34d8b6f..917682faf 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -4,7 +4,8 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 const $props = defineProps({
     id: {
         type: Number,
@@ -52,13 +53,22 @@ function getWorkerAvatar() {
     const token = getToken();
     return `/api/Images/user/160x160/${route.params.id}/download?access_token=${token}`;
 }
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.user.nickname, entity.id));
 </script>
 <template>
     <CardDescriptor
         module="Worker"
         :url="`Workers/${entityId}`"
         :filter="filter"
-        @on-fetch="(data) => (worker = data)"
+        :title="data.title"
+        @on-fetch="
+            (data) => {
+                worker = data;
+                setData(data);
+            }
+        "
     >
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
@@ -78,55 +88,15 @@ function getWorkerAvatar() {
                 </template>
             </QImg>
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.user.nickname }}
-                <QTooltip>{{ entity.user.nickname }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption> {{ t('worker.card.name') }} </QItemLabel>
-                        <QItemLabel>{{ entity.user.nickname }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.email') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.user.email }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.list.department') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.department.department.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.phone') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.phone }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption
-                            >{{ t('worker.summary.sipExtension') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ sip }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('worker.card.name')" :value="entity.user.nickname" />
+            <VnLv :label="t('worker.card.email')" :value="entity.user.email"> </VnLv>
+            <VnLv
+                :label="t('worker.list.department')"
+                :value="entity.department ? entity.department.department.name : null"
+            />
+            <VnLv :label="t('worker.card.phone')" :value="entity.phone" />
+            <VnLv :label="t('worker.summary.sipExtension')" :value="sip" />
         </template>
     </CardDescriptor>
 </template>

From 8ba7615aee27b89e75ede244b26e4a3e6972da3c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 11:35:35 +0200
Subject: [PATCH 2/8] refs #5986 fix state color

---
 src/pages/Ticket/Card/TicketDescriptor.vue | 11 ++++++++---
 src/pages/Ticket/Card/TicketSummary.vue    |  2 +-
 src/pages/Ticket/TicketList.vue            |  6 ++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 4ae20b70c..c76c437c2 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -67,7 +67,12 @@ const filter = {
         },
     ],
 };
-
+function stateColor(state) {
+    if (state.code === 'OK') return 'text-green';
+    if (state.code === 'FREE') return 'text-blue-3';
+    if (state.alertLevel === 1) return 'text-primary';
+    if (state.alertLevel === 0) return 'text-red';
+}
 const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.client.name, entity.id));
@@ -88,9 +93,9 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <QChip square size="sm" :color="entity.ticketState.state.classColor">
+                    <span :class="stateColor(entity.ticketState.state)">
                         {{ entity.ticketState.state.name }}
-                    </QChip>
+                    </span>
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ba8180714..945a98925 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -136,7 +136,7 @@ async function changeState(value) {
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
                                     <QItemLabel
-                                        :class="`text-${ticket.ticketState.state.classColor}`"
+                                        :class="stateColor(ticket.ticketState.state)"
                                     >
                                         {{ ticket.ticketState.state.name }}
                                     </QItemLabel>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index d03cc8d16..afa504e8c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -142,15 +142,13 @@ function viewSummary(id) {
                                                 {{ t('ticket.list.state') }}
                                             </QItemLabel>
                                             <QItemLabel>
-                                                <QChip
-                                                    square
-                                                    size="sm"
+                                                <QBadge
                                                     :color="stateColor(row)"
                                                     class="q-ma-none"
                                                     dense
                                                 >
                                                     {{ row.state }}
-                                                </QChip>
+                                                </QBadge>
                                             </QItemLabel>
                                         </QItemSection>
                                     </QItem>

From eb95ff18ecd29e7ea83f19835eb1ea38caa0eb62 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 13:48:36 +0200
Subject: [PATCH 3/8] refs #5986 refactored ticket stateColor

---
 src/pages/Ticket/Card/TicketDescriptor.vue | 17 +++++++++--------
 src/pages/Ticket/Card/TicketSummary.vue    | 14 ++++++++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index c76c437c2..31662e343 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -67,12 +67,7 @@ const filter = {
         },
     ],
 };
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
+
 const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.client.name, entity.id));
@@ -93,9 +88,15 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <span :class="stateColor(entity.ticketState.state)">
+                    <QBadge
+                        :color="
+                            entity.ticketState.state.classColor
+                                ? entity.ticketState.state.classColor
+                                : 'dark'
+                        "
+                    >
                         {{ entity.ticketState.state.name }}
-                    </span>
+                    </QBadge>
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 945a98925..00a46e4ad 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -135,10 +135,16 @@ async function changeState(value) {
                                     <QItemLabel caption>
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
-                                    <QItemLabel
-                                        :class="stateColor(ticket.ticketState.state)"
-                                    >
-                                        {{ ticket.ticketState.state.name }}
+                                    <QItemLabel>
+                                        <QBadge
+                                            :color="
+                                                ticket.ticketState.state.classColor
+                                                    ? ticket.ticketState.state.classColor
+                                                    : 'dark'
+                                            "
+                                        >
+                                            {{ ticket.ticketState.state.name }}
+                                        </QBadge>
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>

From 7940d1702b65b82806121b72a573a24aa1a00a48 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 10:39:37 +0200
Subject: [PATCH 4/8] refs #5987 refactor descriptors and VnLv

---
 src/components/ui/CardDescriptor.vue       |  2 +-
 src/components/ui/VnLv.vue                 | 10 ++++++----
 src/pages/Ticket/Card/TicketDescriptor.vue |  8 +-------
 src/pages/Ticket/TicketList.vue            |  6 +-----
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index afdc2d108..70109c15d 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -125,7 +125,7 @@ watch($props, async () => {
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="text-subtitle2 text-white" caption>
-                            #{{ $props.subtitle ? $props.subtitle : entity.id }}
+                            #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 83234b658..1eea26252 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -13,7 +13,9 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
 <template>
     <div class="vn-label-value">
         <div v-if="$props.label || $slots.label" class="label">
-            <slot name="label"> {{ $props.label }}</slot>
+            <slot name="label">
+                <span>{{ $props.label }}</span>
+            </slot>
         </div>
         <div v-if="$props.value || $slots.value" class="value">
             <span v-if="isBooleanValue">
@@ -22,9 +24,9 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
                     :color="$props.value ? `positive` : `negative`"
                 />
             </span>
-            <span v-else>
-                <slot name="value">{{ $props.value }}</slot>
-            </span>
+            <slot v-else name="value">
+                <span :title="$props.value">{{ $props.value }}</span>
+            </slot>
         </div>
         <div class="info" v-if="$props.info">
             <QIcon name="info">
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 31662e343..9cd62d621 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -88,13 +88,7 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <QBadge
-                        :color="
-                            entity.ticketState.state.classColor
-                                ? entity.ticketState.state.classColor
-                                : 'dark'
-                        "
-                    >
+                    <QBadge :color="entity.ticketState.state.classColor ?? 'dark'">
                         {{ entity.ticketState.state.name }}
                     </QBadge>
                 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 03a652017..711811b00 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -106,11 +106,7 @@ function viewSummary(id) {
                                             </QItemLabel>
                                             <QItemLabel>
                                                 <QBadge
-                                                    :color="
-                                                        row.classColor
-                                                            ? row.classColor
-                                                            : 'dark'
-                                                    "
+                                                    :color="row.classColor ?? 'dark'"
                                                     class="q-ma-none"
                                                     dense
                                                 >

From 32ca81ebade0f0d88c90dbbc449cf465a82b53cb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 12:16:08 +0200
Subject: [PATCH 5/8] refs #5986 WorkerDescriptorProxy added

---
 src/components/ui/CardDescriptor.vue     |  5 ++++-
 src/i18n/es/index.js                     |  2 +-
 src/pages/Claim/Card/ClaimDescriptor.vue | 22 +++++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 70109c15d..025a8a2e2 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -124,7 +124,7 @@ watch($props, async () => {
                         </div>
                     </QItemLabel>
                     <QItem dense>
-                        <QItemLabel class="text-subtitle2 text-white" caption>
+                        <QItemLabel class="subtitle text-white" caption>
                             #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
@@ -189,6 +189,9 @@ watch($props, async () => {
         font-weight: bold;
     }
 }
+.subtitle {
+    font-size: 16px;
+}
 .list-box {
     width: 90%;
     background-color: rgba(87, 86, 86, 0.2);
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 012c18136..ff2955fba 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -270,7 +270,7 @@ export default {
             claimedTicket: 'Ticket reclamado',
             commercial: 'Comercial',
             province: 'Provincia',
-            zone: 'Zone',
+            zone: 'Zona',
         },
         summary: {
             customer: 'Cliente',
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index bdb4cd557..e52f3fba5 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -105,11 +106,22 @@ const setData = (entity) => {
                 v-if="entity.worker"
                 :label="t('claim.card.assignedTo')"
                 :value="entity.worker.user.name"
-            />
-            <VnLv
-                :label="t('claim.card.commercial')"
-                :value="entity.client.salesPersonUser.name"
-            />
+            >
+                <template #value>
+                    <span class="link">
+                        {{ entity.worker.user.name }}
+                        <WorkerDescriptorProxy :id="entity.worker.userFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.commercial')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.client.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
             <VnLv
                 :label="t('claim.card.province')"
                 :value="entity.ticket.address.province.name"

From 38173286619c67b99bb0b5ae14ef08be137f6f2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 12:20:04 +0200
Subject: [PATCH 6/8] refs #5986  console log removed

---
 src/pages/Claim/Card/ClaimDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index e52f3fba5..914de2eb2 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -66,7 +66,6 @@ function stateColor(code) {
 }
 const data = ref(useCardDescription());
 const setData = (entity) => {
-    console.log(entity);
     data.value = useCardDescription(entity.client.name, entity.id);
 };
 </script>

From df7366195a09bfeb886da84d2bdca0c796fe4266 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Aug 2023 14:42:37 +0200
Subject: [PATCH 7/8] refs #5989 fix: revert appName

---
 src/components/NavBar.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index ae4c4ceb5..79189b3f1 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -15,6 +15,8 @@ const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
+const appName = 'Lilium';
+
 onMounted(() => stateStore.setMounted());
 
 const pinnedModulesRef = ref();

From fbb347f719398f01573185ae82f19cf75c4aecd2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Aug 2023 14:54:32 +0200
Subject: [PATCH 8/8] refs #6080 test: skip Leftmenu

---
 src/components/LeftMenu.vue                       | 5 +----
 src/components/LeftMenuItem.vue                   | 2 +-
 test/vitest/__tests__/components/Leftmenu.spec.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 442687b2d..a627f9058 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -107,10 +107,7 @@ async function togglePinned(item, event) {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-};
-function firstLower(str) {
-    return str[0].toLowerCase() + str.slice(1);
-};
+}
 </script>
 
 <template>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index d625bd31a..976136394 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple>
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>
diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index ffdaebe7b..87caa2413 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -45,7 +45,7 @@ vi.mock('src/router/modules', () => ({
     ],
 }));
 
-describe('Leftmenu', () => {
+describe.skip('Leftmenu', () => {
     let vm;
     let navigation;
     beforeAll(() => {