From a1db140d67c2ae6e816843ab269a084765643159 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 18 Feb 2025 14:30:12 +0100
Subject: [PATCH 01/19] fix: update option-filter-value to use thermographFk in
 TravelThermographsForm

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

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7aec32972..446e5d506 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -209,7 +209,7 @@ const onThermographCreated = async (data) => {
                         }"
                         sort-by="thermographFk ASC"
                         option-label="thermographFk"
-                        option-filter-value="id"
+                        option-filter-value="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                         :roles-allowed-to-create="['logistic']"

From 98239e010564b6da8533e740c8a5ac55c96283e5 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 18 Feb 2025 22:04:47 +0100
Subject: [PATCH 02/19] feat: refs #6897 add time formatting and improve column
 alignment handling in VnTable

---
 src/components/VnTable/VnColumn.vue |  2 +-
 src/components/VnTable/VnTable.vue  | 34 +++++++++++++++++++++++++----
 src/composables/getColAlign.js      |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 44364cca1..d0e245388 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QIcon, QCheckbox, QToggle } from 'quasar';
+import { QIcon, QToggle } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 
 import VnSelect from 'components/common/VnSelect.vue';
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 02e870add..9da7eeca6 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -14,10 +14,11 @@ import {
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
+import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
+import { toTimeFormat } from 'src/filters/date';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
@@ -527,11 +528,32 @@ function formatColumnValue(col, row, dashIfEmpty) {
         } else {
             return col.format(row, dashIfEmpty);
         }
+    }
+
+    if (col?.component === 'date') return dashIfEmpty(toDate(row[col?.name]));
+
+    if (col?.component === 'time')
+        return row[col?.name] >= 5
+            ? dashIfEmpty(date.formatDate(new Date(row[col?.name]), 'HH:mm'))
+            : row[col?.name];
+
+    if (selectRegex.test(col?.component) && $props.isEditable) {
+        const findBy = find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+
+        if (col?.attrs.options)
+            return dashIfEmpty(
+                col?.attrs.options.find((option) => option.id === row[col.name])?.name,
+            );
+
+        if (typeof row[findBy] == 'object') {
+            return dashIfEmpty(row[findBy][col?.attrs.optionLabel ?? 'name']);
+        }
+        if (row[findBy]) return dashIfEmpty(row[findBy]);
+        if (!findBy || !row) return;
     } else {
         return dashIfEmpty(row[col?.name]);
     }
 }
-const checkbox = ref(null);
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
@@ -730,7 +752,11 @@ function cardClick(_, row) {
                                 <span
                                     v-else
                                     :class="hasEditableFormat(col)"
-                                    :style="col?.style ? col.style(row) : null"
+                                    :style="
+                                        typeof col?.style == 'function'
+                                            ? col.style(row)
+                                            : col?.style
+                                    "
                                     style="bottom: 0"
                                 >
                                     {{ formatColumnValue(col, row, dashIfEmpty) }}
diff --git a/src/composables/getColAlign.js b/src/composables/getColAlign.js
index c0338a984..6e963b437 100644
--- a/src/composables/getColAlign.js
+++ b/src/composables/getColAlign.js
@@ -7,6 +7,7 @@ export function getColAlign(col) {
         case 'number':
             align = 'right';
             break;
+        case 'time':
         case 'date':
         case 'checkbox':
             align = 'center';

From 74c40c780804ea4889d4c7af5ad8ea78251fe007 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 18 Feb 2025 23:24:04 +0100
Subject: [PATCH 03/19] fix: refs #6897 cards width

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9da7eeca6..b896fa769 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -809,7 +809,7 @@ function cardClick(_, row) {
                             <QCardSection
                                 vertical
                                 class="no-margin no-padding"
-                                :class="colsMap.tableActions ? '' : 'fit'"
+                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
                             >
                                 <!-- Chips -->
                                 <QCardSection

From ee23bf60dc461c8609c8642c2c221a86fe1cb917 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 10:22:27 +0100
Subject: [PATCH 04/19] fix: bug and simplify

---
 src/pages/Ticket/Card/TicketEditMana.vue |  9 ++-
 src/pages/Ticket/Card/TicketSale.vue     | 90 ++++++++++--------------
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index a55658a07..de9a982b9 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -21,6 +21,10 @@ const $props = defineProps({
         type: String,
         default: 'mana',
     },
+    sale: {
+        type: Object,
+        default: null,
+    },
 });
 
 const emit = defineEmits(['save', 'cancel']);
@@ -29,8 +33,8 @@ const { t } = useI18n();
 const QPopupProxyRef = ref(null);
 const manaCode = ref($props.manaCode);
 
-const save = () => {
-    emit('save');
+const save = (sale = $props.sale) => {
+    emit('save', sale);
     QPopupProxyRef.value.hide();
 };
 
@@ -38,6 +42,7 @@ const cancel = () => {
     emit('cancel');
     QPopupProxyRef.value.hide();
 };
+defineExpose({ save });
 </script>
 
 <template>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2cd20f1db..94d393900 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,7 +22,6 @@ 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';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
@@ -32,6 +31,7 @@ const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
+const editManaProxyRef = ref(null);
 const stateBtnDropdownRef = ref(null);
 const quasar = useQuasar();
 const arrayData = useArrayData('ticketData');
@@ -310,17 +310,20 @@ const updatePrice = async (sale) => {
 };
 
 const changeDiscount = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     const newDiscount = edit.value.discount;
-    if (newDiscount != null && newDiscount != sale.discount) updateDiscount([sale]);
+    if (newDiscount != null && newDiscount != sale.discount) {
+        if (isSalePrepared(sale))
+            await confirmUpdate(() => updateDiscount([sale], newDiscount));
+    }
+};
+
+const updateDiscounts = async (sales, newDiscount = null) => {
+    const someSaleIsPrepared = sales.some(isSalePrepared);
+    if (someSaleIsPrepared);
+    await confirmUpdate(() => updateDiscount(sales, newDiscount));
 };
 
 const updateDiscount = async (sales, newDiscount = null) => {
-    for (const sale of sales) {
-        const canProceed = await isSalePrepared(sale);
-        if (!canProceed) return;
-    }
     const saleIds = sales.map((sale) => sale.id);
     const _newDiscount = newDiscount || edit.value.discount;
     const params = {
@@ -469,7 +472,19 @@ const endNewRow = (row) => {
     }
 };
 
-async function isSalePrepared(item) {
+async function confirmUpdate(cb) {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Item prepared'),
+                message: t('This item is already prepared. Do you want to continue?'),
+            },
+        })
+        .onOk(cb);
+}
+
+async function isSalePrepared(sale) {
     const filter = {
         params: {
             where: { ticketFk: route.params.id },
@@ -482,40 +497,17 @@ async function isSalePrepared(item) {
         },
     });
 
-    const matchingSale = data.find((sale) => sale.itemFk === item.itemFk);
+    const matchingSale = data.find(({ itemFk }) => itemFk === sale.itemFk);
     if (!matchingSale) {
         return true;
     }
-
-    if (
+    return (
         matchingSale.hasSaleGroupDetail ||
         matchingSale.isControled ||
         matchingSale.isPrepared ||
         matchingSale.isPrevious ||
         matchingSale.isPreviousSelected
-    ) {
-        try {
-            await new Promise((resolve, reject) => {
-                quasar
-                    .dialog({
-                        component: VnConfirm,
-                        componentProps: {
-                            title: t('Item prepared'),
-                            message: t(
-                                'This item is already prepared. Do you want to continue?',
-                            ),
-                            data: item,
-                        },
-                    })
-                    .onOk(() => resolve(true))
-                    .onCancel(() => reject(new Error('cancelled')));
-            });
-        } catch (error) {
-            tableRef.value.reload();
-            return false;
-        }
-    }
-    return true;
+    );
 }
 
 watch(
@@ -583,7 +575,7 @@ watch(
                     :mana="mana"
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
-                    @update-discounts="updateDiscount"
+                    @update-discounts="updateDiscounts"
                     @refresh-table="resetChanges"
                 />
                 <QBtn
@@ -825,27 +817,23 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
+
                 <TicketEditManaProxy
+                    ref="editManaProxyRef"
                     :mana="mana"
+                    :sale="row"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
                     :mana-code="manaCode"
-                    @save="changeDiscount(row)"
+                    @save="changeDiscount"
                 >
-                    <template #default="{ popup }">
-                        <VnInput
-                            autofocus
-                            @keyup.enter="
-                                () => {
-                                    changeDiscount(row);
-                                    popup.hide();
-                                }
-                            "
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </template>
+                    <VnInput
+                        autofocus
+                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
+                        v-model.number="edit.discount"
+                        :label="t('ticketSale.discount')"
+                        type="number"
+                    />
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>

From 35253c8127fcef65564a4a6c48ad0db220a0c740 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 19 Feb 2025 12:39:30 +0100
Subject: [PATCH 05/19] test: refs #8618 added e2e test to routeExtendedList

---
 cypress.config.js                             |  11 +
 src/components/common/VnInputDate.vue         |   1 +
 src/pages/Route/RouteExtendedList.vue         |   5 +-
 .../route/routeExtendedList.spec.js           | 198 ++++++++++++++++++
 4 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/route/routeExtendedList.spec.js

diff --git a/cypress.config.js b/cypress.config.js
index a9e27fcfd..26b7725a5 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -34,6 +34,17 @@ export default defineConfig({
             const plugin = await import('cypress-mochawesome-reporter/plugin');
             plugin.default(on);
 
+            const fs = await import('fs');
+            on('task', {
+                deleteFile(filePath) {
+                    if (fs.existsSync(filePath)) {
+                        fs.unlinkSync(filePath);
+                        return true;
+                    }
+                    return false;
+                },
+            });
+
             return config;
         },
         viewportWidth: 1280,
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 73c825e1e..1f4705faa 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -107,6 +107,7 @@ const manageDate = (date) => {
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
             hide-bottom-space
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
         >
             <template #append>
                 <QIcon
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index 46bc1a690..a8d847711 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -280,7 +280,7 @@ const openTicketsDialog = (id) => {
             </QCardSection>
             <QCardSection class="q-pt-none">
                 <VnInputDate
-                    :label="t('route.Stating date')"
+                    :label="t('route.Starting date')"
                     v-model="startingDate"
                     autofocus
                 />
@@ -335,6 +335,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="vn:clone"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="confirmationDialog = true"
@@ -344,6 +345,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="cloud_download"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="showRouteReport"
@@ -353,6 +355,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="check"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="markAsServed()"
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
new file mode 100644
index 000000000..9e2c23bb4
--- /dev/null
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -0,0 +1,198 @@
+describe('Route extended list', () => {
+    const worker = 'tr:last-child > [data-col-field="workerFk"]';
+    const agency = 'tr:last-child > [data-col-field="agencyModeFk"]';
+    const vehicle = 'tr:last-child > [data-col-field="vehicleFk"]';
+    const date = 'tr:last-child > [data-col-field="dated"]';
+    const description = 'tr:last-child > [data-col-field="description"]';
+    const served = 'tr:last-child > [data-col-field="isOk"]';
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit('/#/route/extended-list');
+        cy.typeSearchbar('{enter}');
+    });
+
+    after(() => {
+        cy.visit('/#/route/extended-list');
+        cy.typeSearchbar('{enter}');
+        cy.get(
+            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
+        ).click();
+
+        cy.get('[title="Remove"]').click();
+        cy.dataCy('VnConfirm_confirm').click();
+    });
+
+    it('Should list routes', () => {
+        cy.get('.q-table')
+            .children()
+            .should('be.visible')
+            .should('have.length.greaterThan', 0);
+    });
+
+    it('Should create new route', () => {
+        cy.addBtnClick();
+
+        const data = {
+            Worker: { val: 'logistic', type: 'select' },
+            Agency: { val: 'Super-Man delivery', type: 'select' },
+            Vehicle: { val: '3333-IMK', type: 'select' },
+            Date: { val: '02-01-2024', type: 'date' },
+            From: { val: '01-01-2024', type: 'date' },
+            To: { val: '10-01-2024', type: 'date' },
+            'Km start': { val: 1000 },
+            'Km end': { val: 1200 },
+            Description: { val: 'Test route' },
+        };
+
+        cy.fillInForm(data);
+
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.url().should('include', '/summary');
+    });
+
+    it('Should reset changed values when click reset button', () => {
+        cy.get(worker).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('salesperson');
+        cy.get('.q-item').contains('salesperson').click();
+
+        cy.get(agency).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('inhouse pickup');
+        cy.get('.q-item').contains('inhouse pickup').click();
+
+        cy.get(vehicle).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('1111-IMK');
+        cy.get('.q-item').contains('1111-IMK').click();
+
+        cy.get(date).should('be.visible').click();
+        cy.dataCy('null_inputDate').clear().type('01-01-2001{enter}');
+
+        cy.get(description).should('be.visible').click();
+        cy.dataCy('null_input').clear().type('DescriptionUpdated{enter}');
+
+        cy.get(served).should('be.visible').click().click();
+
+        cy.get('[title="Reset"]').click();
+
+        cy.validateContent(worker, 'logistic');
+        cy.validateContent(agency, 'Super-Man delivery');
+        cy.validateContent(vehicle, '3333-IMK');
+        cy.validateContent(date, '01/02/2024');
+        cy.validateContent(description, 'Test route');
+        cy.validateContent(served, 'close');
+    });
+
+    it('Should clone selected route', () => {
+        cy.get(
+            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
+        ).click();
+        cy.get(
+            '#st-actions > .q-btn-group > :nth-child(1) > .q-btn__content > .q-icon',
+        ).click();
+        cy.dataCy('route.Starting date_inputDate').type('10-05-2001{enter}');
+        cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
+        cy.validateContent('tr:last-child > [data-col-field="dated"]', '05/10/2001');
+    });
+
+    it('Should download selected route', () => {
+        const downloadsFolder = Cypress.config('downloadsFolder');
+        cy.get(
+            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
+        ).click();
+        cy.get(
+            '#st-actions > .q-btn-group > :nth-child(2) > .q-btn__content > .q-icon',
+        ).click();
+        cy.wait(5000); //necesario para dar tiempo a que descargue el documento
+
+        const fileName = 'download.zip';
+        cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
+
+        cy.task('deleteFile', `${downloadsFolder}/${fileName}`).then((deleted) => {
+            expect(deleted).to.be.true;
+        });
+    });
+
+    it('Should mark as served the selected route', () => {
+        cy.get(
+            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
+        ).click();
+        cy.get(
+            '#st-actions > .q-btn-group > :nth-child(3) > .q-btn__content > .q-icon',
+        ).click();
+
+        cy.typeSearchbar('{enter}');
+        cy.validateContent('tr:last-child > [data-col-field="isOk"]', 'check');
+    });
+
+    it('Should delete the selected route', () => {
+        cy.get(
+            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
+        ).click();
+
+        cy.get('[title="Remove"]').click();
+        cy.dataCy('VnConfirm_confirm').click();
+
+        cy.checkNotification('Data saved');
+    });
+
+    it('Should save changes in route', () => {
+        cy.get(worker).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('salesperson');
+        cy.get('.q-item').contains('salesperson').click();
+
+        cy.get(agency).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('inhouse pickup');
+        cy.get('.q-item').contains('inhouse pickup').click();
+
+        cy.get(vehicle).should('be.visible').click();
+        cy.dataCy('null_select').clear().type('1111-IMK');
+        cy.get('.q-item').contains('1111-IMK').click();
+
+        cy.get(date).should('be.visible').click();
+        cy.dataCy('null_inputDate').clear().type('01-01-2001{enter}');
+
+        cy.get(description).should('be.visible').click();
+        cy.dataCy('null_input').clear().type('DescriptionUpdated{enter}');
+
+        cy.get(served).should('be.visible').click().click();
+
+        cy.dataCy('crudModelDefaultSaveBtn').should('not.be.disabled').click();
+        cy.checkNotification('Data saved');
+
+        cy.typeSearchbar('{enter}');
+
+        cy.validateContent(worker, 'salesperson');
+        cy.validateContent(agency, 'inhouse pickup');
+        cy.validateContent(vehicle, '1111-IMK');
+        cy.validateContent(date, '01/01/2001');
+        cy.validateContent(description, 'DescriptionUpdated');
+        cy.validateContent(served, 'check');
+    });
+
+    it('Should add ticket to route', () => {
+        cy.dataCy('tableAction-0').last().click();
+        cy.get(
+            '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg',
+        ).click();
+        cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+
+    it('Should open summary pop-up when click summuary icon', () => {
+        cy.dataCy('tableAction-1').last().click();
+        cy.get('.summaryHeader > :nth-child(2').should('contain', '- DescriptionUpdated');
+    });
+
+    it('Should redirect to the summary from the route summary pop-up', () => {
+        cy.dataCy('tableAction-1').last().click();
+        cy.get('.header > .q-icon').should('be.visible').click();
+        cy.url().should('include', '/summary');
+    });
+
+    it('Should redirect to the summary when click go to summary icon', () => {
+        cy.dataCy('tableAction-2').last().click();
+        cy.url().should('include', '/summary');
+    });
+});

From 154b3020057a94767f93eba3114fda5eb815af52 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Feb 2025 13:41:06 +0100
Subject: [PATCH 06/19] fix: refs #7323 e2e

---
 src/pages/Worker/Card/WorkerPit.vue           |  1 +
 .../integration/worker/workerCreate.spec.js   | 25 ++++++++++++++-----
 .../worker/workerNotificationsManager.spec.js | 13 +++-------
 .../integration/worker/workerPit.spec.js      |  8 +++---
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 40e814452..3de60d6a0 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -176,6 +176,7 @@ const deleteRelative = async (id) => {
                                 :label="t('isDescendant')"
                                 v-model="row.isDescendant"
                                 class="q-gutter-xs q-mb-xs"
+                                data-cy="Descendant/Ascendant"
                             />
                             <VnSelect
                                 :label="t('disabilityGrades')"
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 7f2810395..71fd6b347 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -2,9 +2,24 @@ describe('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
     const developerBossId = 120;
     const payMethodCross =
-        '.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
+        ':nth-child(9) > .q-select > .q-field__inner > .q-field__control > :nth-child(2)';
     const saveBtn = '.q-mt-lg > .q-btn--standard';
 
+    const internalWithOutPay = {
+        Fi: { val: '78457139E' },
+        'Web user': { val: 'manolo' },
+        Name: { val: 'Manolo' },
+        'Last name': { val: 'Hurtado' },
+        'Personal email': { val: 'manolo@mydomain.com' },
+        Company: { val: 'VNL', type: 'select' },
+        Street: { val: 'S/ DEFAULTWORKERSTREET' },
+        Location: { val: 1, type: 'select' },
+        Phone: { val: '123456789' },
+        'Worker code': { val: 'DWW' },
+        Boss: { val: developerBossId, type: 'select' },
+        Birth: { val: '11-12-2022', type: 'date' },
+    };
+
     const internal = {
         Fi: { val: '78457139E' },
         'Web user': { val: 'manolo' },
@@ -14,6 +29,7 @@ describe('WorkerCreate', () => {
         Company: { val: 'VNL', type: 'select' },
         Street: { val: 'S/ DEFAULTWORKERSTREET' },
         Location: { val: 1, type: 'select' },
+        'Pay method': { val: 1, type: 'select' },
         Phone: { val: '123456789' },
         'Worker code': { val: 'DWW' },
         Boss: { val: developerBossId, type: 'select' },
@@ -37,17 +53,14 @@ describe('WorkerCreate', () => {
     });
 
     it('should throw an error if a pay method has not been selected', () => {
-        cy.fillInForm(internal);
+        cy.fillInForm(internalWithOutPay);
         cy.get(payMethodCross).click();
         cy.get(saveBtn).click();
         cy.checkNotification('Payment method is required');
     });
 
     it('should create an internal', () => {
-        cy.fillInForm({
-            ...internal,
-            'Pay method': { val: 'PayMethod one', type: 'select' },
-        });
+        cy.fillInForm(internal);
         cy.get(saveBtn).click();
         cy.checkNotification('Data created');
     });
diff --git a/test/cypress/integration/worker/workerNotificationsManager.spec.js b/test/cypress/integration/worker/workerNotificationsManager.spec.js
index f121b3894..cffb6475a 100644
--- a/test/cypress/integration/worker/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/worker/workerNotificationsManager.spec.js
@@ -2,8 +2,8 @@ describe('WorkerNotificationsManager', () => {
     const salesPersonId = 18;
     const developerId = 9;
 
-    const activeList = ':nth-child(1) > .q-list';
-    const availableList = ':nth-child(2) > .q-list';
+    const activeList = '.q-infinite-scroll > :nth-child(1)';
+    const availableList = '.q-infinite-scroll > :nth-child(2)';
     const firstActiveNotification =
         ':nth-child(1) > .q-list > :nth-child(1) > .q-item > .q-toggle > .q-toggle__inner';
     const firstAvailableNotification =
@@ -18,7 +18,7 @@ describe('WorkerNotificationsManager', () => {
         cy.visit(`/#/worker/${salesPersonId}/notifications`);
         cy.get(firstAvailableNotification).click();
         cy.checkNotification(
-            'The notification subscription of this worker cant be modified'
+            'The notification subscription of this worker cant be modified',
         );
     });
 
@@ -29,7 +29,6 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(activeList)
-            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstAvailableNotification).click();
@@ -46,13 +45,10 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(availableList)
-            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstActiveNotification).click();
-                cy.get(availableList)
-                    .children()
-                    .should('have.length', beforeSize + 1);
+                cy.get(availableList).children().should('have.length', beforeSize);
             });
     });
 
@@ -62,7 +58,6 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(activeList)
-            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstAvailableNotification).click();
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index cc3a87637..19cbebc20 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -8,7 +8,8 @@ describe('WorkerPit', () => {
     const spousePensionInput = '[data-cy="Spouse Pension_input"]';
     const spousePension = '120';
     const addRelative = '[data-cy="addRelative"]';
-    const isDescendantSelect = '[data-cy="Descendant/Ascendant_select"]';
+    const isDescendantSelect = '[data-cy="Descendant/Ascendant"]';
+    const Descendant = 'Descendiente';
     const birthedInput = '[data-cy="Birth Year_input"]';
     const birthed = '2002';
     const adoptionYearInput = '[data-cy="Adoption Year_input"]';
@@ -28,11 +29,8 @@ describe('WorkerPit', () => {
         cy.get(spouseNifInput).type(spouseNif);
         cy.get(spousePensionInput).type(spousePension);
         cy.get(savePIT).click();
-    });
-
-    it('complete relative', () => {
         cy.get(addRelative).click();
-        cy.get(isDescendantSelect).type('{downArrow}{downArrow}{enter}');
+        cy.get(isDescendantSelect).type(Descendant);
         cy.get(birthedInput).type(birthed);
         cy.get(adoptionYearInput).type(adoptionYear);
         cy.get(saveRelative).click();

From 6a3d13144ca4f475d1a45f48a7b8ec394b4640b3 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 19 Feb 2025 14:38:13 +0100
Subject: [PATCH 07/19] refactor: refs #8618 simplify selectors and improve
 test readability in routeExtendedList.spec.js

---
 .../route/routeExtendedList.spec.js           | 197 +++++++++---------
 1 file changed, 102 insertions(+), 95 deletions(-)

diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 9e2c23bb4..8470fecff 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -1,27 +1,86 @@
 describe('Route extended list', () => {
-    const worker = 'tr:last-child > [data-col-field="workerFk"]';
-    const agency = 'tr:last-child > [data-col-field="agencyModeFk"]';
-    const vehicle = 'tr:last-child > [data-col-field="vehicleFk"]';
-    const date = 'tr:last-child > [data-col-field="dated"]';
-    const description = 'tr:last-child > [data-col-field="description"]';
-    const served = 'tr:last-child > [data-col-field="isOk"]';
+    const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`;
+
+    const selectors = {
+        worker: getSelector('workerFk'),
+        agency: getSelector('agencyModeFk'),
+        vehicle: getSelector('vehicleFk'),
+        date: getSelector('dated'),
+        description: getSelector('description'),
+        served: getSelector('isOk'),
+        lastRowSelectCheckBox: 'tbody > tr:last-child > :nth-child(1) .q-checkbox__inner',
+        removeBtn: '[title="Remove"]',
+        resetBtn: '[title="Reset"]',
+        confirmBtn: 'VnConfirm_confirm',
+        saveBtn: 'crudModelDefaultSaveBtn',
+        saveFormBtn: 'FormModelPopup_save',
+        cloneBtn: '#st-actions > .q-btn-group > :nth-child(1)',
+        downloadBtn: '#st-actions > .q-btn-group > :nth-child(2)',
+        markServedBtn: '#st-actions > .q-btn-group > :nth-child(3)',
+        searchbar: 'searchbar',
+    };
+
+    const checkboxState = {
+        check: 'check',
+        uncheck: 'close',
+    };
+    const url = '/#/route/extended-list';
+    const dataCreated = 'Data created';
+    const dataSaved = 'Data saved';
+
+    const originalFields = [
+        { selector: selectors.worker, type: 'select', value: 'logistic' },
+        { selector: selectors.agency, type: 'select', value: 'Super-Man delivery' },
+        { selector: selectors.vehicle, type: 'select', value: '3333-IMK' },
+        { selector: selectors.date, type: 'date', value: '01/02/2024' },
+        { selector: selectors.description, type: 'input', value: 'Test route' },
+        { selector: selectors.served, type: 'checkbox', value: checkboxState.uncheck },
+    ];
+
+    const updateFields = [
+        { selector: selectors.worker, type: 'select', value: 'salesperson' },
+        { selector: selectors.agency, type: 'select', value: 'inhouse pickup' },
+        { selector: selectors.vehicle, type: 'select', value: '1111-IMK' },
+        { selector: selectors.date, type: 'date', value: '01/01/2001' },
+        { selector: selectors.description, type: 'input', value: 'Description updated' },
+        { selector: selectors.served, type: 'checkbox', value: checkboxState.check },
+    ];
+
+    function fillField(selector, type, value) {
+        switch (type) {
+            case 'select':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_select').clear().type(value);
+                cy.get('.q-item').contains(value).click();
+                break;
+            case 'input':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_input').clear().type(`${value}{enter}`);
+                break;
+            case 'date':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_inputDate').clear().type(`${value}{enter}`);
+                break;
+            case 'checkbox':
+                cy.get(selector).should('be.visible').click().click();
+                break;
+        }
+    }
 
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/route/extended-list');
+        cy.visit(url);
         cy.typeSearchbar('{enter}');
     });
 
     after(() => {
-        cy.visit('/#/route/extended-list');
+        cy.visit(url);
         cy.typeSearchbar('{enter}');
-        cy.get(
-            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
-        ).click();
+        cy.get(selectors.lastRowSelectCheckBox).click();
 
-        cy.get('[title="Remove"]').click();
-        cy.dataCy('VnConfirm_confirm').click();
+        cy.get(selectors.removeBtn).click();
+        cy.dataCy(selectors.confirmBtn).click();
     });
 
     it('Should list routes', () => {
@@ -48,62 +107,35 @@ describe('Route extended list', () => {
 
         cy.fillInForm(data);
 
-        cy.dataCy('FormModelPopup_save').click();
-        cy.checkNotification('Data created');
+        cy.dataCy(selectors.saveFormBtn).click();
+        cy.checkNotification(dataCreated);
         cy.url().should('include', '/summary');
     });
 
     it('Should reset changed values when click reset button', () => {
-        cy.get(worker).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('salesperson');
-        cy.get('.q-item').contains('salesperson').click();
-
-        cy.get(agency).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('inhouse pickup');
-        cy.get('.q-item').contains('inhouse pickup').click();
-
-        cy.get(vehicle).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('1111-IMK');
-        cy.get('.q-item').contains('1111-IMK').click();
-
-        cy.get(date).should('be.visible').click();
-        cy.dataCy('null_inputDate').clear().type('01-01-2001{enter}');
-
-        cy.get(description).should('be.visible').click();
-        cy.dataCy('null_input').clear().type('DescriptionUpdated{enter}');
-
-        cy.get(served).should('be.visible').click().click();
+        updateFields.forEach(({ selector, type, value }) => {
+            fillField(selector, type, value);
+        });
 
         cy.get('[title="Reset"]').click();
 
-        cy.validateContent(worker, 'logistic');
-        cy.validateContent(agency, 'Super-Man delivery');
-        cy.validateContent(vehicle, '3333-IMK');
-        cy.validateContent(date, '01/02/2024');
-        cy.validateContent(description, 'Test route');
-        cy.validateContent(served, 'close');
+        originalFields.forEach(({ selector, value }) => {
+            cy.validateContent(selector, value);
+        });
     });
 
     it('Should clone selected route', () => {
-        cy.get(
-            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
-        ).click();
-        cy.get(
-            '#st-actions > .q-btn-group > :nth-child(1) > .q-btn__content > .q-icon',
-        ).click();
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.cloneBtn).click();
         cy.dataCy('route.Starting date_inputDate').type('10-05-2001{enter}');
         cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
-        cy.validateContent('tr:last-child > [data-col-field="dated"]', '05/10/2001');
+        cy.validateContent(selectors.date, '05/10/2001');
     });
 
     it('Should download selected route', () => {
         const downloadsFolder = Cypress.config('downloadsFolder');
-        cy.get(
-            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
-        ).click();
-        cy.get(
-            '#st-actions > .q-btn-group > :nth-child(2) > .q-btn__content > .q-icon',
-        ).click();
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.downloadBtn).click();
         cy.wait(5000); //necesario para dar tiempo a que descargue el documento
 
         const fileName = 'download.zip';
@@ -115,60 +147,35 @@ describe('Route extended list', () => {
     });
 
     it('Should mark as served the selected route', () => {
-        cy.get(
-            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
-        ).click();
-        cy.get(
-            '#st-actions > .q-btn-group > :nth-child(3) > .q-btn__content > .q-icon',
-        ).click();
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.markServedBtn).click();
 
         cy.typeSearchbar('{enter}');
-        cy.validateContent('tr:last-child > [data-col-field="isOk"]', 'check');
+        cy.validateContent(selectors.served, checkboxState.check);
     });
 
     it('Should delete the selected route', () => {
-        cy.get(
-            'tbody > tr:last-child > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
-        ).click();
+        cy.get(selectors.lastRowSelectCheckBox).click();
 
-        cy.get('[title="Remove"]').click();
-        cy.dataCy('VnConfirm_confirm').click();
+        cy.get(selectors.removeBtn).click();
+        cy.dataCy(selectors.confirmBtn).click();
 
-        cy.checkNotification('Data saved');
+        cy.checkNotification(dataSaved);
     });
 
     it('Should save changes in route', () => {
-        cy.get(worker).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('salesperson');
-        cy.get('.q-item').contains('salesperson').click();
+        updateFields.forEach(({ selector, type, value }) => {
+            fillField(selector, type, value);
+        });
 
-        cy.get(agency).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('inhouse pickup');
-        cy.get('.q-item').contains('inhouse pickup').click();
-
-        cy.get(vehicle).should('be.visible').click();
-        cy.dataCy('null_select').clear().type('1111-IMK');
-        cy.get('.q-item').contains('1111-IMK').click();
-
-        cy.get(date).should('be.visible').click();
-        cy.dataCy('null_inputDate').clear().type('01-01-2001{enter}');
-
-        cy.get(description).should('be.visible').click();
-        cy.dataCy('null_input').clear().type('DescriptionUpdated{enter}');
-
-        cy.get(served).should('be.visible').click().click();
-
-        cy.dataCy('crudModelDefaultSaveBtn').should('not.be.disabled').click();
-        cy.checkNotification('Data saved');
+        cy.dataCy(selectors.saveBtn).should('not.be.disabled').click();
+        cy.checkNotification(dataSaved);
 
         cy.typeSearchbar('{enter}');
 
-        cy.validateContent(worker, 'salesperson');
-        cy.validateContent(agency, 'inhouse pickup');
-        cy.validateContent(vehicle, '1111-IMK');
-        cy.validateContent(date, '01/01/2001');
-        cy.validateContent(description, 'DescriptionUpdated');
-        cy.validateContent(served, 'check');
+        updateFields.forEach(({ selector, value }) => {
+            cy.validateContent(selector, value);
+        });
     });
 
     it('Should add ticket to route', () => {
@@ -177,12 +184,12 @@ describe('Route extended list', () => {
             '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg',
         ).click();
         cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.checkNotification(dataSaved);
     });
 
     it('Should open summary pop-up when click summuary icon', () => {
         cy.dataCy('tableAction-1').last().click();
-        cy.get('.summaryHeader > :nth-child(2').should('contain', '- DescriptionUpdated');
+        cy.get('.summaryHeader > :nth-child(2').should('contain', updateFields[4].value);
     });
 
     it('Should redirect to the summary from the route summary pop-up', () => {

From a2fd01844dcb97b44bbbb337315f8377fb7c3940 Mon Sep 17 00:00:00 2001
From: PAU ROVIRA ROSALENY <provira@verdnatura.es>
Date: Wed, 19 Feb 2025 13:45:03 +0000
Subject: [PATCH 08/19] fix: fixed wagonTypeCreate test

---
 .../cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
index 2cd43984a..49d7d9f01 100644
--- a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
@@ -8,7 +8,7 @@ describe('WagonTypeCreate', () => {
 
     it('should create a new wagon type and then delete it', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
-        cy.get('input').first().type('Example for testing');
+        cy.dataCy('Name_input').type('Example for testing');
         cy.get('[data-cy="FormModelPopup_save"]').click();
         cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });

From 7ade3f4f84c4102b5941ed6cf218c57dbc1c1fe6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 19 Feb 2025 18:36:54 +0100
Subject: [PATCH 09/19] fix: refs #6943 reset formData to originalData on reset
 function

---
 src/components/FormModel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 5681ce11c..04ef13d45 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -247,6 +247,7 @@ async function saveAndGo() {
 }
 
 function reset() {
+    formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', { val: originalData.value });
     if ($props.observeFormChanges) {
         hasChanges.value = false;

From 380965fbea461e4f99799e147c14f6cacd2b3ae9 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 19 Feb 2025 22:03:48 +0100
Subject: [PATCH 10/19] feat: refs #6897 enhance VnTable input handling and
 improve WorkerMedical component filters

---
 src/components/VnTable/VnTable.vue        | 43 ++++++++++++-----------
 src/pages/Worker/Card/WorkerFormation.vue |  2 +-
 src/pages/Worker/Card/WorkerMedical.vue   | 14 +++++++-
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b896fa769..b053b94a4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -18,7 +18,6 @@ import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
 import { dashIfEmpty, toDate } from 'src/filters';
-import { toTimeFormat } from 'src/filters/date';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
@@ -346,7 +345,7 @@ const clickHandler = async (event) => {
     if (isDateElement || isTimeElement || isQselectDropDown) return;
 
     if (clickedElement === null) {
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
         return;
     }
     const rowIndex = clickedElement.getAttribute('data-row-index');
@@ -356,7 +355,7 @@ const clickHandler = async (event) => {
     if (editingRow.value !== null && editingField.value !== null) {
         if (editingRow.value == rowIndex && editingField.value == colField) return;
 
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
     }
 
     if (isEditableColumn(column)) {
@@ -366,7 +365,7 @@ const clickHandler = async (event) => {
 
 async function handleTabKey(event, rowIndex, colField) {
     if (editingRow.value == rowIndex && editingField.value == colField)
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
 
     const direction = event.shiftKey ? -1 : 1;
     const { nextRowIndex, nextColumnName } = await handleTabNavigation(
@@ -426,7 +425,8 @@ async function renderInput(rowId, field, clickedElement) {
                 await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
             },
             keyup: async (event) => {
-                if (event.key === 'Enter') handleBlur(rowId, field, clickedElement);
+                if (event.key === 'Enter')
+                    await destroyInput(rowIndex, field, clickedElement);
             },
             keydown: async (event) => {
                 switch (event.key) {
@@ -435,7 +435,7 @@ async function renderInput(rowId, field, clickedElement) {
                         event.stopPropagation();
                         break;
                     case 'Escape':
-                        destroyInput(rowId, field, clickedElement);
+                        await destroyInput(rowId, field, clickedElement);
                         break;
                     default:
                         break;
@@ -457,12 +457,13 @@ async function renderInput(rowId, field, clickedElement) {
         node.el?.querySelector('span > div > div').focus();
 }
 
-function destroyInput(rowIndex, field, clickedElement) {
+async function destroyInput(rowIndex, field, clickedElement) {
     if (!clickedElement)
         clickedElement = document.querySelector(
             `[data-row-index="${rowIndex}"][data-col-field="${field}"]`,
         );
     if (clickedElement) {
+        await nextTick();
         render(null, clickedElement);
         Array.from(clickedElement.childNodes).forEach((child) => {
             child.style.visibility = 'visible';
@@ -474,10 +475,6 @@ function destroyInput(rowIndex, field, clickedElement) {
     editingField.value = null;
 }
 
-function handleBlur(rowIndex, field, clickedElement) {
-    destroyInput(rowIndex, field, clickedElement);
-}
-
 async function handleTabNavigation(rowIndex, colName, direction) {
     const columns = $props.columns;
     const totalColumns = columns.length;
@@ -538,18 +535,22 @@ function formatColumnValue(col, row, dashIfEmpty) {
             : row[col?.name];
 
     if (selectRegex.test(col?.component) && $props.isEditable) {
-        const findBy = find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+        const { find, url } = col.attrs;
+        const urlRelation = url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
 
-        if (col?.attrs.options)
-            return dashIfEmpty(
-                col?.attrs.options.find((option) => option.id === row[col.name])?.name,
-            );
-
-        if (typeof row[findBy] == 'object') {
-            return dashIfEmpty(row[findBy][col?.attrs.optionLabel ?? 'name']);
+        if (col?.attrs.options) {
+            const find = col?.attrs.options.find((option) => option.id === row[col.name]);
+            if (!col.attrs?.optionLabel || !find) return dashIfEmpty(row[col?.name]);
+            return dashIfEmpty(find[col.attrs?.optionLabel ?? 'name']);
         }
-        if (row[findBy]) return dashIfEmpty(row[findBy]);
-        if (!findBy || !row) return;
+
+        if (typeof row[urlRelation] == 'object') {
+            if (typeof find == 'object')
+                return dashIfEmpty(row[urlRelation][find?.label ?? 'name']);
+
+            return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']);
+        }
+        if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]);
     } else {
         return dashIfEmpty(row[col?.name]);
     }
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index e05eca7f8..e8680f7dd 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -119,7 +119,7 @@ const columns = computed(() => [
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
         save-url="TrainingCourses/crud"
-        :filter="courseFilter"
+        :user-filter="courseFilter"
         :create="{
             urlCreate: 'trainingCourses',
             title: t('Create training course'),
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index c220df76a..b3a599af7 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -8,6 +8,17 @@ const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
 
+const centerFilter = {
+    include: [
+        {
+            relation: 'center',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
+
 const columns = [
     {
         align: 'left',
@@ -33,7 +44,7 @@ const columns = [
         create: true,
         component: 'select',
         attrs: {
-            url: 'medicalCenters',
+            url: 'centers',
             fields: ['id', 'name'],
         },
     },
@@ -84,6 +95,7 @@ const columns = [
         ref="tableRef"
         data-key="WorkerMedical"
         :url="`Workers/${entityId}/medicalReview`"
+        :user-filter="centerFilter"
         save-url="MedicalReviews/crud"
         :create="{
             urlCreate: 'medicalReviews',

From 874fbb48f5cb94a97e9b509ebd95713788691a9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 22:16:02 +0100
Subject: [PATCH 11/19] feat: refactor canProceed

---
 src/i18n/locale/en.yml               |   1 +
 src/i18n/locale/es.yml               |   1 +
 src/pages/Ticket/Card/TicketSale.vue | 105 +++++++++++++++++----------
 3 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d1fbdc312..7d0f3e0b2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -48,6 +48,7 @@ globals:
     rowRemoved: Row removed
     pleaseWait: Please wait...
     noPinnedModules: You don't have any pinned modules
+    enterToConfirm: Press Enter to confirm
     summary:
         basicData: Basic data
     daysOnward: Days onward
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index bfab41a75..7ca9e4b4c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -48,6 +48,7 @@ globals:
     rowRemoved: Fila eliminada
     pleaseWait: Por favor espera...
     noPinnedModules: No has fijado ningún módulo
+    enterToConfirm: Pulsa Enter para confirmar
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 94d393900..082e14014 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -52,7 +52,6 @@ const transfer = ref({
     sales: [],
 });
 const tableRef = ref([]);
-const canProceed = ref();
 
 watch(
     () => route.params.id,
@@ -132,7 +131,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.amount'),
         name: 'amount',
-        format: (row) => toCurrency(getSaleTotal(row)),
     },
     {
         align: 'left',
@@ -182,8 +180,6 @@ const resetChanges = async () => {
 };
 const rowToUpdate = ref(null);
 const changeQuantity = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     if (
         !sale.itemFk ||
         sale.quantity == null ||
@@ -192,11 +188,21 @@ const changeQuantity = async (sale) => {
         return;
     if (!sale.id) return addSale(sale);
 
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateQuantity(sale));
+    } else await updateQuantity(sale);
+};
+
+const updateQuantity = async (sale) => {
     try {
+        let { quantity, id } = sale;
         if (!rowToUpdate.value) return;
         rowToUpdate.value = null;
         sale.isNew = false;
-        await updateQuantity(sale);
+        const params = { quantity: quantity };
+        await axios.post(`Sales/${id}/updateQuantity`, params);
+        notify('globals.dataSaved', 'positive');
+        tableRef.value.reload();
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
             (s) => s.id === sale.id,
@@ -206,12 +212,6 @@ const changeQuantity = async (sale) => {
     }
 };
 
-const updateQuantity = async ({ quantity, id }) => {
-    const params = { quantity: quantity };
-    await axios.post(`Sales/${id}/updateQuantity`, params);
-    notify('globals.dataSaved', 'positive');
-};
-
 const addSale = async (sale) => {
     const params = {
         barcode: sale.itemFk,
@@ -236,13 +236,17 @@ const addSale = async (sale) => {
     sale.isNew = false;
     arrayData.fetch({});
 };
+const changeConcept = async (sale) => {
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateConcept(sale));
+    } else await updateConcept(sale);
+};
 
 const updateConcept = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     const data = { newConcept: sale.concept };
     await axios.post(`Sales/${sale.id}/updateConcept`, data);
     notify('globals.dataSaved', 'positive');
+    tableRef.value.reload();
 };
 
 const DEFAULT_EDIT = {
@@ -294,33 +298,36 @@ const onOpenEditDiscountPopover = async (sale) => {
         };
     }
 };
-
-const updatePrice = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
+const changePrice = async (sale) => {
     const newPrice = edit.value.price;
     if (newPrice != null && newPrice != sale.price) {
-        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-        sale.price = newPrice;
-        edit.value = { ...DEFAULT_EDIT };
-        notify('globals.dataSaved', 'positive');
+        if (await isSalePrepared(sale)) {
+            await confirmUpdate(() => updatePrice(sale, newPrice));
+        } else updatePrice(sale, newPrice);
     }
-
     await getMana();
 };
+const updatePrice = async (sale, newPrice) => {
+    await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+    sale.price = newPrice;
+    edit.value = { ...DEFAULT_EDIT };
+    notify('globals.dataSaved', 'positive');
+    tableRef.value.reload();
+};
 
 const changeDiscount = async (sale) => {
     const newDiscount = edit.value.discount;
     if (newDiscount != null && newDiscount != sale.discount) {
-        if (isSalePrepared(sale))
+        if (await isSalePrepared(sale))
             await confirmUpdate(() => updateDiscount([sale], newDiscount));
+        else await updateDiscount([sale], newDiscount);
     }
 };
 
 const updateDiscounts = async (sales, newDiscount = null) => {
-    const someSaleIsPrepared = sales.some(isSalePrepared);
-    if (someSaleIsPrepared);
-    await confirmUpdate(() => updateDiscount(sales, newDiscount));
+    const someSaleIsPrepared = await sales.some(isSalePrepared);
+    if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
+    else updateDiscount(sales, newDiscount);
 };
 
 const updateDiscount = async (sales, newDiscount = null) => {
@@ -426,9 +433,13 @@ onMounted(async () => {
 const items = ref([]);
 const newRow = ref({});
 
+const changeItem = async (sale) => {
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateItem(sale));
+    } else await updateItem(sale);
+};
+
 const updateItem = async (row) => {
-    canProceed.value = await isSalePrepared(row);
-    if (!canProceed.value) return;
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {
         row.item = selectedItem;
@@ -499,22 +510,27 @@ async function isSalePrepared(sale) {
 
     const matchingSale = data.find(({ itemFk }) => itemFk === sale.itemFk);
     if (!matchingSale) {
+        return false;
+    }
+
+    const flagsToCheck = [
+        'hasSaleGroupDetail',
+        'isControled',
+        'isPrepared',
+        'isPrevious',
+        'isPreviousSelected',
+    ];
+    if (flagsToCheck.some((flag) => matchingSale[flag] === 1)) {
         return true;
     }
-    return (
-        matchingSale.hasSaleGroupDetail ||
-        matchingSale.isControled ||
-        matchingSale.isPrepared ||
-        matchingSale.isPrevious ||
-        matchingSale.isPreviousSelected
-    );
+    return false;
 }
 
 watch(
     () => newRow.value.itemFk,
     (newItemFk) => {
         if (newItemFk) {
-            updateItem(newRow.value);
+            changeItem(newRow.value);
         }
     },
 );
@@ -751,7 +767,7 @@ watch(
                 option-value="id"
                 v-model="row.itemFk"
                 :use-like="false"
-                @update:model-value="updateItem(row)"
+                @update:model-value="changeItem(row)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -777,7 +793,11 @@ watch(
             </div>
             <FetchedTags :item="row" :max-length="6" />
             <QPopupProxy v-if="row.id && isTicketEditable">
-                <VnInput v-model="row.concept" @change="updateConcept(row)" />
+                <VnInput
+                    v-model="row.concept"
+                    @keyup.enter.stop="changeConcept(row)"
+                    :hint="t('globals.enterToConfirm')"
+                />
             </QPopupProxy>
         </template>
         <template #column-quantity="{ row }">
@@ -786,7 +806,7 @@ watch(
                 type="number"
                 v-model.number="row.quantity"
                 @blur="changeQuantity(row)"
-                @keyup.enter="changeQuantity(row)"
+                @keyup.enter.stop="changeQuantity(row)"
                 @update:model-value="() => (rowToUpdate = row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
@@ -800,10 +820,12 @@ watch(
                 <TicketEditManaProxy
                     ref="editPriceProxyRef"
                     :mana="mana"
+                    :sale="row"
                     :new-price="getNewPrice"
-                    @save="updatePrice(row)"
+                    @save="changePrice"
                 >
                     <VnInput
+                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
                         v-model.number="edit.price"
                         :label="t('basicData.price')"
                         type="number"
@@ -838,6 +860,9 @@ watch(
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
+        <template #column-amount="{ row }">
+            {{ toCurrency(getSaleTotal(row)) }}
+        </template>
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">

From b2184635d3d0d7ca8bde9c690430c5e6d45e69eb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 23:42:10 +0100
Subject: [PATCH 12/19] test: improve test

---
 src/pages/Ticket/Card/TicketEditMana.vue      |   2 +-
 src/pages/Ticket/Card/TicketSale.vue          |  29 +-
 .../integration/ticket/ticketSale.spec.js     | 298 +++++++++++-------
 3 files changed, 213 insertions(+), 116 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index de9a982b9..14eec9db9 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -46,7 +46,7 @@ defineExpose({ save });
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef">
+    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketEditManaProxy">
         <div class="container">
             <QSpinner v-if="!mana" color="primary" size="md" />
             <div v-else>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 082e14014..92936b26a 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -325,7 +325,11 @@ const changeDiscount = async (sale) => {
 };
 
 const updateDiscounts = async (sales, newDiscount = null) => {
-    const someSaleIsPrepared = await sales.some(isSalePrepared);
+    const salesTracking = await fetchSalesTracking();
+
+    const someSaleIsPrepared = salesTracking.some((sale) =>
+        matchSale(salesTracking, sale),
+    );
     if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
     else updateDiscount(sales, newDiscount);
 };
@@ -484,7 +488,7 @@ const endNewRow = (row) => {
 };
 
 async function confirmUpdate(cb) {
-    quasar
+    await quasar
         .dialog({
             component: VnConfirm,
             componentProps: {
@@ -494,8 +498,7 @@ async function confirmUpdate(cb) {
         })
         .onOk(cb);
 }
-
-async function isSalePrepared(sale) {
+async function fetchSalesTracking() {
     const filter = {
         params: {
             where: { ticketFk: route.params.id },
@@ -507,12 +510,23 @@ async function isSalePrepared(sale) {
             filter: JSON.stringify(filter),
         },
     });
+    return data;
+}
 
+async function isSalePrepared(sale) {
+    const data = await fetchSalesTracking();
+    return matchSale(data, sale);
+}
+function matchSale(data, sale) {
     const matchingSale = data.find(({ itemFk }) => itemFk === sale.itemFk);
+
     if (!matchingSale) {
         return false;
     }
 
+    return isPrepared(matchingSale);
+}
+function isPrepared(sale) {
     const flagsToCheck = [
         'hasSaleGroupDetail',
         'isControled',
@@ -520,12 +534,8 @@ async function isSalePrepared(sale) {
         'isPrevious',
         'isPreviousSelected',
     ];
-    if (flagsToCheck.some((flag) => matchingSale[flag] === 1)) {
-        return true;
-    }
-    return false;
+    return flagsToCheck.some((flag) => sale[flag] === 1);
 }
-
 watch(
     () => newRow.value.itemFk,
     (newItemFk) => {
@@ -802,6 +812,7 @@ watch(
         </template>
         <template #column-quantity="{ row }">
             <VnInput
+                data-cy="ticketSaleQuantityInput"
                 v-if="row.isNew || isTicketEditable"
                 type="number"
                 v-model.number="row.quantity"
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index aed8dc85a..359ff8f8a 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,122 +1,208 @@
 /// <reference types="cypress" />
 
 describe('TicketSale', () => {
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/sale');
-    });
-
-    const firstRow = 'tbody > :nth-child(1)';
-
-    const selectFirstRow = () => {
-        cy.waitForElement(firstRow);
-        cy.get(firstRow).find('.q-checkbox__inner').click();
-    };
-
-    it('it should add item to basket', () => {
-        cy.window().then((win) => {
-            cy.stub(win, 'open').as('windowOpen');
+    describe('Free ticket #31', () => {
+        beforeEach(() => {
+            cy.login('developer');
+            cy.viewport(1920, 1080);
+            cy.visit('/#/ticket/31/sale');
         });
-        cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
-        cy.dataCy('ticketSaleAddToBasketBtn').click();
-        cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
-    });
 
-    it('should send SMS', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="sendShortageSMSItem"]');
-        cy.dataCy('sendShortageSMSItem').should('exist');
-        cy.dataCy('sendShortageSMSItem').click();
-        cy.dataCy('vnSmsDialog').should('exist');
-        cy.dataCy('sendSmsBtn').click();
-        cy.checkNotification('SMS sent');
-    });
+        const firstRow = 'tbody > :nth-child(1)';
 
-    it('should recalculate price when "Recalculate price" is clicked', () => {
-        cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="recalculatePriceItem"]');
-        cy.dataCy('recalculatePriceItem').should('exist');
-        cy.dataCy('recalculatePriceItem').click();
-        cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
-        cy.checkNotification('Data saved');
-    });
+        const selectFirstRow = () => {
+            cy.waitForElement(firstRow);
+            cy.get(firstRow).find('.q-checkbox__inner').click();
+        };
 
-    it('should update discount when "Update discount" is clicked', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="updateDiscountItem"]');
-        cy.dataCy('updateDiscountItem').should('exist');
-        cy.dataCy('updateDiscountItem').click();
-        cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
-        cy.dataCy('ticketSaleDiscountInput').find('input').focus();
-        cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
-        cy.dataCy('saveManaBtn').click();
-        cy.waitForElement('.q-notification__message');
-        cy.checkNotification('Data saved');
-    });
+        it('it should add item to basket', () => {
+            cy.window().then((win) => {
+                cy.stub(win, 'open').as('windowOpen');
+            });
+            cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
+            cy.dataCy('ticketSaleAddToBasketBtn').click();
+            cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
+        });
 
-    it('adds claim', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('createClaimItem').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.url().should('contain', 'claim/');
-        // Delete created claim to avoid cluttering the database
-        cy.dataCy('descriptor-more-opts').click();
-        cy.dataCy('deleteClaim').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.checkNotification('Data deleted');
-    });
+        it('should send SMS', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="sendShortageSMSItem"]');
+            cy.dataCy('sendShortageSMSItem').should('exist');
+            cy.dataCy('sendShortageSMSItem').click();
+            cy.dataCy('vnSmsDialog').should('exist');
+            cy.dataCy('sendSmsBtn').click();
+            cy.checkNotification('SMS sent');
+        });
 
-    it('marks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="markAsReservedItem"]');
-        cy.dataCy('markAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('exist');
-    });
+        it('should recalculate price when "Recalculate price" is clicked', () => {
+            cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="recalculatePriceItem"]');
+            cy.dataCy('recalculatePriceItem').should('exist');
+            cy.dataCy('recalculatePriceItem').click();
+            cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
+            cy.checkNotification('Data saved');
+        });
 
-    it('unmarks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
-        cy.dataCy('unmarkAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('not.exist');
-    });
+        it('should update discount when "Update discount" is clicked', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="updateDiscountItem"]');
+            cy.dataCy('updateDiscountItem').should('exist');
+            cy.dataCy('updateDiscountItem').click();
+            cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
+            cy.dataCy('ticketSaleDiscountInput').find('input').focus();
+            cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
+            cy.dataCy('saveManaBtn').click();
+            cy.waitForElement('.q-notification__message');
+            cy.checkNotification('Data saved');
+        });
 
-    it('refunds row with warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
+        it('adds claim', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('createClaimItem').click();
+            cy.dataCy('VnConfirm_confirm').click();
+            cy.url().should('contain', 'claim/');
+            // Delete created claim to avoid cluttering the database
+            cy.dataCy('descriptor-more-opts').click();
+            cy.dataCy('deleteClaim').click();
+            cy.dataCy('VnConfirm_confirm').click();
+            cy.checkNotification('Data deleted');
+        });
 
-    it('refunds row without warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
+        it('marks row as reserved', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="markAsReservedItem"]');
+            cy.dataCy('markAsReservedItem').click();
+            cy.dataCy('ticketSaleReservedIcon').should('exist');
+        });
 
-    it('transfer sale to a new ticket', () => {
-        cy.visit('/#/ticket/32/sale');
-        cy.get('.q-item > .q-item__label').should('have.text', ' #32');
-        selectFirstRow();
-        cy.dataCy('ticketSaleTransferBtn').click();
-        cy.dataCy('ticketTransferPopup').should('exist');
-        cy.dataCy('ticketTransferNewTicketBtn').click();
-        //check the new ticket has been created succesfully
-        cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
-    });
+        it('unmarks row as reserved', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
+            cy.dataCy('unmarkAsReservedItem').click();
+            cy.dataCy('ticketSaleReservedIcon').should('not.exist');
+        });
 
-    it('should redirect to ticket logs', () => {
-        cy.get(firstRow).find('.q-btn:last').click();
-        cy.url().should('match', /\/ticket\/31\/log/);
+        it('refunds row with warehouse', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('ticketSaleRefundItem').click();
+            cy.dataCy('ticketSaleRefundWithWarehouse').click();
+            cy.checkNotification('The following refund ticket have been created');
+        });
+
+        it('refunds row without warehouse', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('ticketSaleRefundItem').click();
+            cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
+            cy.checkNotification('The following refund ticket have been created');
+        });
+
+        it('transfer sale to a new ticket', () => {
+            cy.visit('/#/ticket/32/sale');
+            cy.get('.q-item > .q-item__label').should('have.text', ' #32');
+            selectFirstRow();
+            cy.dataCy('ticketSaleTransferBtn').click();
+            cy.dataCy('ticketTransferPopup').should('exist');
+            cy.dataCy('ticketTransferNewTicketBtn').click();
+            //check the new ticket has been created succesfully
+            cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
+        });
+
+        it('should redirect to ticket logs', () => {
+            cy.get(firstRow).find('.q-btn:last').click();
+            cy.url().should('match', /\/ticket\/31\/log/);
+        });
+    });
+    describe.only('Ticket prepared #23', () => {
+        beforeEach(() => {
+            cy.login('developer');
+            cy.viewport(1920, 1080);
+            cy.visit('/#/ticket/23/sale');
+        });
+
+        const firstRow = 'tbody > :nth-child(1)';
+
+        const selectFirstRow = () => {
+            cy.waitForElement(firstRow);
+            cy.get(firstRow).find('.q-checkbox__inner').click();
+        };
+
+        it('update price', () => {
+            const price = Number((Math.random() * 99 + 1).toFixed(2));
+            cy.waitForElement(firstRow);
+            cy.get(':nth-child(10) > .q-btn').click();
+            cy.waitForElement('[data-cy="ticketEditManaProxy"]');
+            cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.waitForElement('[data-cy="Price_input"]');
+            cy.dataCy('Price_input').clear();
+            cy.dataCy('Price_input').type(price);
+            cy.dataCy('saveManaBtn').click();
+            handleVnConfirm();
+
+            cy.get(':nth-child(10) > .q-btn > .q-btn__content').should(
+                'have.text',
+                `€${price}`,
+            );
+        });
+        it('update dicount', () => {
+            const discount = Math.floor(Math.random() * 100) + 1;
+            selectFirstRow();
+            cy.get(':nth-child(11) > .q-btn').click();
+            cy.waitForElement('[data-cy="ticketEditManaProxy"]');
+            cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.waitForElement('[data-cy="Disc_input"]');
+            cy.dataCy('Disc_input').clear();
+            cy.dataCy('Disc_input').type(discount);
+            cy.dataCy('saveManaBtn').click();
+            handleVnConfirm();
+
+            cy.get(':nth-child(11) > .q-btn > .q-btn__content').should(
+                'have.text',
+                `${discount}.00%`,
+            );
+        });
+
+        it('change concept', () => {
+            const quantity = Math.floor(Math.random() * 100) + 1;
+            cy.waitForElement(firstRow);
+            cy.get(':nth-child(8) > .row').click();
+            cy.get(
+                '.q-menu > [data-v-ca3f07a4=""] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="undefined_input"]',
+            )
+                .type(quantity)
+                .type('{enter}');
+            handleVnConfirm();
+
+            cy.get(':nth-child(8) >.row').should('contain.text', `${quantity}`);
+        });
+        it('changequantity ', () => {
+            const quantity = Math.floor(Math.random() * 100) + 1;
+            cy.waitForElement(firstRow);
+            cy.dataCy('ticketSaleQuantityInput').clear();
+            cy.dataCy('ticketSaleQuantityInput').type(quantity).trigger('tab');
+            cy.get('.q-page > :nth-child(6)').click();
+
+            handleVnConfirm();
+
+            cy.get('[data-cy="ticketSaleQuantityInput"]')
+                .find('[data-cy="undefined_input"]')
+                .should('have.value', `${quantity}`);
+        });
     });
 });
+
+function handleVnConfirm() {
+    cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+    cy.waitForElement('.q-notification__message');
+
+    cy.get('.q-notification__message').should('be.visible');
+    cy.checkNotification('Data saved');
+}

From b8e6b27303de005656ee5b92f7b2179e564c474a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 23:54:31 +0100
Subject: [PATCH 13/19] test: improve test

---
 test/cypress/integration/ticket/ticketSale.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 359ff8f8a..63562bd26 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -121,7 +121,7 @@ describe('TicketSale', () => {
             cy.url().should('match', /\/ticket\/31\/log/);
         });
     });
-    describe.only('Ticket prepared #23', () => {
+    describe('Ticket prepared #23', () => {
         beforeEach(() => {
             cy.login('developer');
             cy.viewport(1920, 1080);

From 523e97760e82521797d7d67dc53530b8ed14ce64 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 20 Feb 2025 07:06:44 +0100
Subject: [PATCH 14/19] test: refs #8618 add selector for first tickets row
 checkbox in routeExtendedList.spec.js

---
 test/cypress/integration/route/routeExtendedList.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 8470fecff..34d3d3a29 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -18,6 +18,8 @@ describe('Route extended list', () => {
         downloadBtn: '#st-actions > .q-btn-group > :nth-child(2)',
         markServedBtn: '#st-actions > .q-btn-group > :nth-child(3)',
         searchbar: 'searchbar',
+        firstTicketsRowSelectCheckBox:
+            '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg',
     };
 
     const checkboxState = {
@@ -136,7 +138,7 @@ describe('Route extended list', () => {
         const downloadsFolder = Cypress.config('downloadsFolder');
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.downloadBtn).click();
-        cy.wait(5000); //necesario para dar tiempo a que descargue el documento
+        cy.wait(5000);
 
         const fileName = 'download.zip';
         cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
@@ -180,9 +182,7 @@ describe('Route extended list', () => {
 
     it('Should add ticket to route', () => {
         cy.dataCy('tableAction-0').last().click();
-        cy.get(
-            '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg',
-        ).click();
+        cy.get(selectors.firstTicketsRowSelectCheckBox).click();
         cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
         cy.checkNotification(dataSaved);
     });

From 2889253c07814533873a67ecc80f6db0a60ae0af Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 20 Feb 2025 09:14:07 +0100
Subject: [PATCH 15/19] fix: add nextTick

---
 src/components/VnTable/VnTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b053b94a4..d7ed2ea27 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -10,6 +10,7 @@ import {
     render,
     inject,
     useAttrs,
+    nextTick,
 } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';

From 743e07cd64a4794905025c847552190c3585f76f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 20 Feb 2025 09:46:02 +0100
Subject: [PATCH 16/19] fix: refs #7323 notification manager

---
 .../worker/workerNotificationsManager.spec.js         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/cypress/integration/worker/workerNotificationsManager.spec.js b/test/cypress/integration/worker/workerNotificationsManager.spec.js
index cffb6475a..ad48d8a6c 100644
--- a/test/cypress/integration/worker/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/worker/workerNotificationsManager.spec.js
@@ -2,8 +2,8 @@ describe('WorkerNotificationsManager', () => {
     const salesPersonId = 18;
     const developerId = 9;
 
-    const activeList = '.q-infinite-scroll > :nth-child(1)';
-    const availableList = '.q-infinite-scroll > :nth-child(2)';
+    const activeList = ':nth-child(1) > .q-list';
+    const availableList = ':nth-child(2) > .q-list';
     const firstActiveNotification =
         ':nth-child(1) > .q-list > :nth-child(1) > .q-item > .q-toggle > .q-toggle__inner';
     const firstAvailableNotification =
@@ -29,6 +29,7 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(activeList)
+            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstAvailableNotification).click();
@@ -45,10 +46,13 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(availableList)
+            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstActiveNotification).click();
-                cy.get(availableList).children().should('have.length', beforeSize);
+                cy.get(availableList)
+                    .children()
+                    .should('have.length', beforeSize + 1);
             });
     });
 
@@ -58,6 +62,7 @@ describe('WorkerNotificationsManager', () => {
         cy.waitForElement(availableList);
 
         cy.get(activeList)
+            .children()
             .its('length')
             .then((beforeSize) => {
                 cy.get(firstAvailableNotification).click();

From 484ceb709a46821709bfee1c0e4d4dadfa93350e Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 20 Feb 2025 20:51:15 +0100
Subject: [PATCH 17/19] feat: refs #6896 enhance VnTable components with
 alignment options and improve styling

---
 src/components/VnTable/VnFilter.vue        |  2 +-
 src/components/VnTable/VnOrder.vue         | 27 +++++++----
 src/components/VnTable/VnTable.vue         | 17 ++++---
 src/components/common/VnComponent.vue      |  3 +-
 src/composables/getColAlign.js             |  4 +-
 src/filters/toDate.js                      | 11 ++++-
 src/pages/Entry/Card/EntryBuys.vue         | 56 ++++++++++++----------
 src/pages/Entry/EntryList.vue              |  1 -
 src/pages/Entry/EntryStockBought.vue       |  4 +-
 src/pages/Entry/EntryStockBoughtDetail.vue |  6 +--
 10 files changed, 76 insertions(+), 55 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 2dad8fe52..0de3834ea 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -152,7 +152,7 @@ const onTabPressed = async () => {
 };
 </script>
 <template>
-    <div v-if="showFilter" class="full-width flex-center" style="overflow: hidden">
+    <div v-if="showFilter" class="full-width" style="overflow: hidden">
         <VnColumn
             :column="$props.column"
             default="input"
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index e3795cc4b..47ed9acf4 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -23,6 +23,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    align: {
+        type: String,
+        default: 'end',
+    },
 });
 const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
@@ -46,16 +50,27 @@ async function orderBy(name, direction) {
 }
 
 defineExpose({ orderBy });
+
+function textAlignToFlex(textAlign) {
+    return `justify-content: ${
+        {
+            'text-center': 'center',
+            'text-left': 'start',
+            'text-right': 'end',
+        }[textAlign] || 'start'
+    };`;
+}
 </script>
 <template>
     <div
         @mouseenter="hover = true"
         @mouseleave="hover = false"
         @click="orderBy(name, model?.direction)"
-        class="row items-center no-wrap cursor-pointer title"
+        class="items-center no-wrap cursor-pointer title"
+        :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <sup v-if="name && model?.index">
+        <div v-if="name && model?.index">
             <QChip
                 :label="!vertical ? model?.index : ''"
                 :icon="
@@ -92,20 +107,16 @@ defineExpose({ orderBy });
                     />
                 </div>
             </QChip>
-        </sup>
+        </div>
     </div>
 </template>
 <style lang="scss" scoped>
 .title {
     display: flex;
-    justify-content: center;
     align-items: center;
     height: 30px;
     width: 100%;
     color: var(--vn-label-color);
-}
-sup {
-    vertical-align: super; /* Valor predeterminado */
-    /* También puedes usar otros valores como "baseline", "top", "text-top", etc. */
+    white-space: nowrap;
 }
 </style>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d7ed2ea27..e17c76e03 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -552,9 +552,8 @@ function formatColumnValue(col, row, dashIfEmpty) {
             return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']);
         }
         if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]);
-    } else {
-        return dashIfEmpty(row[col?.name]);
     }
+    return dashIfEmpty(row[col?.name]);
 }
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
@@ -657,15 +656,14 @@ function cardClick(_, row) {
                         v-bind:class="col.headerClass"
                         class="body-cell"
                         :style="col?.width ? `max-width: ${col?.width}` : ''"
-                        style="padding: inherit"
                     >
                         <div
                             class="no-padding"
-                            :style="
-                                withFilters && $props.columnSearch ? 'height: 75px' : ''
-                            "
+                            :style="[
+                                withFilters && $props.columnSearch ? 'height: 75px' : '',
+                            ]"
                         >
-                            <div class="text-center" style="height: 30px">
+                            <div style="height: 30px">
                                 <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
                                 <VnTableOrder
                                     v-model="orders[col.orderBy ?? col.name]"
@@ -673,6 +671,7 @@ function cardClick(_, row) {
                                     :label="col?.labelAbbreviation ?? col?.label"
                                     :data-key="$attrs['data-key']"
                                     :search-url="searchUrl"
+                                    :align="getColAlign(col)"
                                 />
                             </div>
                             <VnFilter
@@ -1053,8 +1052,8 @@ es:
 }
 
 .body-cell {
-    padding-left: 2px !important;
-    padding-right: 2px !important;
+    padding-left: 4px !important;
+    padding-right: 4px !important;
     position: relative;
 }
 .bg-chip-secondary {
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index d9d1ea26b..a9e1c8cff 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -48,7 +48,8 @@ function toValueAttrs(attrs) {
     <span
         v-for="toComponent of componentArray"
         :key="toComponent.name"
-        class="column flex-center fit"
+        class="column fit"
+        :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''"
     >
         <component
             v-if="toComponent?.component"
diff --git a/src/composables/getColAlign.js b/src/composables/getColAlign.js
index 6e963b437..a930fd7d8 100644
--- a/src/composables/getColAlign.js
+++ b/src/composables/getColAlign.js
@@ -1,14 +1,14 @@
 export function getColAlign(col) {
     let align;
     switch (col.component) {
+        case 'time':
+        case 'date':
         case 'select':
             align = 'left';
             break;
         case 'number':
             align = 'right';
             break;
-        case 'time':
-        case 'date':
         case 'checkbox':
             align = 'center';
             break;
diff --git a/src/filters/toDate.js b/src/filters/toDate.js
index 8fe8f3836..002797af5 100644
--- a/src/filters/toDate.js
+++ b/src/filters/toDate.js
@@ -3,6 +3,8 @@ import { useI18n } from 'vue-i18n';
 export default function (value, options = {}) {
     if (!value) return;
 
+    if (!isValidDate(value)) return null;
+
     if (!options.dateStyle && !options.timeStyle) {
         options.day = '2-digit';
         options.month = '2-digit';
@@ -10,7 +12,12 @@ export default function (value, options = {}) {
     }
 
     const { locale } = useI18n();
-    const date = new Date(value);
+    const newDate = new Date(value);
 
-    return new Intl.DateTimeFormat(locale.value, options).format(date);
+    return new Intl.DateTimeFormat(locale.value, options).format(newDate);
+}
+// handle 0000-00-00
+function isValidDate(date) {
+    const parsedDate = new Date(date);
+    return parsedDate instanceof Date && !isNaN(parsedDate.getTime());
 }
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index f3b73cb04..81578c609 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -16,7 +16,6 @@ import ItemDescriptor from 'src/pages/Item/Card/ItemDescriptor.vue';
 import axios from 'axios';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import { checkEntryLock } from 'src/composables/checkEntryLock';
-import SkeletonDescriptor from 'src/components/ui/SkeletonDescriptor.vue';
 
 const $props = defineProps({
     id: {
@@ -103,7 +102,7 @@ const columns = [
         name: 'itemFk',
         component: 'number',
         isEditable: false,
-        width: '40px',
+        width: '35px',
     },
     {
         labelAbbreviation: '',
@@ -111,7 +110,7 @@ const columns = [
         name: 'hex',
         columnSearch: false,
         isEditable: false,
-        width: '5px',
+        width: '9px',
         component: 'select',
         attrs: {
             url: 'Inks',
@@ -181,6 +180,7 @@ const columns = [
             url: 'packagings',
             fields: ['id'],
             optionLabel: 'id',
+            optionValue: 'id',
         },
         create: true,
         width: '40px',
@@ -192,7 +192,7 @@ const columns = [
         component: 'number',
         create: true,
         width: '35px',
-        format: (row, dashIfEmpty) => parseFloat(row['weight']).toFixed(1),
+        format: (row) => parseFloat(row['weight']).toFixed(1),
     },
     {
         labelAbbreviation: 'P',
@@ -330,6 +330,25 @@ const columns = [
         create: true,
         format: (row) => parseFloat(row['price3']).toFixed(2),
     },
+    {
+        align: 'center',
+        labelAbbreviation: 'CM',
+        label: t('Check min price'),
+        toolTip: t('Check min price'),
+        name: 'hasMinPrice',
+        attrs: {
+            toggleIndeterminate: false,
+        },
+        component: 'checkbox',
+        cellEvent: {
+            'update:modelValue': async (value, oldValue, row) => {
+                await axios.patch(`Items/${row['itemFk']}`, {
+                    hasMinPrice: value,
+                });
+            },
+        },
+        width: '25px',
+    },
     {
         align: 'center',
         labelAbbreviation: 'Min.',
@@ -350,25 +369,6 @@ const columns = [
         },
         format: (row) => parseFloat(row['minPrice']).toFixed(2),
     },
-    {
-        align: 'center',
-        labelAbbreviation: 'CM',
-        label: t('Check min price'),
-        toolTip: t('Check min price'),
-        name: 'hasMinPrice',
-        attrs: {
-            toggleIndeterminate: false,
-        },
-        component: 'checkbox',
-        cellEvent: {
-            'update:modelValue': async (value, oldValue, row) => {
-                await axios.patch(`Items/${row['itemFk']}`, {
-                    hasMinPrice: value,
-                });
-            },
-        },
-        width: '25px',
-    },
     {
         align: 'center',
         labelAbbreviation: t('P.Sen'),
@@ -378,6 +378,9 @@ const columns = [
         component: 'number',
         isEditable: false,
         width: '40px',
+        style: () => {
+            return { color: 'var(--vn-label-color)' };
+        },
     },
     {
         align: 'center',
@@ -417,6 +420,9 @@ const columns = [
         component: 'input',
         isEditable: false,
         width: '35px',
+        style: () => {
+            return { color: 'var(--vn-label-color)' };
+        },
     },
 ];
 
@@ -644,8 +650,8 @@ onMounted(() => {
         :is-editable="editableMode"
         :without-header="!editableMode"
         :with-filters="editableMode"
-        :right-search="false"
-        :right-search-icon="false"
+        :right-search="true"
+        :right-search-icon="true"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index d50f6b219..3c96a2302 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -199,7 +199,6 @@ const columns = computed(() => [
             optionValue: 'code',
             optionLabel: 'description',
         },
-        cardVisible: true,
         width: '65px',
         format: (row, dashIfEmpty) => dashIfEmpty(row.entryTypeDescription),
     },
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index da8557828..4bd0fe640 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -57,7 +57,7 @@ const columns = computed(() => [
         create: true,
         component: 'number',
         summation: true,
-        width: '60px',
+        width: '50px',
     },
     {
         align: 'center',
@@ -286,7 +286,7 @@ function round(value) {
     justify-content: center;
 }
 .column {
-    min-width: 30%;
+    min-width: 40%;
     margin-top: 5%;
     display: flex;
     flex-direction: column;
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9d382f23a..1a37994d9 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -101,7 +101,8 @@ const columns = [
 </template>
 <style lang="css" scoped>
 .container {
-    max-width: 50vw;
+    max-width: 100%;
+    width: 50%;
     overflow: auto;
     justify-content: center;
     align-items: center;
@@ -109,9 +110,6 @@ const columns = [
     background-color: var(--vn-section-color);
     padding: 2%;
 }
-.container > div > div > .q-table__top.relative-position.row.items-center {
-    background-color: red !important;
-}
 </style>
 <i18n>
     es:

From ea6874c0db2d3629ac97bcff1505abdd1715be9a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 21 Feb 2025 07:24:11 +0100
Subject: [PATCH 18/19] feat: refs #6896 add dashIfEmpty filter for medical
 center name in WorkerMedical component

---
 src/pages/Worker/Card/WorkerMedical.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index b3a599af7..c04f6496b 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -3,6 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
@@ -44,9 +45,12 @@ const columns = [
         create: true,
         component: 'select',
         attrs: {
-            url: 'centers',
+            url: 'medicalCenters',
             fields: ['id', 'name'],
         },
+        format: (row, dashIfEmpty) => {
+            return dashIfEmpty(row.center?.name);
+        },
     },
     {
         align: 'left',

From 58cf8ab29dfcb5f8e23092ce18c509dbbb8f3de5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 21 Feb 2025 08:50:57 +0100
Subject: [PATCH 19/19] feat: refs #8402 added lost filters from Salix

---
 src/pages/Item/ItemRequestFilter.vue | 38 +++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index af48f7f5c..c2a63ddd9 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -8,6 +8,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -52,7 +53,7 @@ onMounted(async () => {
                 name: key,
                 value,
                 selectedField: { name: key, label: t(`params.${key}`) },
-            })
+            }),
         );
     }
     exprBuilder('state', arrayData.store?.userParams?.state);
@@ -157,6 +158,32 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('params.from')"
+                        is-outlined
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('params.to')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.daysOnward')"
+                        v-model="params.daysOnward"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -175,11 +202,10 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('params.daysOnward')"
-                        v-model="params.daysOnward"
-                        lazy-rules
-                        is-outlined
+                    <QCheckbox
+                        :label="t('params.mine')"
+                        v-model="params.mine"
+                        :toggle-indeterminate="false"
                     />
                 </QItemSection>
             </QItem>