From 36102aff0021dbf35f3936d03e1918a2e4a70bec Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 25 Apr 2025 13:52:05 +0200
Subject: [PATCH 01/12] style: adjust column alignment and add class for
 improved layout

---
 src/pages/Ticket/TicketAdvance.vue | 23 +++++++++++++++--------
 src/pages/Ticket/TicketFuture.vue  | 21 ++++++++++++++++++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf3593acd..c0b6c2bb4 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -101,7 +101,7 @@ const ticketColumns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.import'),
         name: 'totalWithVat',
         hidden: true,
@@ -169,15 +169,17 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.notMovableLines'),
         headerClass: 'horizontal-separator',
         name: 'notMovableLines',
+        class: 'shrink',
     },
     {
         align: 'left',
         label: t('advanceTickets.futureLines'),
         headerClass: 'horizontal-separator',
         name: 'futureLines',
+        class: 'shrink',
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.futureImport'),
         name: 'futureTotalWithVat',
         hidden: true,
@@ -332,7 +334,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -341,8 +348,10 @@ watch(
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
 
-        destinationElRef.value.setAttribute('colspan', '7');
-        originElRef.value.setAttribute('colspan', '9');
+        originElRef.value.classList.add('advance-icon');
+
+        destinationElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '11');
 
         destinationElRef.value.textContent = `${t(
             'advanceTickets.destination',
@@ -453,10 +462,8 @@ watch(
                 selection: 'multiple',
             }"
             v-model:selected="selectedTickets"
-            :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="t('globals.noResults')"
             :right-search="false"
-            :order="['futureTotalWithVat ASC']"            
+            :order="['futureTotalWithVat ASC']"
             auto-load
             :disable-option="{ card: true }"
         >
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 6ed3afcc6..0939708c1 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.liters'),
         name: 'liters',
         align: 'left',
+        class: 'shrink',
         headerClass: 'horizontal-separator',
     },
     {
@@ -177,7 +178,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -185,9 +191,10 @@ watch(
         newRow.classList.add('bg-header');
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+        originElRef.value.classList.add('advance-icon');
 
-        destinationElRef.value.setAttribute('colspan', '7');
-        originElRef.value.setAttribute('colspan', '9');
+        destinationElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '7');
 
         originElRef.value.textContent = `${t('advanceTickets.origin')}`;
         destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
@@ -371,4 +378,12 @@ watch(
 :deep(.horizontal-bottom-separator) {
     border-bottom: 4px solid white !important;
 }
+:deep(th.advance-icon::after) {
+    content: '>>';
+    font-size: larger;
+    position: absolute;
+    text-align: center;
+    float: 0;
+    left: 0;
+}
 </style>

From 797a48b04cb16131b32611550c4d1ee942ad9a95 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 25 Apr 2025 15:40:06 +0200
Subject: [PATCH 02/12] feat(TicketAdvance): add futurePreparation column to
 ticket table

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index c0b6c2bb4..aa78fe7f0 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -145,6 +145,15 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         name: 'futureLiters',
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'futurePreparation',
+        field: 'futurePreparation',
+        align: 'left',
+        sortable: true,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
+    },
     {
         align: 'left',
         label: t('advanceTickets.futureZone'),

From 461bcb9462b2d42a940c482c61ed87025abc2e0a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 28 Apr 2025 13:55:35 +0200
Subject: [PATCH 03/12] fix: remove unused searchFn after each filter change

---
 .../Ticket/Negative/TicketLackFilter.vue      |  5 ----
 src/pages/Ticket/TicketAdvanceFilter.vue      | 20 ++++---------
 src/pages/Ticket/TicketFilter.vue             | 17 +----------
 src/pages/Ticket/TicketFutureFilter.vue       | 29 ++++---------------
 4 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue
index 78c030476..780c7e4b9 100644
--- a/src/pages/Ticket/Negative/TicketLackFilter.vue
+++ b/src/pages/Ticket/Negative/TicketLackFilter.vue
@@ -130,8 +130,6 @@ const setUserParams = (params) => {
                                 ($event) => onCategoryChange($event, searchFn)
                             "
                             :options="categoriesOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             dense
                             filled
@@ -145,10 +143,7 @@ const setUserParams = (params) => {
                         <VnSelect
                             :label="t('negative.type')"
                             v-model="params.typeFk"
-                            @update:model-value="searchFn()"
                             :options="itemTypesOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             dense
                             filled
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index f065eaf2e..797a57863 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -65,7 +65,7 @@ onMounted(async () => await getItemPackingTypes());
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
@@ -93,12 +93,10 @@ onMounted(async () => await getItemPackingTypes());
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
                         :use-like="false"
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -110,12 +108,10 @@ onMounted(async () => await getItemPackingTypes());
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
                         :use-like="false"
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -133,7 +129,7 @@ onMounted(async () => await getItemPackingTypes());
                         :label="t('params.isFullMovable')"
                         v-model="params.isFullMovable"
                         toggle-indeterminate
-                        @update:model-value="searchFn()"
+                        dense
                     />
                 </QItemSection>
             </QItem>
@@ -155,13 +151,9 @@ onMounted(async () => await getItemPackingTypes());
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -170,7 +162,7 @@ onMounted(async () => await getItemPackingTypes());
                         toggle-indeterminate
                         label="only with destination"
                         v-model="params.onlyWithDestination"
-                        @update:model-value="searchFn()"
+                        dense
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 9e9b17ca6..9b76b1a96 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -49,7 +49,7 @@ const groupedStates = ref([]);
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
@@ -97,10 +97,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
-                        @update:model-value="searchFn()"
                         :options="states"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
@@ -117,7 +114,6 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('params.groupedStates')"
                         v-model="params.groupedStates"
-                        @update:model-value="searchFn()"
                         :options="groupedStates"
                         option-label="code"
                         emit-value
@@ -152,7 +148,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.myTeam"
-                        @update:model-value="searchFn()"
                         :label="t('My team')"
                         toggle-indeterminate
                     />
@@ -160,7 +155,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.pending"
-                        @update:model-value="searchFn()"
                         :label="t('Pending')"
                         toggle-indeterminate
                     />
@@ -170,7 +164,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.hasInvoice"
-                        @update:model-value="searchFn()"
                         :label="t('Invoiced')"
                         toggle-indeterminate
                     />
@@ -178,7 +171,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.hasRoute"
-                        @update:model-value="searchFn()"
                         :label="t('Routed')"
                         toggle-indeterminate
                     />
@@ -192,10 +184,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
-                        @update:model-value="searchFn()"
                         :options="provinces"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
@@ -212,7 +201,6 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
                         :options="agencies"
                         emit-value
                         map-options
@@ -230,10 +218,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
-                        @update:model-value="searchFn()"
                         :options="warehouses"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index 033b47f72..cb03ebd9a 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -67,7 +67,7 @@ onMounted(async () => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
@@ -113,11 +113,9 @@ onMounted(async () => {
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -129,11 +127,9 @@ onMounted(async () => {
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -142,13 +138,9 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -157,13 +149,9 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
 
@@ -173,7 +161,6 @@ onMounted(async () => {
                         :label="t('params.problems')"
                         v-model="params.problems"
                         :toggle-indeterminate="false"
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -183,13 +170,9 @@ onMounted(async () => {
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
         </template>

From 784fca7e0b6049264874eff699b064bcbe5fa176 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 28 Apr 2025 14:19:43 +0200
Subject: [PATCH 04/12] fix: i18n ticketBasicDataForm

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 4 ++--
 src/pages/Ticket/locale/en.yml                          | 1 +
 src/pages/Ticket/locale/es.yml                          | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index d83d0f2b7..18af48283 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -290,7 +290,7 @@ async function getZone(options) {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('ticketList.warehouse')"
+                :label="t('basicData.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -298,7 +298,7 @@ async function getZone(options) {
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('ticketList.warehouse')"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 175f0955b..2c9ea95f6 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -120,6 +120,7 @@ basicData:
     difference: Difference
     total: Total
     price: Price
+    warehouse: Warehouse
     newPrice: New price
     chargeDifference: Charge difference to
     withoutNegatives: Create without negatives
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 3d03a7b33..6bd307d07 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -47,6 +47,7 @@ basicData:
     difference: Diferencia
     total: Total
     price: Precio
+    warehouse: Almacén
     newPrice: Nuevo precio
     chargeDifference: Cargar diferencia a
     withoutNegatives: Crear sin negativos

From e134cbf36dc60180544fd908bd1c0a3d8c772d7f Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Tue, 29 Apr 2025 09:53:24 +0200
Subject: [PATCH 05/12] fix: modified download btn to show the file instead to
 downloading it directly

---
 src/pages/Customer/Card/CustomerFileManagement.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 419719251..4107ca37a 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -5,7 +5,6 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { QBadge, QBtn, QCheckbox } from 'quasar';
 
-import { downloadFile } from 'src/composables/downloadFile';
 import { toDateTimeFormat } from 'src/filters/date';
 
 import FetchData from 'components/FetchData.vue';
@@ -87,7 +86,7 @@ const tableColumnComponents = {
     file: {
         component: QBtn,
         props: () => ({ flat: true }),
-        event: ({ row }) => downloadFile(row.dmsFk),
+        event: ({ row }) => openReport(`dms/${row.dmsFk}/downloadFile`, {}, '_blank'),
     },
     employee: {
         component: QBtn,

From 19ae5a9b3d528f5c5a188c39fd83295056ef056d Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Tue, 29 Apr 2025 10:40:49 +0200
Subject: [PATCH 06/12] fix: customer file downlaod file same behavior as
 VnDmsList

---
 src/pages/Customer/Card/CustomerFileManagement.vue          | 3 ++-
 .../Customer/components/CustomerFileManagementActions.vue   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 4107ca37a..419719251 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { QBadge, QBtn, QCheckbox } from 'quasar';
 
+import { downloadFile } from 'src/composables/downloadFile';
 import { toDateTimeFormat } from 'src/filters/date';
 
 import FetchData from 'components/FetchData.vue';
@@ -86,7 +87,7 @@ const tableColumnComponents = {
     file: {
         component: QBtn,
         props: () => ({ flat: true }),
-        event: ({ row }) => openReport(`dms/${row.dmsFk}/downloadFile`, {}, '_blank'),
+        event: ({ row }) => downloadFile(row.dmsFk),
     },
     employee: {
         component: QBtn,
diff --git a/src/pages/Customer/components/CustomerFileManagementActions.vue b/src/pages/Customer/components/CustomerFileManagementActions.vue
index 683f062ff..1fcafdccd 100644
--- a/src/pages/Customer/components/CustomerFileManagementActions.vue
+++ b/src/pages/Customer/components/CustomerFileManagementActions.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useQuasar } from 'quasar';
 
+import { usePrintService } from 'composables/usePrintService';
 import { downloadFile } from 'src/composables/downloadFile';
 
 import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@@ -12,7 +12,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
-
+const { openReport } = usePrintService();
 const $props = defineProps({
     id: {
         type: Number,
@@ -24,7 +24,7 @@ const $props = defineProps({
     },
 });
 
-const setDownloadFile = () => downloadFile($props.id);
+const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
 
 const toCustomerFileManagementEdit = () => {
     router.push({

From 513333c0c2a4206353a435685a2576ccf2739bd6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 29 Apr 2025 14:03:33 +0200
Subject: [PATCH 07/12] test: warehouse selection and search process in ticket
 list tests

---
 test/cypress/integration/ticket/ticketList.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 5613a5854..79440588c 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -79,8 +79,8 @@ describe('TicketList', () => {
             });
         }).as('ticket');
 
-        cy.get('[data-cy="Warehouse_select"]').type('Warehouse Five');
-        cy.get('.q-menu .q-item').contains('Warehouse Five').click();
+        cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse Five');
+        cy.searchBtnFilterPanel();
         cy.wait('@ticket').then((interception) => {
             const data = interception.response.body[1];
             expect(data.hasComponentLack).to.equal(1);

From e1c682e138a1a9303eaa1d69fbc72e2e6c184116 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 29 Apr 2025 13:13:31 +0000
Subject: [PATCH 08/12] Merge pull request 'WARMFIX: VnSelect cannot scroll'
 (!1732) from warmifx_select_scroll into test

Reviewed-on: https://gitea.verdnatura.es/verdnatura/salix-front/pulls/1732
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
---
 src/components/common/VnSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 8d598e7ec..3423ec633 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -368,7 +368,7 @@ function getCaption(opt) {
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
         :loading="someIsLoading"
-        :disable="someIsLoading"
+        :readonly="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"

From 07db153302ad424981bc5b957109e04fd35123d8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 29 Apr 2025 15:16:56 +0200
Subject: [PATCH 09/12] fix: scroll issue

---
 src/components/common/VnSelect.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 3423ec633..b28a09019 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -161,7 +161,7 @@ const arrayData = useArrayData(arrayDataKey, {
     searchUrl: false,
     mapKey: $attrs['map-key'],
 });
-
+const isMenuOpened = ref(false);
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
@@ -184,7 +184,9 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const someIsLoading = computed(() => isLoading.value || arrayData.isLoading);
+const someIsLoading = computed(
+    () => (isLoading.value || !!arrayData?.isLoading?.value) && !isMenuOpened.value,
+);
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -368,8 +370,9 @@ function getCaption(opt) {
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
         :loading="someIsLoading"
-        :readonly="someIsLoading"
         @virtual-scroll="onScroll"
+        @popup-hide="isMenuOpened = false"
+        @popup-show="isMenuOpened = true"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
         :data-url="url"

From 4c899e6443e29cf4f58847c0babc29457f54bc2d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 29 Apr 2025 15:21:00 +0200
Subject: [PATCH 10/12] fix: dateRanges

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 259561f4c..8aa6d9174 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -40,13 +40,11 @@ const dateRanges = computed(() => {
     return { from, to };
 });
 
-const reportParams = computed(() => {
-    return {
-        recipientId: Number(route.params.id),
-        to: dateRange(dateRanges.value.to)[1],
-        from: dateRange(dateRanges.value.from)[1],
-    };
-});
+const reportParams = computed(() => ({
+    recipientId: Number(route.params.id),
+    from: dateRange(dateRanges.value.from)[0].toISOString(),
+    to: dateRange(dateRanges.value.to)[1].toISOString(),
+}));
 
 async function getSupplierConsumptionData() {
     await arrayData.fetch({ append: false });

From 2515c0d9269bc4c6918ff96ff9b69cc0fc5bf3d7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 30 Apr 2025 09:05:26 +0200
Subject: [PATCH 11/12] fix: correct Promise.allS to Promise.all in
 fetchWeekData function

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index b2ecf485f..f9b7276c9 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -284,7 +284,7 @@ const fetchWeekData = async () => {
         week: selectedWeekNumber.value,
     };
     try {
-        const [{ data: mailData }, { data: countData }] = await Promise.allS([
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
             axios.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             }),

From 3ab856098e9ee96348af01f469eff7e01023409d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 30 Apr 2025 09:17:09 +0200
Subject: [PATCH 12/12] fix: handle specific error status in fetchWeekData
 function

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index f9b7276c9..18ce64158 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -296,8 +296,9 @@ const fetchWeekData = async () => {
         state.value = mail?.state;
         reason.value = mail?.reason;
         canResend.value = !!countData.count;
-    } catch {
+    } catch (error) {
         state.value = null;
+        if (error?.status != 403) throw error;
     }
 };