From 56af4d37364ffa1f665d172052da810c0f175c0b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 25 Sep 2024 14:18:34 +0200
Subject: [PATCH 01/32] feat: refs #7010 added packing type field in customer
 summary and ticket list

---
 .../components/CustomerSummaryTable.vue       | 18 ++++-
 src/pages/Ticket/TicketList.vue               | 70 +++++++++++++++----
 2 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 946296e67..8ebf4aabc 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -32,6 +32,16 @@ const filter = {
         },
         { relation: 'invoiceOut', scope: { fields: ['id'] } },
         { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'ticketSales',
+            scope: {
+                fields: ['id', 'concept', 'itemFk'],
+                include: { relation: 'item' },
+                scope: {
+                    fields: ['id', 'name', 'itemPackingTypeFk'],
+                },
+            },
+        },
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
@@ -87,7 +97,13 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
-
+    {
+        align: 'left',
+        name: 'itemPackingTypeFk',
+        label: t('ticketSale.packaging'),
+        format: (row, dashIfEmpty) =>
+            dashIfEmpty(row?.ticketSales[0]?.item.itemPackingTypeFk),
+    },
     {
         align: 'right',
         label: '',
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad97e75c1..2a1dfd014 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -62,6 +62,7 @@ const dialogData = ref();
 const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
+const salesData = reactive({});
 
 const columns = computed(() => [
     {
@@ -95,6 +96,7 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
+        columnClass: 'expand',
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
     {
@@ -153,11 +155,6 @@ const columns = computed(() => [
         },
         columnClass: 'expand',
     },
-    {
-        align: 'left',
-        name: 'refFk',
-        label: t('ticketList.ref'),
-    },
     {
         align: 'left',
         name: 'zoneFk',
@@ -191,6 +188,12 @@ const columns = computed(() => [
         },
         format: (row) => toCurrency(row.totalWithVat),
     },
+    {
+        align: 'left',
+        name: 'itemPackageFk',
+        label: t('ticketSale.packaging'),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.itemPackageFk),
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -439,6 +442,41 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+async function fetchSalesData(row) {
+    if (salesData[row.id]) {
+        return salesData[row.id]; // Retorna de caché si ya existen datos
+    }
+
+    try {
+        const sales = await getSales(row.id);
+        const packingTypes = getPackingTypes(sales);
+        const result = packingTypes.length > 0 ? packingTypes.join(', ') : '-';
+
+        salesData[row.id] = result; // Cachea el resultado
+        return result;
+    } catch (err) {
+        console.error('Error fetching sales', err);
+        salesData[row.id] = 'Error'; // Cachea el error
+        return 'Error';
+    }
+}
+
+async function getSales(rowId) {
+    const { data } = await axios.get(`Tickets/${rowId}/getSales`);
+    return data;
+}
+
+function getPackingTypes(sales) {
+    const itemPackingTypes = [];
+    sales.forEach((sale) => {
+        const packingType = sale?.item?.itemPackingTypeFk;
+        if (packingType && !itemPackingTypes.includes(packingType)) {
+            itemPackingTypes.push(packingType);
+        }
+    });
+    return itemPackingTypes;
+}
 </script>
 
 <template>
@@ -548,7 +586,7 @@ function setReference(data) {
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.salesPerson }}
+                {{ dashIfEmpty(row.salesPerson) }}
                 <CustomerDescriptorProxy :id="row.salesPersonFk" />
             </span>
         </template>
@@ -577,16 +615,16 @@ function setReference(data) {
                     {{ row.state }}
                 </QChip>
             </span>
+            <span v-else-if="row.state === 'Entregado'">
+                <span class="link" @click.stop>
+                    {{ row.refFk }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                </span>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
         </template>
-        <template #column-refFk="{ row }">
-            <span class="link" @click.stop>
-                {{ dashIfEmpty(row.refFk) }}
-                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
-            </span>
-        </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
                 {{ dashIfEmpty(row.zoneName) }}
@@ -603,6 +641,12 @@ function setReference(data) {
                 {{ row.totalWithVat }}
             </QChip>
         </template>
+        <template #column-itemPackageFk="{ row }">
+            <div v-if="salesData[row.id]">{{ dashIfEmpty(salesData[row.id]) }}</div>
+            <div v-else>
+                {{ fetchSalesData(row) }}
+            </div>
+        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect

From 6d5a8cba6ffffce3ee6069ae3c28f7271cdeffb1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 26 Sep 2024 10:20:50 +0200
Subject: [PATCH 02/32] refactor: refs #7010 modified customer summary table

---
 .../Customer/components/CustomerSummaryTable.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 8ebf4aabc..bf52b8d6b 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { date } from 'quasar';
 import { toDateFormat } from 'src/filters/date.js';
 
-import { toCurrency } from 'src/filters';
+import { dashIfEmpty, toCurrency } from 'src/filters';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
@@ -101,8 +101,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'itemPackingTypeFk',
         label: t('ticketSale.packaging'),
-        format: (row, dashIfEmpty) =>
-            dashIfEmpty(row?.ticketSales[0]?.item.itemPackingTypeFk),
     },
     {
         align: 'right',
@@ -221,6 +219,18 @@ const setShippedColor = (date) => {
             </QBadge>
             <span v-else> {{ toDateFormat(row.shipped) }}</span>
         </template>
+        <template #column-itemPackingTypeFk="{ row }">
+            <span>
+                {{
+                    dashIfEmpty(
+                        row?.ticketSales
+                            .map((sale) => sale.item?.itemPackingTypeFk || '-')
+                            .filter((value) => value !== '-')
+                            .join(', ')
+                    )
+                }}
+            </span>
+        </template>
     </VnTable>
 </template>
 

From 1c99c01d1dcfe61e595cd322cde9910ac943cb87 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 26 Sep 2024 14:12:59 +0200
Subject: [PATCH 03/32] refactor: refs #7010 modified front

---
 src/pages/Ticket/TicketList.vue | 48 +++------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2a1dfd014..fe9667bea 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted, reactive } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -62,7 +62,6 @@ const dialogData = ref();
 const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
-const salesData = reactive({});
 
 const columns = computed(() => [
     {
@@ -190,9 +189,9 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'itemPackageFk',
+        name: 'packing',
         label: t('ticketSale.packaging'),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.itemPackageFk),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.packing),
     },
     {
         align: 'right',
@@ -442,41 +441,6 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
-
-async function fetchSalesData(row) {
-    if (salesData[row.id]) {
-        return salesData[row.id]; // Retorna de caché si ya existen datos
-    }
-
-    try {
-        const sales = await getSales(row.id);
-        const packingTypes = getPackingTypes(sales);
-        const result = packingTypes.length > 0 ? packingTypes.join(', ') : '-';
-
-        salesData[row.id] = result; // Cachea el resultado
-        return result;
-    } catch (err) {
-        console.error('Error fetching sales', err);
-        salesData[row.id] = 'Error'; // Cachea el error
-        return 'Error';
-    }
-}
-
-async function getSales(rowId) {
-    const { data } = await axios.get(`Tickets/${rowId}/getSales`);
-    return data;
-}
-
-function getPackingTypes(sales) {
-    const itemPackingTypes = [];
-    sales.forEach((sale) => {
-        const packingType = sale?.item?.itemPackingTypeFk;
-        if (packingType && !itemPackingTypes.includes(packingType)) {
-            itemPackingTypes.push(packingType);
-        }
-    });
-    return itemPackingTypes;
-}
 </script>
 
 <template>
@@ -641,12 +605,6 @@ function getPackingTypes(sales) {
                 {{ row.totalWithVat }}
             </QChip>
         </template>
-        <template #column-itemPackageFk="{ row }">
-            <div v-if="salesData[row.id]">{{ dashIfEmpty(salesData[row.id]) }}</div>
-            <div v-else>
-                {{ fetchSalesData(row) }}
-            </div>
-        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect

From 1a697aa018d3bfac296074b874a00b1d8bed8e44 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 15:02:42 +0200
Subject: [PATCH 04/32] feat: refs #7679 #7679 add sortBy and limit

---
 src/components/CreateNewPostcodeForm.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 99cba5360..32e2e6f8b 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -125,16 +125,26 @@ async function handleCountries(data) {
     <FetchData
         ref="provincesFetchDataRef"
         @on-fetch="handleProvinces"
+        :sort-by="['name ASC']"
+        :limit="100"
         auto-load
         url="Provinces/location"
     />
     <FetchData
         ref="townsFetchDataRef"
+        :sort-by="['name ASC']"
+        :limit="100"
         @on-fetch="handleTowns"
         auto-load
         url="Towns/location"
     />
-    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
+    <FetchData
+        @on-fetch="handleCountries"
+        :sort-by="['name ASC']"
+        :limit="100"
+        auto-load
+        url="Countries"
+    />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"

From 2bd004f52b80ba68229b7f8b4ddc34dc944b6e32 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 21:56:12 +0200
Subject: [PATCH 05/32] perf: refs #7679 add sortBy & limit whe retrieve
 Autonomies

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

diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 4c1d96930..3c1f6b6f2 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -46,6 +46,8 @@ const onDataSaved = (dataSaved, requestResponse) => {
             },
         }"
         url="Autonomies/location"
+        :sort-by="['name ASC']"
+        :limit="100"
     />
     <FormModelPopup
         :title="t('New province')"

From 692c649b8ca28ffa7978114382ca1b2bee4cc9e8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 2 Oct 2024 09:29:05 +0200
Subject: [PATCH 06/32] perf: refs #7679 #7679 improve watch

---
 src/components/CreateNewPostcodeForm.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 32e2e6f8b..c6bf8be10 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -79,14 +79,20 @@ async function onProvinceCreated(data) {
 watch(
     () => [postcodeFormData.countryFk],
     async (newCountryFk, oldValueFk) => {
-        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+        if (Array.isArray(newCountryFk)) {
+            newCountryFk = newCountryFk[0];
+        }
+        if (Array.isArray(oldValueFk)) {
+            oldValueFk = oldValueFk[0];
+        }
+        if (!!oldValueFk && newCountryFk !== oldValueFk) {
             postcodeFormData.provinceFk = null;
             postcodeFormData.townFk = null;
         }
-        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
+        if (oldValueFk !== newCountryFk) {
             await provincesFetchDataRef.value.fetch({
                 where: {
-                    countryFk: newCountryFk[0],
+                    countryFk: newCountryFk,
                 },
             });
             await townsFetchDataRef.value.fetch({
@@ -103,9 +109,12 @@ watch(
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk) => {
-        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+        if (Array.isArray(newProvinceFk)) {
+            newProvinceFk = newProvinceFk[0];
+        }
+        if (newProvinceFk !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
-                where: { provinceFk: newProvinceFk[0] },
+                where: { provinceFk: newProvinceFk },
             });
         }
     }

From 0b76d0d556e86e2730e53d4fd317a79604c99f50 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 11:52:16 +0200
Subject: [PATCH 07/32] refactor: refs #7010 added function to get item
 packaging type

---
 .../components/CustomerSummaryTable.vue        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index bf52b8d6b..eb001328c 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -149,6 +149,15 @@ const setShippedColor = (date) => {
     if (difference == 0) return 'warning';
     if (difference < 0) return 'success';
 };
+
+const getItemPackagingType = (row) => {
+    const packagingType = row?.ticketSales
+        .map((sale) => sale.item?.itemPackingTypeFk || '-')
+        .filter((value) => value !== '-')
+        .join(', ');
+
+    return dashIfEmpty(packagingType);
+};
 </script>
 
 <template>
@@ -221,14 +230,7 @@ const setShippedColor = (date) => {
         </template>
         <template #column-itemPackingTypeFk="{ row }">
             <span>
-                {{
-                    dashIfEmpty(
-                        row?.ticketSales
-                            .map((sale) => sale.item?.itemPackingTypeFk || '-')
-                            .filter((value) => value !== '-')
-                            .join(', ')
-                    )
-                }}
+                {{ getItemPackagingType(row) }}
             </span>
         </template>
     </VnTable>

From 8ee4edc5d547d17676df7a8ed194ff5f1471acd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 3 Oct 2024 08:38:56 +0200
Subject: [PATCH 08/32] perf: refs #7010 customer summary packaging type field

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index eb001328c..f6013dea9 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -101,6 +101,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'itemPackingTypeFk',
         label: t('ticketSale.packaging'),
+        format: (row) => getItemPackagingType(row),
     },
     {
         align: 'right',
@@ -228,11 +229,6 @@ const getItemPackagingType = (row) => {
             </QBadge>
             <span v-else> {{ toDateFormat(row.shipped) }}</span>
         </template>
-        <template #column-itemPackingTypeFk="{ row }">
-            <span>
-                {{ getItemPackagingType(row) }}
-            </span>
-        </template>
     </VnTable>
 </template>
 

From bd3de77cbdde427945c1b201872ab70517df61ea Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 7 Oct 2024 09:10:20 +0200
Subject: [PATCH 09/32] fix: changes in list and filter to fix section

---
 src/pages/Ticket/TicketFilter.vue | 79 +++++++++++++++++++++++++++++++
 src/pages/Ticket/TicketList.vue   |  2 +-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 8f71aad08..fee946ccf 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -20,11 +20,33 @@ const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
+const alertLevels = ref([]);
+const groupedStates = ref([]);
+
+const getGroupedStates = () => {
+    for (const state of alertLevels.value) {
+        groupedStates.value.push({
+            id: state.id,
+            name: t(`${state.code}`),
+            code: state.code,
+        });
+    }
+    console.log(groupedStates.value);
+};
 </script>
 
 <template>
     <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
     <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
+    <FetchData
+        url="AlertLevels"
+        @on-fetch="
+            (data) => {
+                (alertLevels = data), getGroupedStates();
+            }
+        "
+        auto-load
+    />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <FetchData
@@ -100,12 +122,35 @@ const warehouses = ref([]);
                         option-label="name"
                         emit-value
                         map-options
+                        use-input
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection v-if="!alertLevels">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="alertLevels">
+                    <QSelect
+                        :label="t('Grouped state')"
+                        v-model="params.groupedStates"
+                        @update:model-value="searchFn()"
+                        :options="groupedStates"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        sort-by="name ASC"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -124,6 +169,15 @@ const warehouses = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.nickname"
+                        :label="t('Nickname')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -186,6 +240,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -206,6 +261,7 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
@@ -226,12 +282,22 @@ const warehouses = ref([]);
                             option-label="name"
                             emit-value
                             map-options
+                            use-input
                             dense
                             outlined
                             rounded
                         />
                     </QItemSection>
                 </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            v-model="params.collectionFk"
+                            :label="t('Collection')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
             </QExpansionItem>
         </template>
     </VnFilterPanel>
@@ -255,6 +321,11 @@ en:
         provinceFk: Province
         agencyModeFk: Agency
         warehouseFk: Warehouse
+    FREE: Free
+    ON_PREPARATION: On preparation
+    PACKED: Packed
+    DELIVERED: Delivered
+    ON_PREVIOUS: ON_PREVIOUS
 es:
     params:
         search: Contiene
@@ -288,4 +359,12 @@ es:
     Yes: Si
     No: No
     Days onward: Días adelante
+    Grouped state: Estado agrupado
+    FREE: Libre
+    ON_PREPARATION: En preparación
+    PACKED: Encajado
+    DELIVERED: Servido
+    ON_PREVIOUS: ON_PREVIOUS
+    Collection: Colección
+    Nickname: Nombre mostrado
 </i18n>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad97e75c1..d71ad7dfe 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -548,7 +548,7 @@ function setReference(data) {
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.salesPerson }}
+                {{ row.userName }}
                 <CustomerDescriptorProxy :id="row.salesPersonFk" />
             </span>
         </template>

From afc52f6ceaa41fe54459926d10398a25c4f5b56a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 7 Oct 2024 13:29:43 +0200
Subject: [PATCH 10/32] fix: changes in sale and summary

---
 .../Ticket/Card/TicketDescriptorMenu.vue      |  9 ++-
 src/pages/Ticket/Card/TicketEditMana.vue      | 26 +++++++
 src/pages/Ticket/Card/TicketSale.vue          | 19 +++++
 src/pages/Ticket/Card/TicketSummary.vue       | 71 ++++++++++++++-----
 src/pages/Ticket/TicketFilter.vue             | 12 ++--
 5 files changed, 110 insertions(+), 27 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 73104fe27..caf82ed24 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -3,7 +3,7 @@ import axios from 'axios';
 import { ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,6 +23,7 @@ const props = defineProps({
         required: true,
     },
 });
+const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -334,7 +335,11 @@ async function handleInvoiceOutData() {
 </script>
 <template>
     <FetchData
-        :url="`Tickets/${ticketId}/isEditable`"
+        :url="
+            route.path.startsWith('/ticket')
+                ? `Tickets/${ticketId}/isEditable`
+                : `Tickets/${ticket}/isEditable`
+        "
         auto-load
         @on-fetch="handleFetchData"
     />
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 428e5e8c2..c7ff724e4 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -13,12 +13,21 @@ const $props = defineProps({
         type: Number,
         default: 0,
     },
+    usesMana: {
+        type: Boolean,
+        default: false,
+    },
+    manaCode: {
+        type: String,
+        default: 'mana',
+    },
 });
 
 const emit = defineEmits(['save', 'cancel']);
 
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
+const manaCode = ref($props.manaCode);
 
 const save = () => {
     emit('save');
@@ -47,6 +56,23 @@ const cancel = () => {
                     </div>
                 </div>
             </div>
+            <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
+                <QRadio
+                    v-model="manaCode"
+                    dense
+                    val="mana"
+                    :label="t('Promotion mana')"
+                    :dark="true"
+                />
+                <QRadio
+                    v-model="manaCode"
+                    dense
+                    val="manaClaim"
+                    :label="t('Claim mana')"
+                    :dark="true"
+                    class="q-mb-sm"
+                />
+            </div>
             <div class="row">
                 <QBtn
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 6d3e6269d..3a42fda0c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -761,6 +761,8 @@ watch(
                 <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
+                    :uses-mana="usesMana"
+                    :mana-code="manaCode"
                     @save="changeDiscount(row)"
                 >
                     <VnInput
@@ -768,6 +770,23 @@ watch(
                         :label="t('ticketSale.discount')"
                         type="number"
                     />
+                    <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
+                        <QRadio
+                            v-model="edit.manaCode"
+                            dense
+                            val="mana"
+                            :label="t('Promotion mana')"
+                            :dark="true"
+                        />
+                        <QRadio
+                            v-model="edit.manaCode"
+                            dense
+                            val="manaClaim"
+                            :label="t('Claim mana')"
+                            :dark="true"
+                            class="q-mb-sm"
+                        />
+                    </div>
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2ca0b5727..ef5024e36 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -19,6 +19,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -68,7 +69,7 @@ function isEditable() {
 
 async function changeState(value) {
     try {
-        stateBtnDropdownRef.value.hide();
+        stateBtnDropdownRef.value?.hide();
         const formData = {
             ticketFk: entityId.value,
             code: value,
@@ -108,6 +109,10 @@ function getNoteValue(description) {
 function toTicketUrl(section) {
     return '#/ticket/' + entityId.value + '/' + section;
 }
+function isOnTicketCard() {
+    const currentPath = route.path;
+    return currentPath.startsWith('/ticket');
+}
 </script>
 
 <template>
@@ -122,6 +127,16 @@ function toTicketUrl(section) {
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
     >
+        <template #header-left>
+            <router-link
+                v-if="route?.name !== 'TicketSummary'"
+                :to="{ name: 'TicketSummary', params: { id: entityId } }"
+                class="header link"
+                :href="entryUrl"
+            >
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </router-link>
+        </template>
         <template #header="{ entity }">
             <div>
                 Ticket #{{ entity.id }} - {{ entity.client?.name }} ({{
@@ -131,23 +146,43 @@ function toTicketUrl(section) {
             </div>
         </template>
         <template #header-right>
-            <QBtnDropdown
-                ref="stateBtnDropdownRef"
-                color="black"
-                text-color="white"
-                :label="t('ticket.summary.changeState')"
-                :disable="!isEditable()"
-            >
-                <VnSelect
-                    :options="editableStates"
-                    hide-selected
-                    option-label="name"
-                    option-value="code"
-                    hide-dropdown-icon
-                    focus-on-mount
-                    @update:model-value="changeState"
-                />
-            </QBtnDropdown>
+            <div class="flex items-end">
+                <QBtnDropdown
+                    ref="stateBtnDropdownRef"
+                    color="black"
+                    text-color="white"
+                    :label="t('ticket.summary.changeState')"
+                    :disable="!isEditable()"
+                >
+                    <VnSelect
+                        :options="editableStates"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        hide-dropdown-icon
+                        focus-on-mount
+                        @update:model-value="changeState"
+                    />
+                </QBtnDropdown>
+                <QBtn
+                    v-if="!isOnTicketCard()"
+                    icon="more_vert"
+                    round
+                    size="md"
+                    flat
+                    color="white"
+                >
+                    <QMenu>
+                        <QList>
+                            <QItem>
+                                <QItemSection>
+                                    <TicketDescriptorMenu :ticket="entityId" />
+                                </QItemSection>
+                            </QItem>
+                        </QList>
+                    </QMenu>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index fee946ccf..878d274d7 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -20,18 +20,16 @@ const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
-const alertLevels = ref([]);
 const groupedStates = ref([]);
 
-const getGroupedStates = () => {
-    for (const state of alertLevels.value) {
+const getGroupedStates = (data) => {
+    for (const state of data) {
         groupedStates.value.push({
             id: state.id,
             name: t(`${state.code}`),
             code: state.code,
         });
     }
-    console.log(groupedStates.value);
 };
 </script>
 
@@ -42,7 +40,7 @@ const getGroupedStates = () => {
         url="AlertLevels"
         @on-fetch="
             (data) => {
-                (alertLevels = data), getGroupedStates();
+                getGroupedStates(data);
             }
         "
         auto-load
@@ -130,10 +128,10 @@ const getGroupedStates = () => {
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!alertLevels">
+                <QItemSection v-if="!groupedStates">
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
-                <QItemSection v-if="alertLevels">
+                <QItemSection v-if="groupedStates">
                     <QSelect
                         :label="t('Grouped state')"
                         v-model="params.groupedStates"

From 73e5039ec39d351672548f22400fc0c6c52220a5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 08:35:24 +0200
Subject: [PATCH 11/32] refs #7986 create front

---
 src/pages/Worker/Card/WorkerMoto.vue | 187 +++++++++++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerMoto.vue

diff --git a/src/pages/Worker/Card/WorkerMoto.vue b/src/pages/Worker/Card/WorkerMoto.vue
new file mode 100644
index 000000000..a53aac270
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerMoto.vue
@@ -0,0 +1,187 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        userFk: routeId.value,
+        deviceProductionFk: null,
+        simSerialNumber: null,
+    };
+});
+
+const deallocatePDA = async (deviceProductionFk) => {
+    try {
+        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+            pda: deviceProductionFk,
+        });
+        notify(t('PDA deallocated'), 'positive');
+    } catch (err) {
+        console.error('Error deallocating PDA');
+    }
+    paginate.value.fetch();
+};
+
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="workers/getAvailablePda"
+            @on-fetch="(data) => (deviceProductions = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="DeviceProductionUsers"
+            :filter="{ where: { userFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-px-md q-mb-sm container"
+                >
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.pda.currentPDA')"
+                            :model-value="row?.deviceProductionFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Model')"
+                            :model-value="row?.deviceProduction?.modelFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Serial number')"
+                            :model-value="row?.deviceProduction?.serialNumber"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Current SIM')"
+                            :model-value="row?.simSerialNumber"
+                            disable
+                        />
+                        <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            class="btn-delete"
+                            @click="
+                                openConfirmationModal(
+                                    t(`Remove PDA`),
+                                    t('Do you want to remove this PDA?'),
+                                    () => deallocatePDA(row.deviceProductionFk)
+                                )
+                            "
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QBtn>
+                    </VnRow>
+                </QCard>
+            </template>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="DeviceProductionUsers"
+                        model="DeviceProductionUser"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.pda.newPDA')"
+                                    v-model="data.deviceProductionFk"
+                                    :options="deviceProductions"
+                                    option-label="id"
+                                    option-value="id"
+                                    id="deviceProductionFk"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel
+                                                    >ID: {{ scope.opt?.id }}</QItemLabel
+                                                >
+                                                <QItemLabel caption>
+                                                    {{ scope.opt?.modelFk }},
+                                                    {{ scope.opt?.serialNumber }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInput
+                                    v-model="data.simSerialNumber"
+                                    :label="t('SIM serial number')"
+                                    id="simSerialNumber"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
+<i18n>
+es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+</i18n>

From 855032e4a63765927536c8a266ccce7ec472b28e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 15:36:57 +0200
Subject: [PATCH 12/32] refs #7986 fix front

---
 src/pages/Worker/Card/WorkerMoto.vue     | 187 -------------
 src/pages/Worker/Card/WorkerOperator.vue | 322 +++++++++++++++++++++++
 src/router/modules/worker.js             |  12 +
 3 files changed, 334 insertions(+), 187 deletions(-)
 delete mode 100644 src/pages/Worker/Card/WorkerMoto.vue
 create mode 100644 src/pages/Worker/Card/WorkerOperator.vue

diff --git a/src/pages/Worker/Card/WorkerMoto.vue b/src/pages/Worker/Card/WorkerMoto.vue
deleted file mode 100644
index a53aac270..000000000
--- a/src/pages/Worker/Card/WorkerMoto.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const paginate = ref();
-const dialog = ref();
-const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
-const routeId = computed(() => route.params.id);
-
-const initialData = computed(() => {
-    return {
-        userFk: routeId.value,
-        deviceProductionFk: null,
-        simSerialNumber: null,
-    };
-});
-
-const deallocatePDA = async (deviceProductionFk) => {
-    try {
-        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: deviceProductionFk,
-        });
-        notify(t('PDA deallocated'), 'positive');
-    } catch (err) {
-        console.error('Error deallocating PDA');
-    }
-    paginate.value.fetch();
-};
-
-function reloadData() {
-    initialData.value.deviceProductionFk = null;
-    initialData.value.simSerialNumber = null;
-    paginate.value.fetch();
-}
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md centerCard">
-        <FetchData
-            url="workers/getAvailablePda"
-            @on-fetch="(data) => (deviceProductions = data)"
-            auto-load
-        />
-        <VnPaginate
-            ref="paginate"
-            data-key="WorkerPda"
-            url="DeviceProductionUsers"
-            :filter="{ where: { userFk: routeId } }"
-            order="id"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QCard
-                    flat
-                    bordered
-                    :key="row.id"
-                    v-for="row of rows"
-                    class="card q-px-md q-mb-sm container"
-                >
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.pda.currentPDA')"
-                            :model-value="row?.deviceProductionFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Model')"
-                            :model-value="row?.deviceProduction?.modelFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Serial number')"
-                            :model-value="row?.deviceProduction?.serialNumber"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Current SIM')"
-                            :model-value="row?.simSerialNumber"
-                            disable
-                        />
-                        <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk)
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
-                <QDialog ref="dialog">
-                    <FormModelPopup
-                        :title="t('Add new device')"
-                        url-create="DeviceProductionUsers"
-                        model="DeviceProductionUser"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.pda.newPDA')"
-                                    v-model="data.deviceProductionFk"
-                                    :options="deviceProductions"
-                                    option-label="id"
-                                    option-value="id"
-                                    id="deviceProductionFk"
-                                    hide-selected
-                                >
-                                    <template #option="scope">
-                                        <QItem v-bind="scope.itemProps">
-                                            <QItemSection>
-                                                <QItemLabel
-                                                    >ID: {{ scope.opt?.id }}</QItemLabel
-                                                >
-                                                <QItemLabel caption>
-                                                    {{ scope.opt?.modelFk }},
-                                                    {{ scope.opt?.serialNumber }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </template>
-                                </VnSelect>
-                                <VnInput
-                                    v-model="data.simSerialNumber"
-                                    :label="t('SIM serial number')"
-                                    id="simSerialNumber"
-                                    use-input
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
-            </QBtn>
-            <QTooltip>
-                {{ t('globals.new') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
-</template>
-<style lang="scss" scoped>
-.btn-delete {
-    max-width: 4%;
-    margin-top: 30px;
-}
-</style>
-<i18n>
-es:
-    Model: Modelo
-    Serial number: Número de serie
-    Current SIM: SIM actual
-    Add new device: Añadir nuevo dispositivo
-    PDA deallocated: PDA desasignada
-    Remove PDA: Eliminar PDA
-    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
-    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
-    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
new file mode 100644
index 000000000..13b531a33
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -0,0 +1,322 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { size } from 'cypress/types/lodash';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        workerFk: routeId.value,
+        numberOfWagons: 2,
+        trainFk: 1,
+        itemPackingTypeFk: 'H',
+        warehouseFk: 60,
+        sectorFk: null,
+        labelerFk: null,
+        linesLimit: 20,
+        volumenLimit: 0.5,
+        sizeLimit: null,
+        isOnReservationMode: 0,
+        machineFk: null,
+    };
+});
+
+// const deallocatePDA = async (deviceProductionFk) => {
+//     try {
+//         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+//             pda: deviceProductionFk,
+//         });
+//         notify(t('PDA deallocated'), 'positive');
+//     } catch (err) {
+//         console.error('Error deallocating PDA');
+//     }
+//     paginate.value.fetch();
+// };
+
+function reloadData() {
+    // initialData.value.deviceProductionFk = null;
+    // initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="shelvings/trains"
+            @on-fetch="(data) => (trainsData = data)"
+            auto-load
+        />
+        <FetchData
+            url="items/ItemPackingTypes"
+            @on-fetch="(data) => (ItemPackingTypesData = data)"
+            auto-load
+        />
+        <FetchData
+            url="warehouses"
+            @on-fetch="(data) => (warehousesData = data)"
+            auto-load
+        />
+        <FetchData
+            url="shelvings/sectors"
+            @on-fetch="(data) => (shelvingsData = data)"
+            auto-load
+        />
+        <FetchData url="machines" @on-fetch="(data) => (machinesData = data)" auto-load />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="Operators"
+            :filter="{ where: { workerFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-px-md q-mb-sm container"
+                >
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.numberOfWagons')"
+                            :model-value="row?.numberOfWagons"
+                            disable
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.train')"
+                            :options="trainsData"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.trainFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnSelect
+                            :label="t('worker.operator.itemPackingType')"
+                            :options="ItemPackingTypesData"
+                            hide-selected
+                            option-label="code"
+                            option-value="code"
+                            v-model="data.itemPackingTypeFk"
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.warehouse')"
+                            :options="warehousesData"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.warehouseFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnSelect
+                            :label="t('worker.operator.sector')"
+                            :options="shelvingsData"
+                            hide-selected
+                            option-label="description"
+                            option-value="id"
+                            v-model="data.sectorFk"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.labeler')"
+                            :model-value="row?.labelerFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.linesLimit')"
+                            :model-value="row?.linesLimit"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.volumeLimit')"
+                            :model-value="row?.volumeLimit"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.sizeLimit')"
+                            :model-value="row?.sizeLimit"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.sizeLimit')"
+                            :model-value="row?.sizeLimit"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.isOnReservationMode')"
+                            :model-value="row?.isOnReservationMode"
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.machine')"
+                            :options="machinesData"
+                            hide-selected
+                            option-label="plate"
+                            option-value="id"
+                            v-model="data.machineFk"
+                        />
+                    </VnRow>
+                    <!-- <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            class="btn-delete"
+                            @click="
+                                openConfirmationModal(
+                                    t(`Remove PDA`),
+                                    t('Do you want to remove this PDA?'),
+                                    () => deallocatePDA(row.deviceProductionFk)
+                                )
+                            "
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QBtn>-->
+                </QCard>
+            </template>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="operators"
+                        model="operator"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.numberOfWagons')"
+                                    :model-value="row?.numberOfWagons"
+                                    disable
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.train')"
+                                    :options="trainsData"
+                                    hide-selected
+                                    option-label="name"
+                                    option-value="id"
+                                    v-model="data.trainFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.operator.itemPackingType')"
+                                    :options="ItemPackingTypesData"
+                                    hide-selected
+                                    option-label="code"
+                                    option-value="code"
+                                    v-model="data.itemPackingTypeFk"
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.warehouse')"
+                                    :options="warehousesData"
+                                    hide-selected
+                                    option-label="name"
+                                    option-value="id"
+                                    v-model="data.warehouseFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.operator.sector')"
+                                    :options="shelvingsData"
+                                    hide-selected
+                                    option-label="description"
+                                    option-value="id"
+                                    v-model="data.sectorFk"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.labeler')"
+                                    :model-value="row?.labelerFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.linesLimit')"
+                                    :model-value="row?.linesLimit"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.volumeLimit')"
+                                    :model-value="row?.volumeLimit"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.sizeLimit')"
+                                    :model-value="row?.sizeLimit"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.sizeLimit')"
+                                    :model-value="row?.sizeLimit"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.isOnReservationMode')"
+                                    :model-value="row?.isOnReservationMode"
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.machine')"
+                                    :options="machinesData"
+                                    hide-selected
+                                    option-label="plate"
+                                    option-value="id"
+                                    v-model="data.machineFk"
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
+<i18n>
+es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 7258881be..d7199a4e6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -1,3 +1,5 @@
+import { path } from 'chromium';
+import { name } from 'quasar/dist/icon-set/material-icons.umd.prod';
 import { RouterView } from 'vue-router';
 
 export default {
@@ -27,6 +29,7 @@ export default {
             'WorkerBalance',
             'WorkerFormation',
             'WorkerMedical',
+            'WorkerOperator',
         ],
     },
     children: [
@@ -208,6 +211,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
                 },
+                {
+                    name: 'WorkerOperator',
+                    path: 'operator',
+                    meta: {
+                        title: 'operator',
+                        icon: 'person',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+                },
             ],
         },
     ],

From 801b6585e84eda8fbe8842fdbd483e14b7259591 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 9 Oct 2024 00:44:54 +0200
Subject: [PATCH 13/32] perf: refs #7679 change limit value

---
 src/components/CreateNewPostcodeForm.vue | 6 +++---
 src/components/CreateNewProvinceForm.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index c6bf8be10..030ca1388 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -135,14 +135,14 @@ async function handleCountries(data) {
         ref="provincesFetchDataRef"
         @on-fetch="handleProvinces"
         :sort-by="['name ASC']"
-        :limit="100"
+        :limit="30"
         auto-load
         url="Provinces/location"
     />
     <FetchData
         ref="townsFetchDataRef"
         :sort-by="['name ASC']"
-        :limit="100"
+        :limit="30"
         @on-fetch="handleTowns"
         auto-load
         url="Towns/location"
@@ -150,7 +150,7 @@ async function handleCountries(data) {
     <FetchData
         @on-fetch="handleCountries"
         :sort-by="['name ASC']"
-        :limit="100"
+        :limit="30"
         auto-load
         url="Countries"
     />
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 3c1f6b6f2..d7df38f9f 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -47,7 +47,7 @@ const onDataSaved = (dataSaved, requestResponse) => {
         }"
         url="Autonomies/location"
         :sort-by="['name ASC']"
-        :limit="100"
+        :limit="30"
     />
     <FormModelPopup
         :title="t('New province')"

From 2dd3e0992801f50958b19ab74b31090fab9bc9a8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:26:16 +0200
Subject: [PATCH 14/32] refactor: requested changes

---
 src/components/ui/VnToSummary.vue           | 33 +++++++++++++
 src/components/ui/VnUsesMana.vue            | 55 +++++++++++++++++++++
 src/pages/Entry/Card/EntrySummary.vue       | 13 +++--
 src/pages/ItemType/Card/ItemTypeSummary.vue |  6 +++
 src/pages/Ticket/Card/TicketEditMana.vue    | 18 +------
 src/pages/Ticket/Card/TicketSale.vue        | 17 +------
 src/pages/Ticket/Card/TicketSummary.vue     | 21 +++-----
 7 files changed, 111 insertions(+), 52 deletions(-)
 create mode 100644 src/components/ui/VnToSummary.vue
 create mode 100644 src/components/ui/VnUsesMana.vue

diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue
new file mode 100644
index 000000000..1c7d6cf01
--- /dev/null
+++ b/src/components/ui/VnToSummary.vue
@@ -0,0 +1,33 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
+
+const props = defineProps({
+    routeName: {
+        type: String,
+        required: true,
+    },
+    entityId: {
+        type: [String, Number],
+        required: true,
+    },
+    url: {
+        type: String,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const id = props.entityId;
+</script>
+
+<template>
+    <router-link
+        v-if="route?.name !== routeName"
+        :to="{ name: routeName, params: { id: id } }"
+        class="header link"
+        :href="url"
+    >
+        <QIcon name="open_in_new" color="white" size="sm" />
+    </router-link>
+</template>
diff --git a/src/components/ui/VnUsesMana.vue b/src/components/ui/VnUsesMana.vue
new file mode 100644
index 000000000..891de5f63
--- /dev/null
+++ b/src/components/ui/VnUsesMana.vue
@@ -0,0 +1,55 @@
+<script setup>
+import { defineProps, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const props = defineProps({
+    usesMana: {
+        type: Boolean,
+        required: true,
+    },
+    manaCode: {
+        type: String,
+        required: true,
+    },
+    manaVal: {
+        type: String,
+        default: 'mana',
+    },
+    manaLabel: {
+        type: String,
+        default: 'Promotion mana',
+    },
+    manaClaimVal: {
+        type: String,
+        default: 'manaClaim',
+    },
+    claimLabel: {
+        type: String,
+        default: 'Claim mana',
+    },
+});
+
+const manaCode = ref(props.manaCode);
+</script>
+
+<template>
+    <div class="column q-gutter-y-sm q-mt-sm">
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaVal"
+            :label="t(manaLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaClaimVal"
+            :label="t(claimLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+    </div>
+</template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 58a5c2e1b..c2f1e6b57 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -11,6 +11,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,14 +164,12 @@ const fetchEntryBuys = async () => {
         data-key="EntrySummary"
     >
         <template #header-left>
-            <router-link
+            <VnToSummary
                 v-if="route?.name !== 'EntrySummary'"
-                :to="{ name: 'EntrySummary', params: { id: entityId } }"
-                class="header link"
-                :href="entryUrl"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                :route-name="'EntrySummary'"
+                :entity-id="entityId"
+                :url="entryUrl"
+            />
         </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index 62d1c74ab..c51d59e13 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -6,6 +6,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -55,6 +56,11 @@ async function setItemTypeData(data) {
             >
                 <QIcon name="open_in_new" color="white" size="sm" />
             </router-link>
+            <VnToSummary
+                v-if="route?.name !== 'ItemTypeSummary'"
+                :route-name="'ItemTypeSummary'"
+                :entity-id="entityId"
+            />
         </template>
         <template #header>
             <span>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index c7ff724e4..3d5b04a41 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { toCurrency } from 'src/filters';
+import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
     mana: {
@@ -57,21 +57,7 @@ const cancel = () => {
                 </div>
             </div>
             <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
-                <QRadio
-                    v-model="manaCode"
-                    dense
-                    val="mana"
-                    :label="t('Promotion mana')"
-                    :dark="true"
-                />
-                <QRadio
-                    v-model="manaCode"
-                    dense
-                    val="manaClaim"
-                    :label="t('Claim mana')"
-                    :dark="true"
-                    class="q-mb-sm"
-                />
+                <VnUsesMana :mana-code="manaCode" />
             </div>
             <div class="row">
                 <QBtn
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3a42fda0c..1586f63ff 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnUsesMana from 'src/components/ui/VnUsesMana.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -771,21 +772,7 @@ watch(
                         type="number"
                     />
                     <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
-                        <QRadio
-                            v-model="edit.manaCode"
-                            dense
-                            val="mana"
-                            :label="t('Promotion mana')"
-                            :dark="true"
-                        />
-                        <QRadio
-                            v-model="edit.manaCode"
-                            dense
-                            val="manaClaim"
-                            :label="t('Claim mana')"
-                            :dark="true"
-                            class="q-mb-sm"
-                        />
+                        <VnUsesMana :mana-code="manaCode" />
                     </div>
                 </TicketEditManaProxy>
             </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b2de95305..4ed59d70a 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -105,14 +106,12 @@ function isOnTicketCard() {
         data-key="TicketSummary"
     >
         <template #header-left>
-            <router-link
+            <VnToSummary
                 v-if="route?.name !== 'TicketSummary'"
-                :to="{ name: 'TicketSummary', params: { id: entityId } }"
-                class="header link"
-                :href="entryUrl"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                :route-name="'TicketSummary'"
+                :entity-id="entityId"
+                :url="ticketUrl"
+            />
         </template>
         <template #header="{ entity }">
             <div>
@@ -150,13 +149,7 @@ function isOnTicketCard() {
                     color="white"
                 >
                     <QMenu>
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <TicketDescriptorMenu :ticket="entityId" />
-                                </QItemSection>
-                            </QItem>
-                        </QList>
+                        <TicketDescriptorMenu :ticket="entityId" />
                     </QMenu>
                 </QBtn>
             </div>

From 3d9d08146c386f8ca98fa69ad5235c3bf7694645 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 11 Oct 2024 15:46:30 +0200
Subject: [PATCH 15/32] test: refs #6943 add customer test

---
 .../integration/client/clientAddress.spec.js  | 13 ++++
 .../integration/client/clientBalance.spec.js  | 13 ++++
 .../client/clientBasicData.spec.js            | 13 ++++
 .../client/clientBillingData.spec.js          | 13 ++++
 .../integration/client/clientCredits.spec.js  | 13 ++++
 .../client/clientFiscalData.spec.js           | 13 ++++
 .../integration/client/clientGreuges.spec.js  | 13 ++++
 .../integration/client/clientList.spec.js     | 63 +++++++++++++++++++
 .../integration/client/clientNotes.spec.js    | 13 ++++
 .../client/clientRecoveries.spec.js           | 13 ++++
 .../client/clientWebAccess.spec.js            | 13 ++++
 .../clientCreditContracts.spec.js             | 13 ++++
 .../clientCreditOpinion.spec.js               | 13 ++++
 .../client/others/clientConsumption.spec.js   | 13 ++++
 .../client/others/clientContacts.spec.js      | 13 ++++
 .../client/others/clientMandates.spec.js      | 13 ++++
 .../client/others/clientSamples.spec.js       | 13 ++++
 .../client/others/clientUnpaid.spec.js        | 13 ++++
 .../client/others/clientWebPayments.spec.js   | 13 ++++
 19 files changed, 297 insertions(+)
 create mode 100644 test/cypress/integration/client/clientAddress.spec.js
 create mode 100644 test/cypress/integration/client/clientBalance.spec.js
 create mode 100644 test/cypress/integration/client/clientBasicData.spec.js
 create mode 100644 test/cypress/integration/client/clientBillingData.spec.js
 create mode 100644 test/cypress/integration/client/clientCredits.spec.js
 create mode 100644 test/cypress/integration/client/clientFiscalData.spec.js
 create mode 100644 test/cypress/integration/client/clientGreuges.spec.js
 create mode 100644 test/cypress/integration/client/clientList.spec.js
 create mode 100644 test/cypress/integration/client/clientNotes.spec.js
 create mode 100644 test/cypress/integration/client/clientRecoveries.spec.js
 create mode 100644 test/cypress/integration/client/clientWebAccess.spec.js
 create mode 100644 test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
 create mode 100644 test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
 create mode 100644 test/cypress/integration/client/others/clientConsumption.spec.js
 create mode 100644 test/cypress/integration/client/others/clientContacts.spec.js
 create mode 100644 test/cypress/integration/client/others/clientMandates.spec.js
 create mode 100644 test/cypress/integration/client/others/clientSamples.spec.js
 create mode 100644 test/cypress/integration/client/others/clientUnpaid.spec.js
 create mode 100644 test/cypress/integration/client/others/clientWebPayments.spec.js

diff --git a/test/cypress/integration/client/clientAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
new file mode 100644
index 000000000..06c3fce8f
--- /dev/null
+++ b/test/cypress/integration/client/clientAddress.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client consignee', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/address', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientBalance.spec.js b/test/cypress/integration/client/clientBalance.spec.js
new file mode 100644
index 000000000..c418edb6a
--- /dev/null
+++ b/test/cypress/integration/client/clientBalance.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client balance', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/balance', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientBasicData.spec.js b/test/cypress/integration/client/clientBasicData.spec.js
new file mode 100644
index 000000000..10ab429e7
--- /dev/null
+++ b/test/cypress/integration/client/clientBasicData.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client basic data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/basic-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientBillingData.spec.js b/test/cypress/integration/client/clientBillingData.spec.js
new file mode 100644
index 000000000..cba5770f9
--- /dev/null
+++ b/test/cypress/integration/client/clientBillingData.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client billing data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/billing-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientCredits.spec.js b/test/cypress/integration/client/clientCredits.spec.js
new file mode 100644
index 000000000..11cee6fc7
--- /dev/null
+++ b/test/cypress/integration/client/clientCredits.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client credits', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/credits', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
new file mode 100644
index 000000000..7e4f2a41f
--- /dev/null
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client fiscal data', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/fiscal-data', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientGreuges.spec.js b/test/cypress/integration/client/clientGreuges.spec.js
new file mode 100644
index 000000000..509a981d4
--- /dev/null
+++ b/test/cypress/integration/client/clientGreuges.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client greuges', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/greuges', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
new file mode 100644
index 000000000..6cdadd101
--- /dev/null
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -0,0 +1,63 @@
+/// <reference types="cypress" />
+describe('Handle Client list', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/customer/list', {
+            timeout: 5000,
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+    });
+
+    it('Client list create new client', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        const data = {
+            Name: { val: 'Name 1' },
+            'Social name': { val: 'TEST 1' },
+            'Tax number': { val: '20852113Z' },
+            'Web user': { val: 'user_test_1' },
+            Street: { val: 'C/ STREET 1' },
+            Email: { val: 'user.test@1.com' },
+            'Business type': { val: 'Otros', type: 'select' },
+            'Sales person': { val: 'salesboss', type: 'select' },
+            Location: { val: '46000, Valencia(Province one), España', type: 'select' },
+        };
+        cy.fillInForm(data);
+
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+
+        cy.checkNotification('created');
+        cy.url().should('include', '/summary');
+    });
+    it('Client list search client', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+
+        cy.get('.title > span').should('have.text', search);
+        let id = null;
+        cy.get('.q-item > .q-item__label').then((text) => {
+            id = text.text().trim().split('#')[1];
+            cy.get('.q-item > .q-item__label').should('have.text', ` #${id}`);
+            cy.url().should('include', `/customer/${id}/summary`);
+        });
+    });
+
+    it('Client founded create ticket', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+        cy.clickButtonsDescriptor(2);
+        cy.waitForElement('#formModel');
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(1, search);
+    });
+    it('Client founded create order', () => {
+        const search = 'Jessica Jones';
+        cy.searchByLabel('Name', search);
+        cy.clickButtonsDescriptor(4);
+        cy.waitForElement('#formModel');
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(2, search);
+    });
+});
diff --git a/test/cypress/integration/client/clientNotes.spec.js b/test/cypress/integration/client/clientNotes.spec.js
new file mode 100644
index 000000000..050120e0d
--- /dev/null
+++ b/test/cypress/integration/client/clientNotes.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client notes', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/notes', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientRecoveries.spec.js b/test/cypress/integration/client/clientRecoveries.spec.js
new file mode 100644
index 000000000..830942034
--- /dev/null
+++ b/test/cypress/integration/client/clientRecoveries.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client recoveries', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/recoveries', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/clientWebAccess.spec.js b/test/cypress/integration/client/clientWebAccess.spec.js
new file mode 100644
index 000000000..b64fcd27b
--- /dev/null
+++ b/test/cypress/integration/client/clientWebAccess.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client web-access', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/web-access', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
new file mode 100644
index 000000000..160b77335
--- /dev/null
+++ b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client credit opinion', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/credit-management/credit-contracts', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
new file mode 100644
index 000000000..1e29bae5c
--- /dev/null
+++ b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client credit opinion', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/credit-management/credit-opinion', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientConsumption.spec.js b/test/cypress/integration/client/others/clientConsumption.spec.js
new file mode 100644
index 000000000..44472afb5
--- /dev/null
+++ b/test/cypress/integration/client/others/clientConsumption.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client consumption', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/consumption', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientContacts.spec.js b/test/cypress/integration/client/others/clientContacts.spec.js
new file mode 100644
index 000000000..9f31fe878
--- /dev/null
+++ b/test/cypress/integration/client/others/clientContacts.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client contacts', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/contacts', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientMandates.spec.js b/test/cypress/integration/client/others/clientMandates.spec.js
new file mode 100644
index 000000000..968c91d6c
--- /dev/null
+++ b/test/cypress/integration/client/others/clientMandates.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client mandates', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/others/mandates', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientSamples.spec.js b/test/cypress/integration/client/others/clientSamples.spec.js
new file mode 100644
index 000000000..ed6066127
--- /dev/null
+++ b/test/cypress/integration/client/others/clientSamples.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client samples', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/samples', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientUnpaid.spec.js b/test/cypress/integration/client/others/clientUnpaid.spec.js
new file mode 100644
index 000000000..db45d2cd2
--- /dev/null
+++ b/test/cypress/integration/client/others/clientUnpaid.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client unpaid', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1110/others/unpaid', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/client/others/clientWebPayments.spec.js b/test/cypress/integration/client/others/clientWebPayments.spec.js
new file mode 100644
index 000000000..5ef4002f4
--- /dev/null
+++ b/test/cypress/integration/client/others/clientWebPayments.spec.js
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('Handle Client web payments', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('#/customer/1101/others/web-payments', {
+            timeout: 5000,
+        });
+    });
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});

From 720042bed9679c725e4e4640eeb4801984a121b9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 11:30:31 +0200
Subject: [PATCH 16/32] feat: added new filter param and refactored link colors

---
 src/pages/Item/ItemRequest.vue       |  6 +++---
 src/pages/Item/ItemRequestFilter.vue | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 8a41bbe04..82c3b48e0 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -229,7 +229,7 @@ onBeforeMount(() => {
         >
             <template #body-cell-id="{ row }">
                 <QTd>
-                    <QBtn flat color="primary"> {{ row.ticketFk }}</QBtn>
+                    <QBtn flat class="link"> {{ row.ticketFk }}</QBtn>
                     <TicketDescriptorProxy :id="row.ticketFk" />
                 </QTd>
             </template>
@@ -251,7 +251,7 @@ onBeforeMount(() => {
             </template>
             <template #body-cell-requester="{ row }">
                 <QTd>
-                    <QBtn flat dense color="primary"> {{ row.requesterName }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.requesterName }}</QBtn>
                     <WorkerDescriptorProxy :id="row.requesterFk" />
                 </QTd>
             </template>
@@ -292,7 +292,7 @@ onBeforeMount(() => {
             </template>
             <template #body-cell-concept="{ row }">
                 <QTd>
-                    <QBtn flat dense color="primary"> {{ row.itemDescription }}</QBtn>
+                    <QBtn flat dense class="link"> {{ row.itemDescription }}</QBtn>
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QTd>
             </template>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 0e81ff5a5..64bc0e575 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -174,6 +174,16 @@ const decrement = (paramsObj, key) => {
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('params.myTeam')"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
             <QCard bordered>
                 <QItem>
                     <QItemSection>
@@ -274,11 +284,11 @@ en:
         to: To
         mine: For me
         state: State
+        myTeam: My team
     dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
     denied: Denied
     accepted: Accepted
     pending: Pending
-
 es:
     params:
         search: Búsqueda general
@@ -291,6 +301,7 @@ es:
         to: Hasta
         mine: Para mi
         state: Estado
+        myTeam: Mi equipo
     dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
     denied: Denegada
     accepted: Aceptada

From 0aab17beccda42d419719d702ed969d9df25cc2c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 13:08:16 +0200
Subject: [PATCH 17/32] fix: fixed customer descriptor proxy

---
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index e9d5a2f1f..ca8fb075c 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -78,7 +78,7 @@ const ticketsColumns = ref([
         align: 'left',
     },
     {
-        name: 'quantity',
+        name: 'nickname',
         label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
@@ -172,11 +172,11 @@ const ticketsColumns = ref([
                             </QBtn>
                         </QTd>
                     </template>
-                    <template #body-cell-quantity="{ value, row }">
+                    <template #body-cell-nickname="{ value, row }">
                         <QTd>
                             <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
+                                <CustomerDescriptorProxy :id="row.clientFk" />
                             </QBtn>
                         </QTd>
                     </template>

From dfceb9403cc5b69a7da50ea94174f14f4599fc80 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 07:54:52 +0200
Subject: [PATCH 18/32] fix: refs #7986 fix front

---
 src/i18n/locale/en.yml                   | 12 ++++
 src/i18n/locale/es.yml                   | 13 +++++
 src/pages/Worker/Card/WorkerOperator.vue | 73 ++++++------------------
 src/router/modules/worker.js             |  2 -
 4 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b73395df2..422c21d82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -840,6 +840,18 @@ worker:
             debit: Debt
             credit: Have
             concept: Concept
+    operator:
+        numberOfWagons: Number of wagons
+        train: Train
+        itemPackingType: Item packing type
+        warehouse: Warehouse
+        sector: Sector
+        labeler: Printer
+        linesLimit: Lines limit
+        volumeLimit: Volume limit
+        sizeLimit: Size limit
+        isOnReservationMode: Reservation mode
+        Machine: Machine
 wagon:
     pageTitles:
         wagons: Wagons
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2552c9549..ce2384d89 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -838,6 +838,19 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    operator:
+        numberOfWagons: Número de vagones
+        train: tren
+        itemPackingType: Tipo de embalaje
+        warehouse: Almacén
+        sector: Sector
+        labeler: Impresora
+        linesLimit: Líneas límite
+        volumeLimit: Volumen límite
+        sizeLimit: Tamaño límite
+        isOnReservationMode: Modo de reserva
+        Machine: Máquina
+
 wagon:
     pageTitles:
         wagons: Vagones
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 13b531a33..ce1c142e9 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -2,26 +2,17 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { size } from 'cypress/types/lodash';
 
 const { t } = useI18n();
-const { notify } = useNotify();
-
 const paginate = ref();
 const dialog = ref();
 const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
 
 const initialData = computed(() => {
@@ -40,52 +31,34 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-
-// const deallocatePDA = async (deviceProductionFk) => {
-//     try {
-//         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-//             pda: deviceProductionFk,
-//         });
-//         notify(t('PDA deallocated'), 'positive');
-//     } catch (err) {
-//         console.error('Error deallocating PDA');
-//     }
-//     paginate.value.fetch();
-// };
-
-function reloadData() {
-    // initialData.value.deviceProductionFk = null;
-    // initialData.value.simSerialNumber = null;
-    paginate.value.fetch();
-}
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="shelvings/trains"
+            url="Shelvings/Train"
             @on-fetch="(data) => (trainsData = data)"
             auto-load
         />
         <FetchData
-            url="items/ItemPackingTypes"
+            url="Items/ItemPackingType"
             @on-fetch="(data) => (ItemPackingTypesData = data)"
             auto-load
         />
         <FetchData
-            url="warehouses"
+            url="Warehouses"
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
         <FetchData
-            url="shelvings/sectors"
+            url="Shelvings/Sector"
             @on-fetch="(data) => (shelvingsData = data)"
             auto-load
         />
-        <FetchData url="machines" @on-fetch="(data) => (machinesData = data)" auto-load />
+        <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
         <VnPaginate
             ref="paginate"
-            data-key="WorkerPda"
+            data-key="WorkerOperator"
             url="Operators"
             :filter="{ where: { workerFk: routeId } }"
             order="id"
@@ -102,7 +75,7 @@ function reloadData() {
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.numberOfWagons')"
-                            :model-value="row?.numberOfWagons"
+                            :model-value="data?.numberOfWagons"
                             disable
                         />
                         <VnSelect
@@ -143,34 +116,30 @@ function reloadData() {
                         />
                         <VnInput
                             :label="t('worker.operator.labeler')"
-                            :model-value="row?.labelerFk"
+                            :model-value="data?.labelerFk"
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.linesLimit')"
-                            :model-value="row?.linesLimit"
+                            :model-value="data?.linesLimit"
                         />
                         <VnInput
                             :label="t('worker.operator.volumeLimit')"
-                            :model-value="row?.volumeLimit"
+                            :model-value="data?.volumeLimit"
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.sizeLimit')"
-                            :model-value="row?.sizeLimit"
+                            :model-value="data?.sizeLimit"
                         />
-                        <VnInput
-                            :label="t('worker.operator.sizeLimit')"
-                            :model-value="row?.sizeLimit"
-                        />
-                    </VnRow>
-                    <VnRow>
                         <VnInput
                             :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="row?.isOnReservationMode"
+                            :model-value="data?.isOnReservationMode"
                         />
+                    </VnRow>
+                    <VnRow>
                         <VnSelect
                             :label="t('worker.operator.machine')"
                             :options="machinesData"
@@ -255,33 +224,29 @@ function reloadData() {
                                 />
                                 <VnInput
                                     :label="t('worker.operator.labeler')"
-                                    :model-value="row?.labelerFk"
+                                    :model-value="data?.labelerFk"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.linesLimit')"
-                                    :model-value="row?.linesLimit"
+                                    :model-value="data?.linesLimit"
                                 />
                                 <VnInput
                                     :label="t('worker.operator.volumeLimit')"
-                                    :model-value="row?.volumeLimit"
+                                    :model-value="data?.volumeLimit"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.sizeLimit')"
-                                    :model-value="row?.sizeLimit"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.sizeLimit')"
-                                    :model-value="row?.sizeLimit"
+                                    :model-value="data?.sizeLimit"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.isOnReservationMode')"
-                                    :model-value="row?.isOnReservationMode"
+                                    :model-value="data?.isOnReservationMode"
                                 />
                                 <VnSelect
                                     :label="t('worker.operator.machine')"
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index d7199a4e6..c2a9e668f 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -1,5 +1,3 @@
-import { path } from 'chromium';
-import { name } from 'quasar/dist/icon-set/material-icons.umd.prod';
 import { RouterView } from 'vue-router';
 
 export default {

From d416a34560dd207a2f0f1b10bd071af79bb78ffd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 15 Oct 2024 08:48:30 +0200
Subject: [PATCH 19/32] refactor: use docuware in ticket descriptor menu

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 63 ++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index caf82ed24..834fced87 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -41,6 +41,8 @@ const isEditable = ref();
 const hasInvoicing = useAcl('invoicing');
 const hasPdf = ref();
 const weight = ref();
+const hasDocuwareFile = ref();
+const quasar = useQuasar();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -332,6 +334,41 @@ async function handleInvoiceOutData() {
     });
     hasPdf.value = data[0]?.hasPdf;
 }
+
+async function docuwareDownload() {
+    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+}
+
+async function hasDocuware() {
+    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+        fileCabinet: 'deliveryNote',
+        signed: true,
+    });
+    hasDocuwareFile.value = data;
+}
+
+async function uploadDocuware(force) {
+    console.log('force: ', force);
+    if (!force)
+        return quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('Send PDF to tablet'),
+                    message: t('Are you sure you want to replace this delivery note?'),
+                },
+            })
+            .onOk(async () => {
+                uploadDocuware(true);
+            });
+
+    const { data } = await axios.post(`Docuwares/upload`, {
+        fileCabinet: 'deliveryNote',
+        ticketIds: [parseInt(ticketId)],
+    });
+
+    if (data) notify({ message: t('PDF sent!'), type: 'positive' });
+}
 </script>
 <template>
     <FetchData
@@ -457,7 +494,13 @@ async function handleInvoiceOutData() {
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
-        <QMenu anchor="top end" self="top start" auto-close bordered>
+        <QMenu
+            anchor="top end"
+            self="top start"
+            auto-close
+            bordered
+            @click="hasDocuware()"
+        >
             <QList>
                 <QItem @click="openDeliveryNote('deliveryNote')" v-ripple clickable>
                     <QItemSection>{{ t('as PDF') }}</QItemSection>
@@ -465,6 +508,14 @@ async function handleInvoiceOutData() {
                 <QItem @click="openDeliveryNote('withoutPrices')" v-ripple clickable>
                     <QItemSection>{{ t('as PDF without prices') }}</QItemSection>
                 </QItem>
+                <QItem
+                    v-if="hasDocuwareFile"
+                    @click="docuwareDownload()"
+                    v-ripple
+                    clickable
+                >
+                    <QItemSection>{{ t('as PDF signed') }}</QItemSection>
+                </QItem>
                 <QItem
                     @click="openDeliveryNote('deliveryNote', 'csv')"
                     v-ripple
@@ -483,7 +534,7 @@ async function handleInvoiceOutData() {
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
-        <QMenu anchor="top end" self="top start" auto-close>
+        <QMenu anchor="top end" self="top start" auto-close @click="hasDocuware()">
             <QList>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('deliveryNote')"
@@ -492,11 +543,7 @@ async function handleInvoiceOutData() {
                 >
                     <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
-                <QItem
-                    @click="sendDeliveryNoteConfirmation('withoutPrices')"
-                    v-ripple
-                    clickable
-                >
+                <QItem @click="uploadDocuware(!hasDocuwareFile)" v-ripple clickable>
                     <QItemSection>{{ t('Send PDF to tablet') }}</QItemSection>
                 </QItem>
                 <QItem
@@ -700,4 +747,6 @@ es:
     invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
     This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
     You are going to delete this ticket: Vas a eliminar este ticket
+    as PDF signed: como PDF firmado
+    Are you sure you want to replace this delivery note?: ¿Seguro que quieres reemplazar este albarán?
 </i18n>

From af830591b37063a9a21d428c7a2081125099ee8d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 09:44:55 +0200
Subject: [PATCH 20/32] fix: refs #7986 front fixed

---
 src/i18n/locale/en.yml                   |  2 +-
 src/i18n/locale/es.yml                   |  2 +-
 src/pages/Worker/Card/WorkerOperator.vue | 66 ++++++++++++------------
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 422c21d82..dd11c165d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -851,7 +851,7 @@ worker:
         volumeLimit: Volume limit
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
-        Machine: Machine
+        machine: Machine
 wagon:
     pageTitles:
         wagons: Wagons
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ce2384d89..27a45d9ce 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -849,7 +849,7 @@ worker:
         volumeLimit: Volumen límite
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
-        Machine: Máquina
+        machine: Máquina
 
 wagon:
     pageTitles:
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index ce1c142e9..88097878f 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -1,16 +1,19 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FormModel from 'components/FormModel.vue';
 
 const { t } = useI18n();
-const paginate = ref();
+
+const formModelRef = ref();
 const dialog = ref();
 const route = useRoute();
 const routeId = computed(() => route.params.id);
@@ -31,17 +34,17 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md centerCard">
+        <FetchData url="Trains" @on-fetch="(data) => (trainsData = data)" auto-load />
         <FetchData
-            url="Shelvings/Train"
-            @on-fetch="(data) => (trainsData = data)"
-            auto-load
-        />
-        <FetchData
-            url="Items/ItemPackingType"
+            url="ItemPackingTypes"
             @on-fetch="(data) => (ItemPackingTypesData = data)"
             auto-load
         />
@@ -50,18 +53,14 @@ const initialData = computed(() => {
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
-        <FetchData
-            url="Shelvings/Sector"
-            @on-fetch="(data) => (shelvingsData = data)"
-            auto-load
-        />
+        <FetchData url="Sectors" @on-fetch="(data) => (shelvingsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
-        <VnPaginate
-            ref="paginate"
-            data-key="WorkerOperator"
+
+        <FormModel
+            ref="formModelRef"
+            :form-initial-data="initialData"
             url="Operators"
             :filter="{ where: { workerFk: routeId } }"
-            order="id"
             auto-load
         >
             <template #body="{ rows }">
@@ -75,8 +74,7 @@ const initialData = computed(() => {
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.numberOfWagons')"
-                            :model-value="data?.numberOfWagons"
-                            disable
+                            :model-value="row?.numberOfWagons"
                         />
                         <VnSelect
                             :label="t('worker.operator.train')"
@@ -84,7 +82,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="name"
                             option-value="id"
-                            v-model="data.trainFk"
+                            v-model="row.trainFk"
                         />
                     </VnRow>
                     <VnRow>
@@ -94,7 +92,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="code"
                             option-value="code"
-                            v-model="data.itemPackingTypeFk"
+                            v-model="row.itemPackingTypeFk"
                         />
                         <VnSelect
                             :label="t('worker.operator.warehouse')"
@@ -102,7 +100,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="name"
                             option-value="id"
-                            v-model="data.warehouseFk"
+                            v-model="row.warehouseFk"
                         />
                     </VnRow>
                     <VnRow>
@@ -112,31 +110,36 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="description"
                             option-value="id"
-                            v-model="data.sectorFk"
+                            v-model="row.sectorFk"
                         />
                         <VnInput
                             :label="t('worker.operator.labeler')"
-                            :model-value="data?.labelerFk"
+                            :model-value="row.labelerFk"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.linesLimit')"
-                            :model-value="data?.linesLimit"
+                            :model-value="row.linesLimit"
+                            lazy-rules
                         />
                         <VnInput
                             :label="t('worker.operator.volumeLimit')"
-                            :model-value="data?.volumeLimit"
+                            :model-value="row.volumeLimit"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.sizeLimit')"
-                            :model-value="data?.sizeLimit"
+                            :model-value="row.sizeLimit"
+                            lazy-rules
                         />
                         <VnInput
                             :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="data?.isOnReservationMode"
+                            :model-value="row.isOnReservationMode"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
@@ -146,7 +149,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="plate"
                             option-value="id"
-                            v-model="data.machineFk"
+                            v-model="row.machineFk"
                         />
                     </VnRow>
                     <!-- <QBtn
@@ -168,7 +171,7 @@ const initialData = computed(() => {
                         </QBtn>-->
                 </QCard>
             </template>
-        </VnPaginate>
+        </FormModel>
         <QPageSticky :offset="[18, 18]">
             <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
                 <QDialog ref="dialog">
@@ -183,8 +186,7 @@ const initialData = computed(() => {
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.numberOfWagons')"
-                                    :model-value="row?.numberOfWagons"
-                                    disable
+                                    :model-value="data.numberOfWagons"
                                 />
                                 <VnSelect
                                     :label="t('worker.operator.train')"

From b4245d05fbd28b8a1c421b7344de6959666eb2e7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 13:00:01 +0200
Subject: [PATCH 21/32] fix: refs #7986 crudModel

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Worker/Card/WorkerOperator.vue | 313 +++++++++--------------
 3 files changed, 116 insertions(+), 199 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index dd11c165d..3742a773e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -743,6 +743,7 @@ worker:
         locker: Locker
         balance: Balance
         medical: Medical
+        operator: Operator
     list:
         name: Name
         email: Email
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 27a45d9ce..f92ac93d8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -750,6 +750,7 @@ worker:
         balance: Balance
         formation: Formación
         medical: Mutua
+        operator: Operario
     list:
         name: Nombre
         email: Email
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 88097878f..a667d083e 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -3,18 +3,23 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
+// import CrudModelPopup from 'src/components/CrudModelPopup.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FormModel from 'components/FormModel.vue';
+import CrudModel from 'components/CrudModel.vue';
 
 const { t } = useI18n();
 
-const formModelRef = ref();
+const test = ref({});
 const dialog = ref();
+const warehousesData = ref([]);
+const itemPackingTypesData = ref([]);
+const sectorsData = ref([]);
+const trainsData = ref([]);
+const machinesData = ref([]);
 const route = useRoute();
 const routeId = computed(() => route.params.id);
 
@@ -34,10 +39,10 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-watch(
-    () => route.params.id,
-    () => formModelRef.value.reset()
-);
+// watch(
+//     () => route.params.id,
+//     () => CrudModelRef.value.reset()
+// );
 </script>
 
 <template>
@@ -45,7 +50,7 @@ watch(
         <FetchData url="Trains" @on-fetch="(data) => (trainsData = data)" auto-load />
         <FetchData
             url="ItemPackingTypes"
-            @on-fetch="(data) => (ItemPackingTypesData = data)"
+            @on-fetch="(data) => (itemPackingTypesData = data)"
             auto-load
         />
         <FetchData
@@ -53,106 +58,105 @@ watch(
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
-        <FetchData url="Sectors" @on-fetch="(data) => (shelvingsData = data)" auto-load />
+        <FetchData url="Sectors" @on-fetch="(data) => (sectorsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
-
-        <FormModel
-            ref="formModelRef"
-            :form-initial-data="initialData"
+        <CrudModel
+            data-key="workerOperator"
             url="Operators"
-            :filter="{ where: { workerFk: routeId } }"
+            model="workerOperator"
+            :filter="{ where: { workerFk: route.params.id } }"
+            ref="test"
+            :data-required="{ workerFk: route.params.id }"
+            :default-save="false"
             auto-load
         >
             <template #body="{ rows }">
-                <QCard
-                    flat
-                    bordered
-                    :key="row.id"
-                    v-for="row of rows"
-                    class="card q-px-md q-mb-sm container"
-                >
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.numberOfWagons')"
-                            :model-value="row?.numberOfWagons"
-                        />
-                        <VnSelect
-                            :label="t('worker.operator.train')"
-                            :options="trainsData"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="row.trainFk"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.itemPackingType')"
-                            :options="ItemPackingTypesData"
-                            hide-selected
-                            option-label="code"
-                            option-value="code"
-                            v-model="row.itemPackingTypeFk"
-                        />
-                        <VnSelect
-                            :label="t('worker.operator.warehouse')"
-                            :options="warehousesData"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="row.warehouseFk"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.sector')"
-                            :options="shelvingsData"
-                            hide-selected
-                            option-label="description"
-                            option-value="id"
-                            v-model="row.sectorFk"
-                        />
-                        <VnInput
-                            :label="t('worker.operator.labeler')"
-                            :model-value="row.labelerFk"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.linesLimit')"
-                            :model-value="row.linesLimit"
-                            lazy-rules
-                        />
-                        <VnInput
-                            :label="t('worker.operator.volumeLimit')"
-                            :model-value="row.volumeLimit"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.sizeLimit')"
-                            :model-value="row.sizeLimit"
-                            lazy-rules
-                        />
-                        <VnInput
-                            :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="row.isOnReservationMode"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.machine')"
-                            :options="machinesData"
-                            hide-selected
-                            option-label="plate"
-                            option-value="id"
-                            v-model="row.machineFk"
-                        />
-                    </VnRow>
-                    <!-- <QBtn
+                <div v-if="rows.length">
+                    <QCard
+                        flat
+                        bordered
+                        :key="row"
+                        v-for="row of rows"
+                        class="card q-px-md q-mb-sm container"
+                    >
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.numberOfWagons')"
+                                v-model="row.numberOfWagons"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.train')"
+                                :options="trainsData"
+                                hide-selected
+                                v-model="row.trainFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.itemPackingType')"
+                                :options="itemPackingTypesData"
+                                hide-selected
+                                option-label="code"
+                                option-value="code"
+                                v-model="row.itemPackingTypeFk"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.warehouse')"
+                                :options="warehousesData"
+                                hide-selected
+                                v-model="row.warehouseFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.sector')"
+                                :options="sectorsData"
+                                hide-selected
+                                option-label="description"
+                                v-model="row.sectorFk"
+                            />
+                            <VnInput
+                                :label="t('worker.operator.labeler')"
+                                v-model="row.labelerFk"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.linesLimit')"
+                                v-model="row.linesLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.volumeLimit')"
+                                v-model="row.volumeLimit"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.sizeLimit')"
+                                v-model="row.sizeLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.isOnReservationMode')"
+                                v-model="row.isOnReservationMode"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.machine')"
+                                :options="machinesData"
+                                hide-selected
+                                option-label="plate"
+                                v-model="row.machineFk"
+                            />
+                        </VnRow>
+                    </QCard>
+                </div>
+                <!-- <QBtn
                             flat
                             icon="delete"
                             color="primary"
@@ -169,103 +173,14 @@ watch(
                                 {{ t('worker.pda.removePDA') }}
                             </QTooltip>
                         </QBtn>-->
-                </QCard>
             </template>
-        </FormModel>
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
-                <QDialog ref="dialog">
-                    <FormModelPopup
-                        :title="t('Add new device')"
-                        url-create="operators"
-                        model="operator"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.numberOfWagons')"
-                                    :model-value="data.numberOfWagons"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.train')"
-                                    :options="trainsData"
-                                    hide-selected
-                                    option-label="name"
-                                    option-value="id"
-                                    v-model="data.trainFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.operator.itemPackingType')"
-                                    :options="ItemPackingTypesData"
-                                    hide-selected
-                                    option-label="code"
-                                    option-value="code"
-                                    v-model="data.itemPackingTypeFk"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.warehouse')"
-                                    :options="warehousesData"
-                                    hide-selected
-                                    option-label="name"
-                                    option-value="id"
-                                    v-model="data.warehouseFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.operator.sector')"
-                                    :options="shelvingsData"
-                                    hide-selected
-                                    option-label="description"
-                                    option-value="id"
-                                    v-model="data.sectorFk"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.labeler')"
-                                    :model-value="data?.labelerFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.linesLimit')"
-                                    :model-value="data?.linesLimit"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.volumeLimit')"
-                                    :model-value="data?.volumeLimit"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.sizeLimit')"
-                                    :model-value="data?.sizeLimit"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.isOnReservationMode')"
-                                    :model-value="data?.isOnReservationMode"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.machine')"
-                                    :options="machinesData"
-                                    hide-selected
-                                    option-label="plate"
-                                    option-value="id"
-                                    v-model="data.machineFk"
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
-            </QBtn>
-            <QTooltip>
-                {{ t('globals.new') }}
-            </QTooltip>
+        </CrudModel>
+        <QPageSticky
+            position="bottom-right"
+            :offset="[25, 25]"
+            v-if="!test.formData?.length"
+        >
+            <QBtn fab color="primary" icon="add" @click="test.insert()" />
         </QPageSticky>
     </QPage>
 </template>

From a30915f99ecb4a9d631ff381c483c3b87ea52ca6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:42:26 +0200
Subject: [PATCH 22/32] fix: refs #7986 fix operator, fix crudmodel update

---
 src/pages/Worker/Card/WorkerOperator.vue | 57 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index a667d083e..0bd6d46e2 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -10,10 +10,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CrudModel from 'components/CrudModel.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 
-const test = ref({});
+const crudModelRef = ref();
 const dialog = ref();
 const warehousesData = ref([]);
 const itemPackingTypesData = ref([]);
@@ -39,10 +40,11 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-// watch(
-//     () => route.params.id,
-//     () => CrudModelRef.value.reset()
-// );
+
+async function insert() {
+    await axios.post('Operators', initialData.value);
+    crudModelRef.value.reload();
+}
 </script>
 
 <template>
@@ -58,16 +60,17 @@ const initialData = computed(() => {
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
+        <FetchData url="Printers" @on-fetch="(data) => (PrintersData = data)" auto-load />
         <FetchData url="Sectors" @on-fetch="(data) => (sectorsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
         <CrudModel
             data-key="workerOperator"
             url="Operators"
-            model="workerOperator"
+            primary-key="workerFk"
             :filter="{ where: { workerFk: route.params.id } }"
-            ref="test"
             :data-required="{ workerFk: route.params.id }"
-            :default-save="false"
+            ref="crudModelRef"
+            search-url="operator"
             auto-load
         >
             <template #body="{ rows }">
@@ -75,7 +78,7 @@ const initialData = computed(() => {
                     <QCard
                         flat
                         bordered
-                        :key="row"
+                        :key="row.$index"
                         v-for="row of rows"
                         class="card q-px-md q-mb-sm container"
                     >
@@ -115,11 +118,27 @@ const initialData = computed(() => {
                                 option-label="description"
                                 v-model="row.sectorFk"
                             />
-                            <VnInput
+                            <VnSelect
                                 :label="t('worker.operator.labeler')"
+                                :options="PrintersData"
+                                hide-selected
+                                option-label="name"
                                 v-model="row.labelerFk"
-                                lazy-rules
-                            />
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel
+                                                >ID: {{ scope.opt?.id }}</QItemLabel
+                                            >
+                                            <QItemLabel caption>
+                                                {{ scope.opt?.id }},
+                                                {{ scope.opt?.name }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
                         </VnRow>
                         <VnRow>
                             <VnInput
@@ -175,12 +194,14 @@ const initialData = computed(() => {
                         </QBtn>-->
             </template>
         </CrudModel>
-        <QPageSticky
-            position="bottom-right"
-            :offset="[25, 25]"
-            v-if="!test.formData?.length"
-        >
-            <QBtn fab color="primary" icon="add" @click="test.insert()" />
+        <QPageSticky position="bottom-right" :offset="[25, 25]">
+            <QBtn
+                fab
+                color="primary"
+                icon="add"
+                @click="insert()"
+                v-if="!crudModelRef?.formData?.length"
+            />
         </QPageSticky>
     </QPage>
 </template>

From cad3fddc3ee0734ae75b31ddc2d617793f7e0427 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:52:52 +0200
Subject: [PATCH 23/32] fix: refs #7986 descriptor fix

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3742a773e..fa0a14f45 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -277,6 +277,7 @@ globals:
         medical: Mutual
         RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
+        operator: Operator
     supplier: Supplier
     created: Created
     worker: Worker
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f92ac93d8..5dfe90e98 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -281,6 +281,7 @@ globals:
         serial: Facturas por serie
         medical: Mutua
         wasteRecalc: Recalcular mermas
+        operator: Operario
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador

From e06ce4f8a49a5aff575b076c20b076c64c915e3b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:56:32 +0200
Subject: [PATCH 24/32] fix: refs #7986 clean code

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

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 0bd6d46e2..2eb14de3b 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -1,21 +1,17 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 import FetchData from 'components/FetchData.vue';
-// import CrudModelPopup from 'src/components/CrudModelPopup.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CrudModel from 'components/CrudModel.vue';
 import axios from 'axios';
 
 const { t } = useI18n();
 
 const crudModelRef = ref();
-const dialog = ref();
 const warehousesData = ref([]);
 const itemPackingTypesData = ref([]);
 const sectorsData = ref([]);

From 8262406eda16c372b4f57a2ed547b7e2fa220103 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 16 Oct 2024 09:21:57 +0200
Subject: [PATCH 25/32] perf: refs #6943 Remove handle term

---
 test/cypress/integration/client/clientAddress.spec.js           | 2 +-
 test/cypress/integration/client/clientBalance.spec.js           | 2 +-
 test/cypress/integration/client/clientBasicData.spec.js         | 2 +-
 test/cypress/integration/client/clientBillingData.spec.js       | 2 +-
 test/cypress/integration/client/clientCredits.spec.js           | 2 +-
 test/cypress/integration/client/clientFiscalData.spec.js        | 2 +-
 test/cypress/integration/client/clientGreuges.spec.js           | 2 +-
 test/cypress/integration/client/clientList.spec.js              | 2 +-
 test/cypress/integration/client/clientNotes.spec.js             | 2 +-
 test/cypress/integration/client/clientRecoveries.spec.js        | 2 +-
 test/cypress/integration/client/clientWebAccess.spec.js         | 2 +-
 .../client/credit-management/clientCreditContracts.spec.js      | 2 +-
 .../client/credit-management/clientCreditOpinion.spec.js        | 2 +-
 .../cypress/integration/client/others/clientConsumption.spec.js | 2 +-
 test/cypress/integration/client/others/clientContacts.spec.js   | 2 +-
 test/cypress/integration/client/others/clientMandates.spec.js   | 2 +-
 test/cypress/integration/client/others/clientSamples.spec.js    | 2 +-
 test/cypress/integration/client/others/clientUnpaid.spec.js     | 2 +-
 .../cypress/integration/client/others/clientWebPayments.spec.js | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/client/clientAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
index 06c3fce8f..db876b64b 100644
--- a/test/cypress/integration/client/clientAddress.spec.js
+++ b/test/cypress/integration/client/clientAddress.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client consignee', () => {
+describe('Client consignee', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientBalance.spec.js b/test/cypress/integration/client/clientBalance.spec.js
index c418edb6a..4a666bdb1 100644
--- a/test/cypress/integration/client/clientBalance.spec.js
+++ b/test/cypress/integration/client/clientBalance.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client balance', () => {
+describe('Client balance', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientBasicData.spec.js b/test/cypress/integration/client/clientBasicData.spec.js
index 10ab429e7..7b0a19828 100644
--- a/test/cypress/integration/client/clientBasicData.spec.js
+++ b/test/cypress/integration/client/clientBasicData.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client basic data', () => {
+describe('Client basic data', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientBillingData.spec.js b/test/cypress/integration/client/clientBillingData.spec.js
index cba5770f9..00af82e39 100644
--- a/test/cypress/integration/client/clientBillingData.spec.js
+++ b/test/cypress/integration/client/clientBillingData.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client billing data', () => {
+describe('Client billing data', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientCredits.spec.js b/test/cypress/integration/client/clientCredits.spec.js
index 11cee6fc7..f81bf987d 100644
--- a/test/cypress/integration/client/clientCredits.spec.js
+++ b/test/cypress/integration/client/clientCredits.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client credits', () => {
+describe('Client credits', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
index 7e4f2a41f..e337c26f8 100644
--- a/test/cypress/integration/client/clientFiscalData.spec.js
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client fiscal data', () => {
+describe('Client fiscal data', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientGreuges.spec.js b/test/cypress/integration/client/clientGreuges.spec.js
index 509a981d4..23f8b3182 100644
--- a/test/cypress/integration/client/clientGreuges.spec.js
+++ b/test/cypress/integration/client/clientGreuges.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client greuges', () => {
+describe('Client greuges', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 6cdadd101..93e53b9f6 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client list', () => {
+describe('Client list', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientNotes.spec.js b/test/cypress/integration/client/clientNotes.spec.js
index 050120e0d..99a7c66c5 100644
--- a/test/cypress/integration/client/clientNotes.spec.js
+++ b/test/cypress/integration/client/clientNotes.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client notes', () => {
+describe('Client notes', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientRecoveries.spec.js b/test/cypress/integration/client/clientRecoveries.spec.js
index 830942034..a4e220008 100644
--- a/test/cypress/integration/client/clientRecoveries.spec.js
+++ b/test/cypress/integration/client/clientRecoveries.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client recoveries', () => {
+describe('Client recoveries', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/clientWebAccess.spec.js b/test/cypress/integration/client/clientWebAccess.spec.js
index b64fcd27b..47f9efa4c 100644
--- a/test/cypress/integration/client/clientWebAccess.spec.js
+++ b/test/cypress/integration/client/clientWebAccess.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client web-access', () => {
+describe('Client web-access', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
index 160b77335..3c35d5ed0 100644
--- a/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
+++ b/test/cypress/integration/client/credit-management/clientCreditContracts.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client credit opinion', () => {
+describe('Client credit opinion', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
index 1e29bae5c..7d9c0fa77 100644
--- a/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
+++ b/test/cypress/integration/client/credit-management/clientCreditOpinion.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client credit opinion', () => {
+describe('Client credit opinion', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientConsumption.spec.js b/test/cypress/integration/client/others/clientConsumption.spec.js
index 44472afb5..179a37707 100644
--- a/test/cypress/integration/client/others/clientConsumption.spec.js
+++ b/test/cypress/integration/client/others/clientConsumption.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client consumption', () => {
+describe('Client consumption', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientContacts.spec.js b/test/cypress/integration/client/others/clientContacts.spec.js
index 9f31fe878..66a86801a 100644
--- a/test/cypress/integration/client/others/clientContacts.spec.js
+++ b/test/cypress/integration/client/others/clientContacts.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client contacts', () => {
+describe('Client contacts', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientMandates.spec.js b/test/cypress/integration/client/others/clientMandates.spec.js
index 968c91d6c..aaeb7f930 100644
--- a/test/cypress/integration/client/others/clientMandates.spec.js
+++ b/test/cypress/integration/client/others/clientMandates.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client mandates', () => {
+describe('Client mandates', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientSamples.spec.js b/test/cypress/integration/client/others/clientSamples.spec.js
index ed6066127..03b7238f4 100644
--- a/test/cypress/integration/client/others/clientSamples.spec.js
+++ b/test/cypress/integration/client/others/clientSamples.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client samples', () => {
+describe('Client samples', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientUnpaid.spec.js b/test/cypress/integration/client/others/clientUnpaid.spec.js
index db45d2cd2..9972ba0e9 100644
--- a/test/cypress/integration/client/others/clientUnpaid.spec.js
+++ b/test/cypress/integration/client/others/clientUnpaid.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client unpaid', () => {
+describe('Client unpaid', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/client/others/clientWebPayments.spec.js b/test/cypress/integration/client/others/clientWebPayments.spec.js
index 5ef4002f4..5f7087d21 100644
--- a/test/cypress/integration/client/others/clientWebPayments.spec.js
+++ b/test/cypress/integration/client/others/clientWebPayments.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Handle Client web payments', () => {
+describe('Client web payments', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');

From c42c811444a767f0c5ac884383429b5b41e8a341 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 17 Oct 2024 17:39:49 +0200
Subject: [PATCH 26/32] fix: refs #7353 load on scroll end

---
 src/components/VnTable/VnTable.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5a30f4d53..05bc6edeb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -134,6 +134,7 @@ const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
 const tableFilterRef = ref([]);
+const tableRef = ref();
 
 const tableModes = [
     {
@@ -321,6 +322,12 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
+
+function handleScroll() {
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const isAtBottom = tMiddle.scrollHeight - tMiddle.scrollTop === tMiddle.clientHeight;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
+}
 </script>
 <template>
     <QDrawer
@@ -405,6 +412,7 @@ function handleOnDataSaved(_) {
         </template>
         <template #body="{ rows }">
             <QTable
+                ref="tableRef"
                 v-bind="table"
                 class="vnTable"
                 :columns="splittedColumns.columns"
@@ -416,12 +424,7 @@ function handleOnDataSaved(_) {
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="
-                    (event) =>
-                        event.index > rows.length - 2 &&
-                        ($props.crudModel?.paginate ?? true) &&
-                        CrudModelRef.vnPaginateRef.paginate()
-                "
+                @virtual-scroll="handleScroll"
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                 @update:selected="emit('update:selected', $event)"
             >

From 1f4b681b5bb0d8c70015f6533049a688b9f9196d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 18 Oct 2024 08:44:27 +0200
Subject: [PATCH 27/32] fix: refs #7986 clean code

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

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 2eb14de3b..cdacc72c0 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -171,23 +171,6 @@ async function insert() {
                         </VnRow>
                     </QCard>
                 </div>
-                <!-- <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk)
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>-->
             </template>
         </CrudModel>
         <QPageSticky position="bottom-right" :offset="[25, 25]">

From 0c2d9e6ec60775f23fdea36b6131fb8753127eb5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 18 Oct 2024 10:08:46 +0200
Subject: [PATCH 28/32] fix: refs #7353 load on scroll end 80% zoom

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 05bc6edeb..5239fe859 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -325,7 +325,8 @@ function handleOnDataSaved(_) {
 
 function handleScroll() {
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
-    const isAtBottom = tMiddle.scrollHeight - tMiddle.scrollTop === tMiddle.clientHeight;
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
 </script>

From 175ebbc3433db21ac2fda6ebbb0e6e15b2cd011d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 18 Oct 2024 11:03:43 +0200
Subject: [PATCH 29/32] feat(navBar): refs #7632 isLoading

---
 src/boot/axios.js                             | 11 +++-
 src/components/NavBar.vue                     | 13 +++++
 src/stores/useStateQueryStore.js              | 31 ++++++++++
 test/vitest/__tests__/boot/axios.spec.js      | 52 ++++++++---------
 .../stores/useStateQueryStore.spec.js         | 56 +++++++++++++++++++
 5 files changed, 135 insertions(+), 28 deletions(-)
 create mode 100644 src/stores/useStateQueryStore.js
 create mode 100644 test/vitest/__tests__/stores/useStateQueryStore.spec.js

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 99a163cca..25095f9cc 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -2,9 +2,11 @@ import axios from 'axios';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 const session = useSession();
 const { notify } = useNotify();
+const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
 
 axios.defaults.baseURL = baseUrl;
@@ -15,7 +17,7 @@ const onRequest = (config) => {
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
     }
-
+    stateQuery.add(config);
     return config;
 };
 
@@ -24,9 +26,10 @@ const onRequestError = (error) => {
 };
 
 const onResponse = (response) => {
-    const { method } = response.config;
+    const config = response.config;
+    stateQuery.remove(config);
 
-    const isSaveRequest = method === 'patch';
+    const isSaveRequest = config.method === 'patch';
     if (isSaveRequest) {
         notify('globals.dataSaved', 'positive');
     }
@@ -35,6 +38,8 @@ const onResponse = (response) => {
 };
 
 const onResponseError = (error) => {
+    stateQuery.remove(error.config);
+
     let message = '';
 
     const response = error.response;
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 00faaebc2..71d3b8a0f 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -3,6 +3,7 @@ import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
@@ -12,6 +13,7 @@ import VnAvatar from './ui/VnAvatar.vue';
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
+const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
@@ -50,6 +52,14 @@ const pinnedModulesRef = ref();
                 </QBtn>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
+            <QSpinner
+                color="primary"
+                class="q-ml-md"
+                :class="{
+                    'no-visible': !stateQuery.isLoading().value,
+                }"
+                size="xs"
+            />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
             <QSpace />
@@ -104,6 +114,9 @@ const pinnedModulesRef = ref();
 .q-header {
     background-color: var(--vn-section-color);
 }
+.no-visible {
+    visibility: hidden;
+}
 </style>
 <i18n>
 en:
diff --git a/src/stores/useStateQueryStore.js b/src/stores/useStateQueryStore.js
new file mode 100644
index 000000000..d25dbb921
--- /dev/null
+++ b/src/stores/useStateQueryStore.js
@@ -0,0 +1,31 @@
+import { ref, computed } from 'vue';
+import { defineStore } from 'pinia';
+
+export const useStateQueryStore = defineStore('stateQueryStore', () => {
+    const queries = ref(new Set());
+
+    function add(query) {
+        queries.value.add(query);
+        return query;
+    }
+
+    function isLoading() {
+        return computed(() => queries.value.size);
+    }
+
+    function remove(query) {
+        queries.value.delete(query);
+    }
+
+    function reset() {
+        queries.value = new Set();
+    }
+
+    return {
+        add,
+        isLoading,
+        remove,
+        queries,
+        reset,
+    };
+});
diff --git a/test/vitest/__tests__/boot/axios.spec.js b/test/vitest/__tests__/boot/axios.spec.js
index feb0d93ea..7a802b4d2 100644
--- a/test/vitest/__tests__/boot/axios.spec.js
+++ b/test/vitest/__tests__/boot/axios.spec.js
@@ -7,41 +7,46 @@ vi.mock('src/composables/useSession', () => ({
         getToken: () => 'DEFAULT_TOKEN',
         isLoggedIn: () => vi.fn(),
         destroy: () => vi.fn(),
-    })
+    }),
+}));
+
+vi.mock('src/stores/useStateQueryStore', () => ({
+    useStateQueryStore: () => ({
+        add: () => vi.fn(),
+        remove: () => vi.fn(),
+    }),
 }));
 
 describe('Axios boot', () => {
-
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };
 
             const resultConfig = onRequest(config);
 
-            expect(resultConfig).toEqual(expect.objectContaining({
-                headers: {
-                    Authorization: 'DEFAULT_TOKEN'
-                }
-            }));
+            expect(resultConfig).toEqual(
+                expect.objectContaining({
+                    headers: {
+                        Authorization: 'DEFAULT_TOKEN',
+                    },
+                })
+            );
         });
-    })
+    });
 
     describe('onResponseError()', async () => {
         it('should call to the Notify plugin with a message error for an status code "500"', async () => {
-            Notify.create = vi.fn()
+            Notify.create = vi.fn();
 
             const error = {
                 response: {
-                    status: 500
-                }
+                    status: 500,
+                },
             };
 
             const result = onResponseError(error);
 
-
-            expect(result).rejects.toEqual(
-                expect.objectContaining(error)
-            );
+            expect(result).rejects.toEqual(expect.objectContaining(error));
             expect(Notify.create).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'An internal server error has ocurred',
@@ -51,25 +56,22 @@ describe('Axios boot', () => {
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
-            Notify.create = vi.fn()
+            Notify.create = vi.fn();
 
             const error = {
                 response: {
                     status: 401,
                     data: {
                         error: {
-                            message: 'Invalid user or password'
-                        }
-                    }
-                }
+                            message: 'Invalid user or password',
+                        },
+                    },
+                },
             };
 
             const result = onResponseError(error);
 
-
-            expect(result).rejects.toEqual(
-                expect.objectContaining(error)
-            );
+            expect(result).rejects.toEqual(expect.objectContaining(error));
             expect(Notify.create).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Invalid user or password',
@@ -77,5 +79,5 @@ describe('Axios boot', () => {
                 })
             );
         });
-    })
+    });
 });
diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
new file mode 100644
index 000000000..1ee70cbe0
--- /dev/null
+++ b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
@@ -0,0 +1,56 @@
+import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+
+describe('useStateQueryStore', () => {
+    beforeAll(() => {
+        createWrapper({}, {});
+    });
+
+    const stateQueryStore = useStateQueryStore();
+    const { add, isLoading, remove, reset } = useStateQueryStore();
+    const firstQuery = { url: 'myQuery' };
+    const secondQuery = { url: 'myQuery' };
+
+    function getQueries() {
+        return stateQueryStore.queries;
+    }
+
+    beforeEach(() => {
+        reset();
+        expect(getQueries().size).toBeFalsy();
+    });
+
+    it('should add two queries', async () => {
+        expect(getQueries().size).toBeFalsy();
+        add(firstQuery);
+
+        expect(getQueries().size).toBeTruthy();
+        expect(getQueries().has(firstQuery)).toBeTruthy();
+
+        add();
+        expect(getQueries().size).toBe(2);
+    });
+
+    it('should add and remove loading state', async () => {
+        expect(isLoading().value).toBeFalsy();
+        add(firstQuery);
+        expect(isLoading().value).toBeTruthy();
+        remove(firstQuery);
+        expect(isLoading().value).toBeFalsy();
+    });
+
+    it('should add and remove hash', async () => {
+        add(firstQuery);
+        add(secondQuery);
+
+        const beforeCount = getQueries().size;
+        const hash = add();
+        expect(getQueries().has(hash)).toBeTruthy();
+
+        remove(hash);
+        expect(getQueries().has(hash)).toBeFalsy();
+        expect(getQueries().size).toBe(beforeCount);
+    });
+});

From f4caf6aecc272327e971eee3d5b37333c1329965 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 18 Oct 2024 11:06:06 +0200
Subject: [PATCH 30/32] test: refs #7632 not use hash word

---
 .../__tests__/stores/useStateQueryStore.spec.js       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
index 1ee70cbe0..d33c6c821 100644
--- a/test/vitest/__tests__/stores/useStateQueryStore.spec.js
+++ b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
@@ -12,6 +12,7 @@ describe('useStateQueryStore', () => {
     const { add, isLoading, remove, reset } = useStateQueryStore();
     const firstQuery = { url: 'myQuery' };
     const secondQuery = { url: 'myQuery' };
+    const thirdQuery = { url: 'myQuery' };
 
     function getQueries() {
         return stateQueryStore.queries;
@@ -41,16 +42,16 @@ describe('useStateQueryStore', () => {
         expect(isLoading().value).toBeFalsy();
     });
 
-    it('should add and remove hash', async () => {
+    it('should add and remove query', async () => {
         add(firstQuery);
         add(secondQuery);
 
         const beforeCount = getQueries().size;
-        const hash = add();
-        expect(getQueries().has(hash)).toBeTruthy();
+        add(thirdQuery);
+        expect(getQueries().has(thirdQuery)).toBeTruthy();
 
-        remove(hash);
-        expect(getQueries().has(hash)).toBeFalsy();
+        remove(thirdQuery);
+        expect(getQueries().has(thirdQuery)).toBeFalsy();
         expect(getQueries().size).toBe(beforeCount);
     });
 });

From f2147311d3f774b2cdc332b3d22783287b3818d6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 21 Oct 2024 08:41:19 +0200
Subject: [PATCH 31/32] fix(TicketBasicData_zone): refs #6233 add acls and fix
 get zones

---
 src/components/common/VnSelect.vue            |  1 +
 .../Card/BasicData/TicketBasicDataForm.vue    | 52 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 952b7dd8c..b0aa648c1 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -141,6 +141,7 @@ function findKeyInOptions() {
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+    emit('update:options', data);
 }
 
 function filter(val, options) {
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index fdc75abda..f5ce8a0f3 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
@@ -28,14 +29,17 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const agencyFetchRef = ref(null);
-const zonesFetchRef = ref(null);
+const canEditZone = useAcl().hasAny([
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
+const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
+const zoneSelectRef = ref();
 const formData = ref($props.formData);
 
 watch(
@@ -44,6 +48,8 @@ watch(
     { deep: true }
 );
 
+onMounted(() => onFormModelInit());
+
 const agencyByWarehouseFilter = computed(() => ({
     fields: ['id', 'name'],
     order: 'name ASC',
@@ -52,18 +58,16 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-function zoneWhere() {
-    if (formData?.value?.agencyModeFk) {
-        return formData.value?.agencyModeFk
-            ? {
-                  shipped: formData.value?.shipped,
-                  addressFk: formData.value?.addressFk,
-                  agencyModeFk: formData.value?.agencyModeFk,
-                  warehouseFk: formData.value?.warehouseFk,
-              }
-            : {};
-    }
-}
+const zoneWhere = computed(() => {
+    return formData.value?.agencyModeFk
+        ? {
+              shipped: formData.value?.shipped,
+              addressFk: formData.value?.addressFk,
+              agencyModeFk: formData.value?.agencyModeFk,
+              warehouseFk: formData.value?.warehouseFk,
+          }
+        : {};
+});
 
 const getLanded = async (params) => {
     try {
@@ -270,7 +274,17 @@ const redirectToCustomerAddress = () => {
     });
 };
 
-onMounted(() => onFormModelInit());
+async function getZone(options) {
+    if (!zoneId.value) return;
+
+    const zone = options.find((z) => z.id == zoneId.value);
+    if (zone) return;
+
+    const { data } = await axios.get('Zones/' + zoneId.value, {
+        params: { filter: JSON.stringify({ fields: ['id', 'name'] }) },
+    });
+    zoneSelectRef.value.opts.push(data);
+}
 </script>
 <template>
     <FetchData
@@ -416,6 +430,7 @@ onMounted(() => onFormModelInit());
                 :rules="validate('basicData.agency')"
             />
             <VnSelect
+                ref="zoneSelectRef"
                 :label="t('basicData.zone')"
                 v-model="zoneId"
                 option-value="id"
@@ -424,11 +439,10 @@ onMounted(() => onFormModelInit());
                 :fields="['id', 'name']"
                 sort-by="id"
                 :where="zoneWhere"
-                hide-selected
-                map-options
-                :required="true"
-                @focus="zonesFetchRef.fetch()"
                 :rules="validate('basicData.zone')"
+                :required="true"
+                :disable="!canEditZone"
+                @update:options="getZone"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

From d221b8e3c4e85e78b3440fe7c515c04ace94bfac Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 21 Oct 2024 12:04:20 +0200
Subject: [PATCH 32/32] chore: refs #7632 change requests

---
 src/boot/axios.js                                       | 3 +--
 src/components/NavBar.vue                               | 3 ---
 src/css/app.scss                                        | 4 ++++
 test/vitest/__tests__/stores/useStateQueryStore.spec.js | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 25095f9cc..3bd80f487 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -29,8 +29,7 @@ const onResponse = (response) => {
     const config = response.config;
     stateQuery.remove(config);
 
-    const isSaveRequest = config.method === 'patch';
-    if (isSaveRequest) {
+    if (config.method === 'patch') {
         notify('globals.dataSaved', 'positive');
     }
 
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 71d3b8a0f..9b0393489 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -114,9 +114,6 @@ const pinnedModulesRef = ref();
 .q-header {
     background-color: var(--vn-section-color);
 }
-.no-visible {
-    visibility: hidden;
-}
 </style>
 <i18n>
 en:
diff --git a/src/css/app.scss b/src/css/app.scss
index 905934d4c..d4c76ad6b 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,3 +288,7 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
+
+.no-visible {
+    visibility: hidden;
+}
diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
index d33c6c821..ab3afb007 100644
--- a/test/vitest/__tests__/stores/useStateQueryStore.spec.js
+++ b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
@@ -11,8 +11,6 @@ describe('useStateQueryStore', () => {
     const stateQueryStore = useStateQueryStore();
     const { add, isLoading, remove, reset } = useStateQueryStore();
     const firstQuery = { url: 'myQuery' };
-    const secondQuery = { url: 'myQuery' };
-    const thirdQuery = { url: 'myQuery' };
 
     function getQueries() {
         return stateQueryStore.queries;
@@ -43,6 +41,9 @@ describe('useStateQueryStore', () => {
     });
 
     it('should add and remove query', async () => {
+        const secondQuery = { ...firstQuery };
+        const thirdQuery = { ...firstQuery };
+
         add(firstQuery);
         add(secondQuery);