From acc202386e2b96305c00ae861069aee5a1a20882 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 19 Feb 2025 13:53:47 +0100
Subject: [PATCH 01/25] fix: refs #8583 operator

---
 cypress.config.js                             |  2 +-
 src/pages/Worker/Card/WorkerOperator.vue      | 11 ++++++++--
 .../integration/worker/workerOperator.spec.js | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 test/cypress/integration/worker/workerOperator.spec.js

diff --git a/cypress.config.js b/cypress.config.js
index a9e27fcfd..b902891f3 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -13,7 +13,7 @@ export default defineConfig({
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
         video: false,
-        specPattern: 'test/cypress/integration/**/*.spec.js',
+        specPattern: 'test/cypress/integration/worker/*.spec.js',
         experimentalRunAllSpecs: false,
         watchForFileChanges: false,
         reporter: 'cypress-mochawesome-reporter',
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 6faeefe67..1efb5479b 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -54,9 +54,8 @@ watch(
             selected.value = [];
         }
     },
-    { immediate: true, deep: true }
+    { immediate: true, deep: true },
 );
-
 </script>
 
 <template>
@@ -99,12 +98,14 @@ watch(
                             <VnInput
                                 :label="t('worker.operator.numberOfWagons')"
                                 v-model="row.numberOfWagons"
+                                data-cy="numberOfWagons"
                             />
                             <VnSelect
                                 :label="t('worker.operator.train')"
                                 :options="trainsData"
                                 hide-selected
                                 v-model="row.trainFk"
+                                data-cy="train"
                             />
                         </VnRow>
                         <VnRow>
@@ -115,12 +116,14 @@ watch(
                                 option-label="code"
                                 option-value="code"
                                 v-model="row.itemPackingTypeFk"
+                                data-cy="itemPackingType"
                             />
                             <VnSelect
                                 :label="t('worker.operator.warehouse')"
                                 :options="warehousesData"
                                 hide-selected
                                 v-model="row.warehouseFk"
+                                data-cy="warehouse"
                             />
                         </VnRow>
                         <VnRow>
@@ -130,6 +133,7 @@ watch(
                                 hide-selected
                                 option-label="description"
                                 v-model="row.sectorFk"
+                                data-cy="sector"
                             />
                             <VnSelect
                                 :label="t('worker.operator.labeler')"
@@ -137,6 +141,7 @@ watch(
                                 hide-selected
                                 option-label="name"
                                 v-model="row.labelerFk"
+                                data-cy="labeler"
                             >
                                 <template #option="scope">
                                     <QItem v-bind="scope.itemProps">
@@ -158,11 +163,13 @@ watch(
                                 :label="t('worker.operator.linesLimit')"
                                 v-model="row.linesLimit"
                                 lazy-rules
+                                data-cy="linesLimit"
                             />
                             <VnInput
                                 :label="t('worker.operator.volumeLimit')"
                                 v-model="row.volumeLimit"
                                 lazy-rules
+                                data-cy="volumeLimit"
                             />
                         </VnRow>
                         <VnRow>
diff --git a/test/cypress/integration/worker/workerOperator.spec.js b/test/cypress/integration/worker/workerOperator.spec.js
new file mode 100644
index 000000000..ff650d8b7
--- /dev/null
+++ b/test/cypress/integration/worker/workerOperator.spec.js
@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+describe('WorkerLocker', () => {
+    const userId = 1106;
+    const nWagons = '4';
+    const numberOfWagons = '[data-cy="numberOfWagons"]';
+    const linesLimit = '[data-cy="linesLimit"]';
+    const volumeLimit = '[data-cy="volumeLimit"]';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit(`/#/worker/${userId}/operator`);
+    });
+
+    it('should fill the operator form', () => {
+        cy.get(numberOfWagons).type(nWagons);
+        cy.get(linesLimit).type('6');
+        cy.get(volumeLimit).type('3');
+        cy.saveCard();
+
+        cy.checkNotification('Data saved');
+    });
+});

From 6c2b8e178ff2fc9d31b470e11d28ca3e759be058 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 20 Feb 2025 08:21:43 +0100
Subject: [PATCH 02/25] fix: refs #8583 tMutual, tNotes, TOperator

---
 src/pages/Worker/Card/WorkerOperator.vue       |  1 +
 .../integration/worker/workerMututal.spec.js   | 18 ++++++++++++++++++
 .../integration/worker/workerNotes.spec.js     | 18 ++++++++++++++++++
 .../integration/worker/workerOperator.spec.js  |  4 +++-
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/worker/workerMututal.spec.js
 create mode 100644 test/cypress/integration/worker/workerNotes.spec.js

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 1efb5479b..ab763f4c2 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -177,6 +177,7 @@ watch(
                                 :label="t('worker.operator.sizeLimit')"
                                 v-model="row.sizeLimit"
                                 lazy-rules
+                                data-cy="sizeLimit"
                             />
                             <VnInput
                                 :label="t('worker.operator.isOnReservationMode')"
diff --git a/test/cypress/integration/worker/workerMututal.spec.js b/test/cypress/integration/worker/workerMututal.spec.js
new file mode 100644
index 000000000..371d4e245
--- /dev/null
+++ b/test/cypress/integration/worker/workerMututal.spec.js
@@ -0,0 +1,18 @@
+/// <reference types="cypress" />
+describe('WorkerNotes', () => {
+    const userId = 1106;
+    const create = '[data-cy="vnTableCreateBtn"]';
+    const numberOfWagons = '[data-cy="numberOfWagons"]';
+    const linesLimit = '[data-cy="linesLimit"]';
+    const volumeLimit = '[data-cy="volumeLimit"]';
+    const sizeLimit = '[data-cy="sizeLimit"]';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#/worker/${userId}/medical`);
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/worker/workerNotes.spec.js b/test/cypress/integration/worker/workerNotes.spec.js
new file mode 100644
index 000000000..09083c25d
--- /dev/null
+++ b/test/cypress/integration/worker/workerNotes.spec.js
@@ -0,0 +1,18 @@
+/// <reference types="cypress" />
+describe('WorkerNotes', () => {
+    const userId = 1106;
+    const addNote = '[data-cy="addNote"]';
+    const numberOfWagons = '[data-cy="numberOfWagons"]';
+    const linesLimit = '[data-cy="linesLimit"]';
+    const volumeLimit = '[data-cy="volumeLimit"]';
+    const sizeLimit = '[data-cy="sizeLimit"]';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#/worker/${userId}/notes`);
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/worker/workerOperator.spec.js b/test/cypress/integration/worker/workerOperator.spec.js
index ff650d8b7..9248b229c 100644
--- a/test/cypress/integration/worker/workerOperator.spec.js
+++ b/test/cypress/integration/worker/workerOperator.spec.js
@@ -1,10 +1,11 @@
 /// <reference types="cypress" />
-describe('WorkerLocker', () => {
+describe('WorkerOperator', () => {
     const userId = 1106;
     const nWagons = '4';
     const numberOfWagons = '[data-cy="numberOfWagons"]';
     const linesLimit = '[data-cy="linesLimit"]';
     const volumeLimit = '[data-cy="volumeLimit"]';
+    const sizeLimit = '[data-cy="sizeLimit"]';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('hr');
@@ -15,6 +16,7 @@ describe('WorkerLocker', () => {
         cy.get(numberOfWagons).type(nWagons);
         cy.get(linesLimit).type('6');
         cy.get(volumeLimit).type('3');
+        cy.get(sizeLimit).type('3');
         cy.saveCard();
 
         cy.checkNotification('Data saved');

From c8015eb5e3b7760856d782292f9b74db90e0ed1b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 20 Feb 2025 09:56:26 +0100
Subject: [PATCH 03/25] fix: refs #8583 mutual create

---
 .../worker/{workerMututal.spec.js => workerMutual.spec.js}     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename test/cypress/integration/worker/{workerMututal.spec.js => workerMutual.spec.js} (86%)

diff --git a/test/cypress/integration/worker/workerMututal.spec.js b/test/cypress/integration/worker/workerMutual.spec.js
similarity index 86%
rename from test/cypress/integration/worker/workerMututal.spec.js
rename to test/cypress/integration/worker/workerMutual.spec.js
index 371d4e245..d7a83b9e9 100644
--- a/test/cypress/integration/worker/workerMututal.spec.js
+++ b/test/cypress/integration/worker/workerMutual.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('WorkerNotes', () => {
+describe('WorkerMutual', () => {
     const userId = 1106;
     const create = '[data-cy="vnTableCreateBtn"]';
     const numberOfWagons = '[data-cy="numberOfWagons"]';
@@ -10,6 +10,7 @@ describe('WorkerNotes', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit(`/#/worker/${userId}/medical`);
+        cy.get('.q-page-sticky > div > .q-btn').click();
     });
 
     it('Should load layout', () => {

From 661e35abd86efecdae46990c6ec9c1f03f9977a0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 20 Feb 2025 11:56:16 +0100
Subject: [PATCH 04/25] fix: refs #8583 worker mutual e2e

---
 src/pages/Worker/Card/WorkerMedical.vue        |  4 ++++
 .../integration/worker/workerMutual.spec.js    | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index b3a599af7..8b60bb0b0 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -47,6 +47,10 @@ const columns = [
             url: 'centers',
             fields: ['id', 'name'],
         },
+        columnCreate: {
+            component: 'select',
+            url: 'medicalCenters',
+        },
     },
     {
         align: 'left',
diff --git a/test/cypress/integration/worker/workerMutual.spec.js b/test/cypress/integration/worker/workerMutual.spec.js
index d7a83b9e9..24ecd3c60 100644
--- a/test/cypress/integration/worker/workerMutual.spec.js
+++ b/test/cypress/integration/worker/workerMutual.spec.js
@@ -1,11 +1,13 @@
 /// <reference types="cypress" />
 describe('WorkerMutual', () => {
     const userId = 1106;
-    const create = '[data-cy="vnTableCreateBtn"]';
-    const numberOfWagons = '[data-cy="numberOfWagons"]';
-    const linesLimit = '[data-cy="linesLimit"]';
-    const volumeLimit = '[data-cy="volumeLimit"]';
-    const sizeLimit = '[data-cy="sizeLimit"]';
+    const saveBtn = '.q-mt-lg > .q-btn--standard';
+    const medicalReview = {
+        Date: { val: '01-01-2001', type: 'date' },
+        'Formation Center': { val: '1', type: 'select' },
+        Invoice: { val: '24532' },
+        Amount: { val: '540' },
+    };
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -13,7 +15,9 @@ describe('WorkerMutual', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
     });
 
-    it('Should load layout', () => {
-        cy.get('.q-card').should('be.visible');
+    it('should create a medical Review', () => {
+        cy.fillInForm(medicalReview);
+        cy.get(saveBtn).click();
+        cy.checkNotification('Data created');
     });
 });

From 6514490622063420b3b519cb8fb38328f933f5d6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 21 Feb 2025 15:39:32 +0100
Subject: [PATCH 05/25] fix: refs #8583 workerSummary test

---
 test/cypress/integration/worker/workerSummary.spec.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/worker/workerSummary.spec.js b/test/cypress/integration/worker/workerSummary.spec.js
index 3d70fdf96..ff9995ca3 100644
--- a/test/cypress/integration/worker/workerSummary.spec.js
+++ b/test/cypress/integration/worker/workerSummary.spec.js
@@ -1,4 +1,5 @@
 describe('WorkerSummary', () => {
+    const departmentDescriptor = ':nth-child(1) > :nth-child(3) > .value > .link';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -10,7 +11,11 @@ describe('WorkerSummary', () => {
         cy.get('.summaryHeader > div').should('have.text', '19 - salesboss salesboss');
         cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
             'have.text',
-            'salesBossNick'
+            'salesBossNick',
         );
     });
+
+    it('should try all descriptors', () => {
+        cy.waitForElement('.summaryHeader');
+    });
 });

From 8478ff768f67e18f3c301e1b4cf7271daa364dba Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 24 Feb 2025 11:25:15 +0100
Subject: [PATCH 06/25] fix: refs #8583 basicData, business, summary

---
 src/pages/Worker/Card/WorkerBasicData.vue     | 18 +++--
 .../worker/workerBasicData.spec.js            | 26 +++++++
 .../integration/worker/workerBusiness.spec.js | 74 +++++++++++++++++++
 .../integration/worker/workerSummary.spec.js  |  9 ++-
 4 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 test/cypress/integration/worker/workerBasicData.spec.js
 create mode 100644 test/cypress/integration/worker/workerBusiness.spec.js

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index fcf0f0369..b78710231 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -8,6 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
+import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const { t } = useI18n();
 const form = ref();
@@ -17,6 +18,12 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 </script>
 <template>
     <FetchData
@@ -36,13 +43,7 @@ const maritalStatus = [
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
-        @on-fetch="
-            async (data) => {
-                Object.assign(data, (await useAdvancedSummary('Workers', data.id)) ?? {});
-                await $nextTick();
-                if (form) form.hasChanges = false;
-            }
-        "
+        :mapper="onBeforeSave"
     >
         <template #form="{ data }">
             <VnRow>
@@ -86,6 +87,7 @@ const maritalStatus = [
                     option-label="name"
                     option-value="code"
                     v-model="data.maritalStatus"
+                    data-cy="MaritalStatus"
                 />
             </VnRow>
 
@@ -122,7 +124,7 @@ const maritalStatus = [
                 <VnInputDate :label="t('seniority')" v-model="data.seniority" />
             </VnRow>
             <VnRow>
-                <VnInput v-model="data.fi" :label="t('fi')" />
+                <VnInput v-model="data.fi" :label="t('fi')" data-cy="fi" />
                 <VnInputDate :label="t('birth')" v-model="data.birth" />
             </VnRow>
             <VnRow wrap>
diff --git a/test/cypress/integration/worker/workerBasicData.spec.js b/test/cypress/integration/worker/workerBasicData.spec.js
new file mode 100644
index 000000000..1c1a3644d
--- /dev/null
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@@ -0,0 +1,26 @@
+describe('WorkerSummary', () => {
+    const maritalStatusSelect = '[data-cy="MaritalStatus"]';
+    const nif = '42572374H';
+    const fi = '[data-cy="fi"]';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/worker/1107/basic-data');
+    });
+
+    it('should load worker summary', () => {
+        cy.get(maritalStatusSelect).type('Married');
+        cy.get(fi).type(nif);
+        cy.saveCard();
+    });
+
+    // it('should try descriptors', () => {
+    //     cy.waitForElement('.summaryHeader');
+    //     cy.get(departmentDescriptor).click();
+    //     cy.get('.descriptor').should('be.visible');
+    //     cy.get('.q-item > .q-item__label').should('include.text', '43');
+    //     cy.get(roleDescriptor).click();
+    //     cy.get('.descriptor').should('be.visible');
+    //     cy.get('.q-item > .q-item__label').should('include.text', '19');
+    // });
+});
diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
new file mode 100644
index 000000000..71fd6b347
--- /dev/null
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -0,0 +1,74 @@
+describe('WorkerCreate', () => {
+    const externalRadio = '.q-radio:nth-child(2)';
+    const developerBossId = 120;
+    const payMethodCross =
+        ':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' },
+        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' },
+        'Pay method': { val: 1, type: 'select' },
+        Phone: { val: '123456789' },
+        'Worker code': { val: 'DWW' },
+        Boss: { val: developerBossId, type: 'select' },
+        Birth: { val: '11-12-2022', type: 'date' },
+    };
+    const external = {
+        Fi: { val: 'Z4531219V' },
+        'Web user': { val: 'pepe' },
+        Name: { val: 'PEPE' },
+        'Last name': { val: 'GARCIA' },
+        'Personal email': { val: 'pepe@gmail.com' },
+        'Worker code': { val: 'PG' },
+        Boss: { val: developerBossId, type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit('/#/worker/list');
+        cy.get('.q-page-sticky > div > .q-btn').click();
+    });
+
+    it('should throw an error if a pay method has not been selected', () => {
+        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);
+        cy.get(saveBtn).click();
+        cy.checkNotification('Data created');
+    });
+
+    it('should create an external', () => {
+        cy.get(externalRadio).click();
+        cy.fillInForm(external);
+        cy.get(saveBtn).click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/worker/workerSummary.spec.js b/test/cypress/integration/worker/workerSummary.spec.js
index ff9995ca3..c50b2c943 100644
--- a/test/cypress/integration/worker/workerSummary.spec.js
+++ b/test/cypress/integration/worker/workerSummary.spec.js
@@ -1,5 +1,6 @@
 describe('WorkerSummary', () => {
     const departmentDescriptor = ':nth-child(1) > :nth-child(3) > .value > .link';
+    const roleDescriptor = ':nth-child(3) > :nth-child(4) > .value > .link';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -15,7 +16,13 @@ describe('WorkerSummary', () => {
         );
     });
 
-    it('should try all descriptors', () => {
+    it('should try descriptors', () => {
         cy.waitForElement('.summaryHeader');
+        cy.get(departmentDescriptor).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '43');
+        cy.get(roleDescriptor).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '19');
     });
 });

From e318a46279df4519c0a07fae7a11ec1017d345da Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 25 Feb 2025 08:03:25 +0100
Subject: [PATCH 07/25] fix: refs #8583 workerBasicData & workerTimeControl

---
 .../worker/workerBasicData.spec.js            |  2 +-
 .../worker/workerTimeControl.spec.js          | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/worker/workerTimeControl.spec.js

diff --git a/test/cypress/integration/worker/workerBasicData.spec.js b/test/cypress/integration/worker/workerBasicData.spec.js
index 1c1a3644d..9a8f8a0e9 100644
--- a/test/cypress/integration/worker/workerBasicData.spec.js
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@@ -1,4 +1,4 @@
-describe('WorkerSummary', () => {
+describe('WorkerBasicData', () => {
     const maritalStatusSelect = '[data-cy="MaritalStatus"]';
     const nif = '42572374H';
     const fi = '[data-cy="fi"]';
diff --git a/test/cypress/integration/worker/workerTimeControl.spec.js b/test/cypress/integration/worker/workerTimeControl.spec.js
new file mode 100644
index 000000000..a72dbaaa9
--- /dev/null
+++ b/test/cypress/integration/worker/workerTimeControl.spec.js
@@ -0,0 +1,22 @@
+describe('WorkerTimeControl', () => {
+    const pastMonth = '.nav-container > .row > :nth-child(1)';
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/worker/1107/time-control');
+    });
+
+    it('should add some entries', () => {
+        cy.get(pastMonth).click();
+    });
+
+    // it('should try descriptors', () => {
+    //     cy.waitForElement('.summaryHeader');
+    //     cy.get(departmentDescriptor).click();
+    //     cy.get('.descriptor').should('be.visible');
+    //     cy.get('.q-item > .q-item__label').should('include.text', '43');
+    //     cy.get(roleDescriptor).click();
+    //     cy.get('.descriptor').should('be.visible');
+    //     cy.get('.q-item > .q-item__label').should('include.text', '19');
+    // });
+});

From 9366713e9b5ff0f5d30cd6404f230c5ddb62c040 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 25 Feb 2025 14:24:31 +0100
Subject: [PATCH 08/25] fix: refs #8583 basicData e2e

---
 src/pages/Worker/Card/WorkerBasicData.vue         | 15 +++++++--------
 .../integration/worker/workerBasicData.spec.js    | 12 +-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index b78710231..9012289ad 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
-import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const { t } = useI18n();
 const form = ref();
@@ -18,11 +17,11 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
+async function setAdvancedSummary(data) {
+    const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
+    Object.assign(form.value.formData, advanced);
+    await nextTick();
+    if (form.value) form.value.hasChanges = false;
 }
 </script>
 <template>
@@ -43,7 +42,7 @@ function onBeforeSave(formData, originalData) {
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
-        :mapper="onBeforeSave"
+        @on-fetch="setAdvancedSummary"
     >
         <template #form="{ data }">
             <VnRow>
diff --git a/test/cypress/integration/worker/workerBasicData.spec.js b/test/cypress/integration/worker/workerBasicData.spec.js
index 9a8f8a0e9..3cafdb590 100644
--- a/test/cypress/integration/worker/workerBasicData.spec.js
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@@ -8,19 +8,9 @@ describe('WorkerBasicData', () => {
         cy.visit('/#/worker/1107/basic-data');
     });
 
-    it('should load worker summary', () => {
+    it('should modify worker summary', () => {
         cy.get(maritalStatusSelect).type('Married');
         cy.get(fi).type(nif);
         cy.saveCard();
     });
-
-    // it('should try descriptors', () => {
-    //     cy.waitForElement('.summaryHeader');
-    //     cy.get(departmentDescriptor).click();
-    //     cy.get('.descriptor').should('be.visible');
-    //     cy.get('.q-item > .q-item__label').should('include.text', '43');
-    //     cy.get(roleDescriptor).click();
-    //     cy.get('.descriptor').should('be.visible');
-    //     cy.get('.q-item > .q-item__label').should('include.text', '19');
-    // });
 });

From 5f12f8436bcc01693dc017128ceee5d0b2b5e1f5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Feb 2025 07:59:21 +0100
Subject: [PATCH 09/25] fix: refs #8583 basicData timeControl

---
 src/pages/Worker/Card/WorkerBasicData.vue                 | 1 +
 test/cypress/integration/worker/workerBasicData.spec.js   | 4 ++++
 test/cypress/integration/worker/workerTimeControl.spec.js | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 9012289ad..78142301c 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -98,6 +98,7 @@ async function setAdvancedSummary(data) {
                     option-label="name"
                     option-value="id"
                     v-model="data.originCountryFk"
+                    data-cy="country"
                 />
                 <VnSelect
                     :label="t('Education level')"
diff --git a/test/cypress/integration/worker/workerBasicData.spec.js b/test/cypress/integration/worker/workerBasicData.spec.js
index 3cafdb590..3a7edc765 100644
--- a/test/cypress/integration/worker/workerBasicData.spec.js
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@@ -1,5 +1,7 @@
 describe('WorkerBasicData', () => {
     const maritalStatusSelect = '[data-cy="MaritalStatus"]';
+    const countrySelect = '[data-cy="country"]';
+    const country = 'Alemania';
     const nif = '42572374H';
     const fi = '[data-cy="fi"]';
     beforeEach(() => {
@@ -11,6 +13,8 @@ describe('WorkerBasicData', () => {
     it('should modify worker summary', () => {
         cy.get(maritalStatusSelect).type('Married');
         cy.get(fi).type(nif);
+        cy.get(countrySelect).type(country);
         cy.saveCard();
+        cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/worker/workerTimeControl.spec.js b/test/cypress/integration/worker/workerTimeControl.spec.js
index a72dbaaa9..6b0a1e9f9 100644
--- a/test/cypress/integration/worker/workerTimeControl.spec.js
+++ b/test/cypress/integration/worker/workerTimeControl.spec.js
@@ -1,5 +1,9 @@
 describe('WorkerTimeControl', () => {
     const pastMonth = '.nav-container > .row > :nth-child(1)';
+    const pastDay =
+        '[aria-label="Monday, December 4, 2000"][style="min-width: 32.2857px; max-width: 32.2857px; width: 32.2857px;"] > .q-calendar-month__day--label__wrapper > .q-calendar-month__day--label';
+    const addTime4December =
+        ':nth-child(2) > :nth-child(1) > .column > .q-btn > .q-btn__content > .q-icon';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -8,6 +12,8 @@ describe('WorkerTimeControl', () => {
 
     it('should add some entries', () => {
         cy.get(pastMonth).click();
+        cy.get(pastDay).click();
+        cy.get(addTime4December).click();
     });
 
     // it('should try descriptors', () => {

From c18dce46e04e7d757e26f9c9496ba9eff2e6a490 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Feb 2025 07:39:31 +0100
Subject: [PATCH 10/25] fix: refs #8583 workerTimeControl

---
 src/pages/Worker/Card/WorkerTimeForm.vue                  | 4 +++-
 test/cypress/integration/worker/workerTimeControl.spec.js | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerTimeForm.vue b/src/pages/Worker/Card/WorkerTimeForm.vue
index 3250e3180..ea9d89144 100644
--- a/src/pages/Worker/Card/WorkerTimeForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeForm.vue
@@ -53,7 +53,7 @@ const title = computed(() => (isEditMode.value ? t('Edit entry') : t('Add time')
 const urlCreate = computed(() =>
     isEditMode.value
         ? `WorkerTimeControls/${$props.entryId}/updateTimeEntry`
-        : `WorkerTimeControls/${route.params.id}/addTimeEntry`
+        : `WorkerTimeControls/${route.params.id}/addTimeEntry`,
 );
 
 onBeforeMount(() => {
@@ -83,6 +83,7 @@ onBeforeMount(() => {
                 autofocus
                 :required="true"
                 :is-clearable="false"
+                data-cy="entryHour"
             />
             <VnSelect
                 :label="t('Type')"
@@ -91,6 +92,7 @@ onBeforeMount(() => {
                 option-value="code"
                 option-label="description"
                 hide-selected
+                data-cy="entryType"
             />
         </template>
     </FormModelPopup>
diff --git a/test/cypress/integration/worker/workerTimeControl.spec.js b/test/cypress/integration/worker/workerTimeControl.spec.js
index 6b0a1e9f9..9461d724e 100644
--- a/test/cypress/integration/worker/workerTimeControl.spec.js
+++ b/test/cypress/integration/worker/workerTimeControl.spec.js
@@ -4,6 +4,10 @@ describe('WorkerTimeControl', () => {
         '[aria-label="Monday, December 4, 2000"][style="min-width: 32.2857px; max-width: 32.2857px; width: 32.2857px;"] > .q-calendar-month__day--label__wrapper > .q-calendar-month__day--label';
     const addTime4December =
         ':nth-child(2) > :nth-child(1) > .column > .q-btn > .q-btn__content > .q-icon';
+    const entryType = 'data-cy="entryType"';
+    const entryIn = 'in';
+    const entryMiddle = 'middle';
+    const entryOut = 'out';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -14,6 +18,8 @@ describe('WorkerTimeControl', () => {
         cy.get(pastMonth).click();
         cy.get(pastDay).click();
         cy.get(addTime4December).click();
+        cy.get(entryType).type(entryIn);
+        cy.saveCard();
     });
 
     // it('should try descriptors', () => {

From 4e98a2fdcf585f0381a07e55bfb0d376c06b05e7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Feb 2025 07:40:38 +0100
Subject: [PATCH 11/25] fix: refs #8583 cypressconf

---
 cypress.config.js | 41 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index 920391b1b..dfe963a12 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,7 +1,4 @@
 import { defineConfig } from 'cypress';
-// https://docs.cypress.io/app/tooling/reporters
-// https://docs.cypress.io/app/references/configuration
-// https://www.npmjs.com/package/cypress-mochawesome-reporter
 
 let urlHost, reporter, reporterOptions;
 
@@ -28,51 +25,29 @@ if (process.env.CI) {
 export default defineConfig({
     e2e: {
         baseUrl: `http://${urlHost}:9000`,
-        experimentalStudio: false, // Desactivado para evitar tiempos de espera innecesarios
+        experimentalStudio: false,
         defaultCommandTimeout: 10000,
         trashAssetsBeforeRuns: false,
         requestTimeout: 10000,
         responseTimeout: 30000,
         pageLoadTimeout: 60000,
+        defaultBrowser: 'chromium',
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
         video: false,
-        specPattern: 'test/cypress/integration/worker/*.spec.js',
-        experimentalRunAllSpecs: false,
-        watchForFileChanges: false,
-        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions: {
-            charts: true,
-            reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
-            embeddedScreenshots: true,
-            reportDir: 'test/cypress/reports',
-            inlineAssets: true,
-        },
+        specPattern: 'test/cypress/integration/**/*.spec.js',
+        experimentalRunAllSpecs: true,
+        watchForFileChanges: true,
+        reporter,
+        reporterOptions,
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',
             supportFile: 'test/cypress/support/unit.js',
-        } /*
-        setupNodeEvents: async (on, config) => {
-            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,
         viewportHeight: 720,
     },

From e92d57db533521d2c715011a0321b117af67aa28 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Feb 2025 09:26:50 +0100
Subject: [PATCH 12/25] fix: refs #8583 workerTimeControl e2e

---
 test/cypress/integration/worker/workerTimeControl.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/worker/workerTimeControl.spec.js b/test/cypress/integration/worker/workerTimeControl.spec.js
index 9461d724e..ddc151ae1 100644
--- a/test/cypress/integration/worker/workerTimeControl.spec.js
+++ b/test/cypress/integration/worker/workerTimeControl.spec.js
@@ -4,10 +4,12 @@ describe('WorkerTimeControl', () => {
         '[aria-label="Monday, December 4, 2000"][style="min-width: 32.2857px; max-width: 32.2857px; width: 32.2857px;"] > .q-calendar-month__day--label__wrapper > .q-calendar-month__day--label';
     const addTime4December =
         ':nth-child(2) > :nth-child(1) > .column > .q-btn > .q-btn__content > .q-icon';
-    const entryType = 'data-cy="entryType"';
+    const entryType = '.q-field_control-container > [data-cy="entryType"]';
+    const entryHour = '.q-field_control-container > [data-cy="entryHour"]';
     const entryIn = 'in';
     const entryMiddle = 'middle';
     const entryOut = 'out';
+
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');

From 88eacb5e1f645df82dbfad8ac755ee27fd14f235 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Feb 2025 13:15:01 +0100
Subject: [PATCH 13/25] fix: refs #8583 workerBusiness test

---
 test/cypress/integration/worker/workerBusiness.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 71fd6b347..e37a6bea3 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -6,10 +6,11 @@ describe('WorkerCreate', () => {
     const saveBtn = '.q-mt-lg > .q-btn--standard';
 
     const internalWithOutPay = {
-        Fi: { val: '78457139E' },
-        'Web user': { val: 'manolo' },
-        Name: { val: 'Manolo' },
-        'Last name': { val: 'Hurtado' },
+        'Start Date': { val: '26-12-2002', type: 'date' },
+        Company: { val: 1, type: 'select' },
+        Department: { val: 'Reciclaje', type: 'select' },
+        'Professional Category': { val: 1, type: 'select' },
+
         'Personal email': { val: 'manolo@mydomain.com' },
         Company: { val: 'VNL', type: 'select' },
         Street: { val: 'S/ DEFAULTWORKERSTREET' },

From 159d835bf4ca1d2f5bf3a4e931ad22ab11cbe25e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Feb 2025 07:26:47 +0100
Subject: [PATCH 14/25] fix: refs #8583 wBusiness e2e

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

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index e37a6bea3..a46450e82 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -10,8 +10,8 @@ describe('WorkerCreate', () => {
         Company: { val: 1, type: 'select' },
         Department: { val: 'Reciclaje', type: 'select' },
         'Professional Category': { val: 1, type: 'select' },
-
-        'Personal email': { val: 'manolo@mydomain.com' },
+        'Work Calendar': { val: 1, type: 'select' },
+        'Work Center': { val: 1, type: 'select' },
         Company: { val: 'VNL', type: 'select' },
         Street: { val: 'S/ DEFAULTWORKERSTREET' },
         Location: { val: 1, type: 'select' },

From 8a984a79880de9143ac9eb007863906f1ff15bff Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 3 Mar 2025 13:05:41 +0100
Subject: [PATCH 15/25] fix: refs #8583 workerBusiness test

---
 .../integration/worker/workerBusiness.spec.js | 83 ++++++-------------
 1 file changed, 25 insertions(+), 58 deletions(-)

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index a46450e82..abf591d68 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -1,75 +1,42 @@
-describe('WorkerCreate', () => {
-    const externalRadio = '.q-radio:nth-child(2)';
-    const developerBossId = 120;
-    const payMethodCross =
-        ':nth-child(9) > .q-select > .q-field__inner > .q-field__control > :nth-child(2)';
+describe('WorkerBusiness', () => {
     const saveBtn = '.q-mt-lg > .q-btn--standard';
 
-    const internalWithOutPay = {
+    const Business = {
         'Start Date': { val: '26-12-2002', type: 'date' },
-        Company: { val: 1, type: 'select' },
-        Department: { val: 'Reciclaje', type: 'select' },
-        'Professional Category': { val: 1, type: 'select' },
-        'Work Calendar': { val: 1, type: 'select' },
-        'Work Center': { val: 1, type: 'select' },
-        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' },
-        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' },
-        'Pay method': { val: 1, type: 'select' },
-        Phone: { val: '123456789' },
-        'Worker code': { val: 'DWW' },
-        Boss: { val: developerBossId, type: 'select' },
-        Birth: { val: '11-12-2022', type: 'date' },
-    };
-    const external = {
-        Fi: { val: 'Z4531219V' },
-        'Web user': { val: 'pepe' },
-        Name: { val: 'PEPE' },
-        'Last name': { val: 'GARCIA' },
-        'Personal email': { val: 'pepe@gmail.com' },
-        'Worker code': { val: 'PG' },
-        Boss: { val: developerBossId, type: 'select' },
+        Company: { val: `VNL`, type: 'select' },
+        Department: { val: `RECICLAJE`, type: 'select' },
+        'Professional Category': { val: `employee`, type: 'select' },
+        'Work Calendar': { val: `General schedule`, type: 'select' },
+        'Work Center': { val: `Silla`, type: 'select' },
+        'Contract Category': { val: `INFORMATICA`, type: 'select' },
+        'Contribution Code': { val: `Representantes de comercio`, type: 'select' },
+        'Contract Type': { val: `INDEFINIDO A TIEMPO COMPLETO`, type: 'select' },
+        'Transport Workers Salary': { val: `1000` },
     };
 
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('hr');
-        cy.visit('/#/worker/list');
+        cy.visit('/#/worker/1107/business');
         cy.get('.q-page-sticky > div > .q-btn').click();
     });
 
     it('should throw an error if a pay method has not been selected', () => {
-        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);
+        cy.fillInForm(Business);
         cy.get(saveBtn).click();
         cy.checkNotification('Data created');
     });
 
-    it('should create an external', () => {
-        cy.get(externalRadio).click();
-        cy.fillInForm(external);
-        cy.get(saveBtn).click();
-        cy.checkNotification('Data created');
-    });
+    // it('should create an internal', () => {
+    //     cy.fillInForm(internal);
+    //     cy.get(saveBtn).click();
+    //     cy.checkNotification('Data created');
+    // });
+
+    // it('should create an external', () => {
+    //     cy.get(externalRadio).click();
+    //     cy.fillInForm(external);
+    //     cy.get(saveBtn).click();
+    //     cy.checkNotification('Data created');
+    // });
 });

From 5c5dcb1d35c0d1c8203c9fe3a1222d367a68f486 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 3 Mar 2025 13:46:30 +0100
Subject: [PATCH 16/25] fix: refs #8583 workerBusiness e2e

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

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index abf591d68..01da0315f 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -1,5 +1,7 @@
 describe('WorkerBusiness', () => {
     const saveBtn = '.q-mt-lg > .q-btn--standard';
+    const contributionCode = `Representantes de comercio`;
+    const contractType = `INDEFINIDO A TIEMPO COMPLETO`;
 
     const Business = {
         'Start Date': { val: '26-12-2002', type: 'date' },
@@ -9,8 +11,8 @@ describe('WorkerBusiness', () => {
         'Work Calendar': { val: `General schedule`, type: 'select' },
         'Work Center': { val: `Silla`, type: 'select' },
         'Contract Category': { val: `INFORMATICA`, type: 'select' },
-        'Contribution Code': { val: `Representantes de comercio`, type: 'select' },
-        'Contract Type': { val: `INDEFINIDO A TIEMPO COMPLETO`, type: 'select' },
+        'Contribution Code': { val: contributionCode, type: 'select' },
+        'Contract Type': { val: contractType, type: 'select' },
         'Transport Workers Salary': { val: `1000` },
     };
 
@@ -22,7 +24,10 @@ describe('WorkerBusiness', () => {
     });
 
     it('should throw an error if a pay method has not been selected', () => {
-        cy.fillInForm(Business);
+        // cy.fillInForm(...Business);
+        cy.fillInForm({
+            ...Business,
+        });
         cy.get(saveBtn).click();
         cy.checkNotification('Data created');
     });

From f96dc7345ffc0f224f78b384b378d68ee09c1fc9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 3 Mar 2025 14:06:11 +0100
Subject: [PATCH 17/25] fix: refs #8583 workerBusiness

---
 test/cypress/integration/worker/workerBusiness.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 01da0315f..35a6ea045 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -12,6 +12,7 @@ describe('WorkerBusiness', () => {
         'Work Center': { val: `Silla`, type: 'select' },
         'Contract Category': { val: `INFORMATICA`, type: 'select' },
         'Contribution Code': { val: contributionCode, type: 'select' },
+        Rate: { val: `5` },
         'Contract Type': { val: contractType, type: 'select' },
         'Transport Workers Salary': { val: `1000` },
     };

From 3e8ff15c64d38b873211b7e969efc84f69207592 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Mar 2025 06:02:59 +0100
Subject: [PATCH 18/25] fix: refs #8583 workerBusiness

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

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 35a6ea045..03142f53e 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -24,7 +24,7 @@ describe('WorkerBusiness', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
     });
 
-    it('should throw an error if a pay method has not been selected', () => {
+    it('should create a business', () => {
         // cy.fillInForm(...Business);
         cy.fillInForm({
             ...Business,

From 1c8f3c6c31a6bf59248f828025cc09e0a48d1fd9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Mar 2025 13:41:45 +0100
Subject: [PATCH 19/25] fix: refs #8583 remove workerTimeControl

---
 .../worker/workerTimeControl.spec.js          | 36 -------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 test/cypress/integration/worker/workerTimeControl.spec.js

diff --git a/test/cypress/integration/worker/workerTimeControl.spec.js b/test/cypress/integration/worker/workerTimeControl.spec.js
deleted file mode 100644
index ddc151ae1..000000000
--- a/test/cypress/integration/worker/workerTimeControl.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-describe('WorkerTimeControl', () => {
-    const pastMonth = '.nav-container > .row > :nth-child(1)';
-    const pastDay =
-        '[aria-label="Monday, December 4, 2000"][style="min-width: 32.2857px; max-width: 32.2857px; width: 32.2857px;"] > .q-calendar-month__day--label__wrapper > .q-calendar-month__day--label';
-    const addTime4December =
-        ':nth-child(2) > :nth-child(1) > .column > .q-btn > .q-btn__content > .q-icon';
-    const entryType = '.q-field_control-container > [data-cy="entryType"]';
-    const entryHour = '.q-field_control-container > [data-cy="entryHour"]';
-    const entryIn = 'in';
-    const entryMiddle = 'middle';
-    const entryOut = 'out';
-
-    beforeEach(() => {
-        cy.viewport(1280, 720);
-        cy.login('developer');
-        cy.visit('/#/worker/1107/time-control');
-    });
-
-    it('should add some entries', () => {
-        cy.get(pastMonth).click();
-        cy.get(pastDay).click();
-        cy.get(addTime4December).click();
-        cy.get(entryType).type(entryIn);
-        cy.saveCard();
-    });
-
-    // it('should try descriptors', () => {
-    //     cy.waitForElement('.summaryHeader');
-    //     cy.get(departmentDescriptor).click();
-    //     cy.get('.descriptor').should('be.visible');
-    //     cy.get('.q-item > .q-item__label').should('include.text', '43');
-    //     cy.get(roleDescriptor).click();
-    //     cy.get('.descriptor').should('be.visible');
-    //     cy.get('.q-item > .q-item__label').should('include.text', '19');
-    // });
-});

From cbc907a54bbf5730ce24b25c2442242beaf41caf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Mar 2025 13:46:57 +0100
Subject: [PATCH 20/25] fix: refs #8583 wBusiness

---
 .../integration/worker/workerBusiness.spec.js      | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 03142f53e..256ca9719 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -25,24 +25,10 @@ describe('WorkerBusiness', () => {
     });
 
     it('should create a business', () => {
-        // cy.fillInForm(...Business);
         cy.fillInForm({
             ...Business,
         });
         cy.get(saveBtn).click();
         cy.checkNotification('Data created');
     });
-
-    // it('should create an internal', () => {
-    //     cy.fillInForm(internal);
-    //     cy.get(saveBtn).click();
-    //     cy.checkNotification('Data created');
-    // });
-
-    // it('should create an external', () => {
-    //     cy.get(externalRadio).click();
-    //     cy.fillInForm(external);
-    //     cy.get(saveBtn).click();
-    //     cy.checkNotification('Data created');
-    // });
 });

From 2b3308bde7222888edbf5cc3988c07586cdf1182 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 7 Mar 2025 07:15:41 +0100
Subject: [PATCH 21/25] fix: refs #8583 workerE2E

---
 src/pages/Worker/Card/WorkerPit.vue           | 12 +++++++-
 .../worker/workerBasicData.spec.js            | 11 ++------
 .../integration/worker/workerNotes.spec.js    |  5 ----
 .../integration/worker/workerOperator.spec.js |  8 +++---
 .../integration/worker/workerPit.spec.js      | 28 +++++--------------
 5 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 3de60d6a0..cb07c1f1d 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -68,8 +68,14 @@ const deleteRelative = async (id) => {
                         :label="t('familySituation')"
                         clearable
                         v-model="data.familySituation"
+                        data-cy="familySituation"
+                    />
+                    <VnInput
+                        :label="t('spouseNif')"
+                        clearable
+                        v-model="data.spouseNif"
+                        data-cy="spouseNif"
                     />
-                    <VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
                 </VnRow>
                 <VnRow>
                     <VnSelect
@@ -93,11 +99,13 @@ const deleteRelative = async (id) => {
                         clearable
                         v-model="data.childPension"
                         :label="t(`childPension`)"
+                        data-cy="childPension"
                     />
                     <VnInput
                         clearable
                         v-model="data.spousePension"
                         :label="t(`spousePension`)"
+                        data-cy="spousePension"
                     />
                 </VnRow>
                 <VnRow wrap>
@@ -190,12 +198,14 @@ const deleteRelative = async (id) => {
                                 type="number"
                                 v-model="row.birthed"
                                 :label="t(`birthed`)"
+                                data-cy="birthed"
                             />
 
                             <VnInput
                                 type="number"
                                 v-model="row.adoptionYear"
                                 :label="t(`adoptionYear`)"
+                                data-cy="adoptionYear"
                             />
                             <QCheckbox
                                 v-model="row.isDependend"
diff --git a/test/cypress/integration/worker/workerBasicData.spec.js b/test/cypress/integration/worker/workerBasicData.spec.js
index 3a7edc765..cf452a044 100644
--- a/test/cypress/integration/worker/workerBasicData.spec.js
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@@ -1,9 +1,4 @@
 describe('WorkerBasicData', () => {
-    const maritalStatusSelect = '[data-cy="MaritalStatus"]';
-    const countrySelect = '[data-cy="country"]';
-    const country = 'Alemania';
-    const nif = '42572374H';
-    const fi = '[data-cy="fi"]';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -11,9 +6,9 @@ describe('WorkerBasicData', () => {
     });
 
     it('should modify worker summary', () => {
-        cy.get(maritalStatusSelect).type('Married');
-        cy.get(fi).type(nif);
-        cy.get(countrySelect).type(country);
+        cy.dataCy('MaritalStatus').type('Married');
+        cy.dataCy('fi').type('42572374H');
+        cy.dataCy('country').type('Alemania');
         cy.saveCard();
         cy.checkNotification('Data saved');
     });
diff --git a/test/cypress/integration/worker/workerNotes.spec.js b/test/cypress/integration/worker/workerNotes.spec.js
index 09083c25d..661314ac9 100644
--- a/test/cypress/integration/worker/workerNotes.spec.js
+++ b/test/cypress/integration/worker/workerNotes.spec.js
@@ -1,11 +1,6 @@
 /// <reference types="cypress" />
 describe('WorkerNotes', () => {
     const userId = 1106;
-    const addNote = '[data-cy="addNote"]';
-    const numberOfWagons = '[data-cy="numberOfWagons"]';
-    const linesLimit = '[data-cy="linesLimit"]';
-    const volumeLimit = '[data-cy="volumeLimit"]';
-    const sizeLimit = '[data-cy="sizeLimit"]';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
diff --git a/test/cypress/integration/worker/workerOperator.spec.js b/test/cypress/integration/worker/workerOperator.spec.js
index 9248b229c..93961072b 100644
--- a/test/cypress/integration/worker/workerOperator.spec.js
+++ b/test/cypress/integration/worker/workerOperator.spec.js
@@ -13,10 +13,10 @@ describe('WorkerOperator', () => {
     });
 
     it('should fill the operator form', () => {
-        cy.get(numberOfWagons).type(nWagons);
-        cy.get(linesLimit).type('6');
-        cy.get(volumeLimit).type('3');
-        cy.get(sizeLimit).type('3');
+        cy.dataCy('numberOfWagons').type(nWagons);
+        cy.dataCy('linesLimit').type('6');
+        cy.get('volumeLimit').type('3');
+        cy.get('sizeLimit').type('3');
         cy.saveCard();
 
         cy.checkNotification('Data saved');
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index 19cbebc20..04f232648 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -1,19 +1,5 @@
 describe('WorkerPit', () => {
-    const familySituationInput = '[data-cy="Family Situation_input"]';
-    const familySituation = '1';
-    const childPensionInput = '[data-cy="Child Pension_input"]';
-    const childPension = '120';
-    const spouseNifInput = '[data-cy="Spouse Pension_input"]';
-    const spouseNif = '65117125P';
-    const spousePensionInput = '[data-cy="Spouse Pension_input"]';
-    const spousePension = '120';
     const addRelative = '[data-cy="addRelative"]';
-    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"]';
-    const adoptionYear = '2004';
     const saveRelative = '[data-cy="workerPitRelativeSaveBtn"]';
     const savePIT = '#st-actions > .q-btn-group > .q-btn--standard';
 
@@ -24,15 +10,15 @@ describe('WorkerPit', () => {
     });
 
     it('complete PIT', () => {
-        cy.get(familySituationInput).type(familySituation);
-        cy.get(childPensionInput).type(childPension);
-        cy.get(spouseNifInput).type(spouseNif);
-        cy.get(spousePensionInput).type(spousePension);
+        cy.dataCy('familySituation').type('1');
+        cy.dataCy('childPension').type('120');
+        cy.dataCy('spouseNif').type('65117125P');
+        cy.dataCy('spousePension').type('120');
         cy.get(savePIT).click();
         cy.get(addRelative).click();
-        cy.get(isDescendantSelect).type(Descendant);
-        cy.get(birthedInput).type(birthed);
-        cy.get(adoptionYearInput).type(adoptionYear);
+        cy.dataCy('Descendant/Ascendant').type('Descendiente');
+        cy.dataCy('birthed').type('2002');
+        cy.dataCy('adoptionYear').type('2004');
         cy.get(saveRelative).click();
     });
 });

From 4c7653d77d6b390f79087568ded48795fbe6a258 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 7 Mar 2025 07:32:53 +0100
Subject: [PATCH 22/25] fix: refs #8583 dataCy operator

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

diff --git a/test/cypress/integration/worker/workerOperator.spec.js b/test/cypress/integration/worker/workerOperator.spec.js
index 93961072b..95839aeba 100644
--- a/test/cypress/integration/worker/workerOperator.spec.js
+++ b/test/cypress/integration/worker/workerOperator.spec.js
@@ -1,11 +1,6 @@
 /// <reference types="cypress" />
 describe('WorkerOperator', () => {
     const userId = 1106;
-    const nWagons = '4';
-    const numberOfWagons = '[data-cy="numberOfWagons"]';
-    const linesLimit = '[data-cy="linesLimit"]';
-    const volumeLimit = '[data-cy="volumeLimit"]';
-    const sizeLimit = '[data-cy="sizeLimit"]';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('hr');
@@ -13,10 +8,10 @@ describe('WorkerOperator', () => {
     });
 
     it('should fill the operator form', () => {
-        cy.dataCy('numberOfWagons').type(nWagons);
+        cy.dataCy('numberOfWagons').type('4');
         cy.dataCy('linesLimit').type('6');
-        cy.get('volumeLimit').type('3');
-        cy.get('sizeLimit').type('3');
+        cy.dataCy('volumeLimit').type('3');
+        cy.dataCy('sizeLimit').type('3');
         cy.saveCard();
 
         cy.checkNotification('Data saved');

From 434696581b65e7be859d1e51a71eada531887441 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 10 Mar 2025 09:10:56 +0100
Subject: [PATCH 23/25] refactor: refs #8197 rename VnCardBeta to VnCard

---
 src/components/common/VnCard.vue              | 67 +++++++----------
 src/components/common/VnCardBeta.vue          | 74 -------------------
 src/pages/Account/Alias/Card/AliasCard.vue    |  4 +-
 src/pages/Account/Card/AccountCard.vue        |  4 +-
 src/pages/Account/Role/Card/RoleCard.vue      |  4 +-
 src/pages/Claim/Card/ClaimCard.vue            |  4 +-
 src/pages/Customer/Card/CustomerCard.vue      |  4 +-
 src/pages/Entry/Card/EntryCard.vue            |  4 +-
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  4 +-
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue  |  4 +-
 src/pages/Item/Card/ItemCard.vue              |  4 +-
 src/pages/Item/ItemType/Card/ItemTypeCard.vue |  4 +-
 src/pages/Order/Card/OrderCard.vue            |  4 +-
 src/pages/Route/Agency/Card/AgencyCard.vue    |  4 +-
 src/pages/Route/Card/RouteCard.vue            |  4 +-
 src/pages/Route/Roadmap/RoadmapCard.vue       |  4 +-
 src/pages/Route/Vehicle/Card/VehicleCard.vue  |  4 +-
 src/pages/Shelving/Card/ShelvingCard.vue      |  4 +-
 .../Shelving/Parking/Card/ParkingCard.vue     |  4 +-
 src/pages/Supplier/Card/SupplierCard.vue      |  4 +-
 src/pages/Ticket/Card/TicketCard.vue          |  4 +-
 src/pages/Travel/Card/TravelCard.vue          |  4 +-
 src/pages/Wagon/Card/WagonCard.vue            |  4 +-
 src/pages/Worker/Card/WorkerCard.vue          |  4 +-
 .../Worker/Department/Card/DepartmentCard.vue |  4 +-
 src/pages/Zone/Card/ZoneCard.vue              |  4 +-
 26 files changed, 74 insertions(+), 163 deletions(-)
 delete mode 100644 src/components/common/VnCardBeta.vue

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 44002c22a..620dc2ad2 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,50 +1,56 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import RightMenu from 'components/common/RightMenu.vue';
+
 const props = defineProps({
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
-    idInWhere: { type: Boolean, default: false },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
 });
 
 const stateStore = useStateStore();
-const route = useRoute();
 const router = useRouter();
-const searchRightDataKey = computed(() => {
-    if (!props.searchDataKey) return route.name;
-    return props.searchDataKey;
-});
-
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     userFilter: props.filter,
     oneRecord: true,
 });
 
+onBeforeRouteLeave(() => {
+    stateStore.cardDescriptorChangeValue(null);
+});
+
 onBeforeMount(async () => {
+    stateStore.cardDescriptorChangeValue(props.descriptor);
+
+    const route = router.currentRoute.value;
     try {
         await fetch(route.params.id);
     } catch {
-        const { matched: matches } = router.currentRoute.value;
+        const { matched: matches } = route;
         const { path } = matches.at(-1);
         router.push({ path: path.replace(/:id.*/, '') });
     }
 });
 
 onBeforeRouteUpdate(async (to, from) => {
+    if (hasRouteParam(to.params)) {
+        const { matched } = router.currentRoute.value;
+        const { name } = matched.at(-3);
+        if (name) {
+            router.push({ name, params: to.params });
+        }
+    }
     const id = to.params.id;
     if (id !== from.params.id) await fetch(id, true);
 });
@@ -56,34 +62,13 @@ async function fetch(id, append = false) {
     else arrayData.store.url = props.url.replace(regex, `/${id}`);
     await arrayData.fetch({ append, updateRouter: false });
 }
+function hasRouteParam(params, valueToCheck = ':addressId') {
+    return Object.values(params).includes(valueToCheck);
+}
 </script>
 <template>
-    <QDrawer
-        v-model="stateStore.leftDrawer"
-        show-if-above
-        :width="256"
-        v-if="stateStore.isHeaderMounted()"
-    >
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
-    </slot>
-    <RightMenu>
-        <template #right-panel v-if="props.filterPanel">
-            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
-        </template>
-    </RightMenu>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="$route.path" />
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnSubToolbar />
+    <div :class="[useCardSize(), $attrs.class]">
+        <RouterView :key="$route.path" />
+    </div>
 </template>
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
deleted file mode 100644
index 620dc2ad2..000000000
--- a/src/components/common/VnCardBeta.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<script setup>
-import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-import VnSubToolbar from '../ui/VnSubToolbar.vue';
-
-const props = defineProps({
-    dataKey: { type: String, required: true },
-    url: { type: String, default: undefined },
-    idInWhere: { type: Boolean, default: false },
-    filter: { type: Object, default: () => {} },
-    descriptor: { type: Object, required: true },
-    filterPanel: { type: Object, default: undefined },
-    searchDataKey: { type: String, default: undefined },
-    searchbarProps: { type: Object, default: undefined },
-    redirectOnError: { type: Boolean, default: false },
-});
-
-const stateStore = useStateStore();
-const router = useRouter();
-const arrayData = useArrayData(props.dataKey, {
-    url: props.url,
-    userFilter: props.filter,
-    oneRecord: true,
-});
-
-onBeforeRouteLeave(() => {
-    stateStore.cardDescriptorChangeValue(null);
-});
-
-onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(props.descriptor);
-
-    const route = router.currentRoute.value;
-    try {
-        await fetch(route.params.id);
-    } catch {
-        const { matched: matches } = route;
-        const { path } = matches.at(-1);
-        router.push({ path: path.replace(/:id.*/, '') });
-    }
-});
-
-onBeforeRouteUpdate(async (to, from) => {
-    if (hasRouteParam(to.params)) {
-        const { matched } = router.currentRoute.value;
-        const { name } = matched.at(-3);
-        if (name) {
-            router.push({ name, params: to.params });
-        }
-    }
-    const id = to.params.id;
-    if (id !== from.params.id) await fetch(id, true);
-});
-
-async function fetch(id, append = false) {
-    const regex = /\/(\d+)/;
-    if (props.idInWhere) arrayData.store.filter.where = { id };
-    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-    else arrayData.store.url = props.url.replace(regex, `/${id}`);
-    await arrayData.fetch({ append, updateRouter: false });
-}
-function hasRouteParam(params, valueToCheck = ':addressId') {
-    return Object.values(params).includes(valueToCheck);
-}
-</script>
-<template>
-    <VnSubToolbar />
-    <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="$route.path" />
-    </div>
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index f37bd7d0f..f3faa5bee 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Alias"
         url="MailAliases"
         :descriptor="AliasDescriptor"
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index a5037e301..e102415c7 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
 import filter from './AccountFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         url="VnUsers/preview"
         :id-in-where="true"
         data-key="Account"
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index ef5b9db04..43ad22b90 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         url="VnRoles"
         data-key="Role"
         :id-in-where="true"
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 05f3b53a8..307a6df40 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 import filter from './ClaimFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Claim"
         url="Claims"
         :descriptor="ClaimDescriptor"
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 75fcb98fa..8c70646c1 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Customer"
         :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index be82289f4..50f8b8e55 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import filter from './EntryFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 34cc26437..a1bae87a6 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,5 +1,5 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import { onBeforeRouteUpdate } from 'vue-router';
 import { setRectificative } from '../composables/setRectificative';
@@ -9,7 +9,7 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="InvoiceIn"
         url="InvoiceIns"
         :descriptor="InvoiceInDescriptor"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index a50c9d247..cdb736555 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,10 +1,10 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import filter from './InvoiceOutFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="InvoiceOut"
         url="InvoiceOuts"
         :filter="filter"
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 610b77a02..ddd21fe36 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Item"
         :url="`Items/${$route.params.id}/getCard`"
         :descriptor="ItemDescriptor"
diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index 84e810de5..bd41b1be2 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
 import filter from './ItemTypeFilter.js';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="ItemType"
         url="ItemTypes"
         :filter="filter"
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index ad5c73a87..7dab307a0 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import filter from './OrderFilter.js';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Order"
         url="Orders"
         :filter="filter"
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index 7dc31f8ba..c21298470 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -1,7 +1,7 @@
 <script setup>
 import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
+    <VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
 </template>
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index c178dc6bf..b71f7d088 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,10 +1,10 @@
 <script setup>
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './RouteFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Route"
         url="Routes"
         :filter="filter"
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index 48ba516a1..af08bc9d4 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -1,7 +1,7 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
+    <VnCard data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
 </template>
diff --git a/src/pages/Route/Vehicle/Card/VehicleCard.vue b/src/pages/Route/Vehicle/Card/VehicleCard.vue
index f59420aa2..b6038c24c 100644
--- a/src/pages/Route/Vehicle/Card/VehicleCard.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import VehicleDescriptor from './VehicleDescriptor.vue';
 import VehicleFilter from '../VehicleFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Vehicle"
         url="Vehicles"
         :filter="VehicleFilter"
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index 9e0ac8ad2..e2fb79fb0 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
 import filter from './ShelvingFilter.js';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Shelving"
         url="Shelvings"
         :filter="filter"
diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Shelving/Parking/Card/ParkingCard.vue
index b32c1b7d3..c8b3c60d7 100644
--- a/src/pages/Shelving/Parking/Card/ParkingCard.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingCard.vue
@@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
 import filter from './ParkingFilter.js';
 </script>
 
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Parking"
         url="Parkings"
         :filter="filter"
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index e30f79f96..74b3520bf 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,10 +1,10 @@
 <script setup>
 import SupplierDescriptor from './SupplierDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './SupplierFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Supplier"
         url="Suppliers"
         :descriptor="SupplierDescriptor"
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index e22d5799a..19dbd608c 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import filter from './TicketFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Ticket"
         url="Tickets"
         :descriptor="TicketDescriptor"
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index cb09eafd6..479b47fb9 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,10 +1,10 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './TravelFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Travel"
         url="Travels"
         :descriptor="TravelDescriptor"
diff --git a/src/pages/Wagon/Card/WagonCard.vue b/src/pages/Wagon/Card/WagonCard.vue
index 1694dad7b..19f0a682a 100644
--- a/src/pages/Wagon/Card/WagonCard.vue
+++ b/src/pages/Wagon/Card/WagonCard.vue
@@ -1,6 +1,6 @@
 <script setup>
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Wagon" url="Wagons" :descriptor="{}" />
+    <VnCard data-key="Wagon" url="Wagons" :descriptor="{}" />
 </template>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 3b7a62025..591dadcd2 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,9 +1,9 @@
 <script setup>
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Worker"
         url="Workers/summary"
         :id-in-where="true"
diff --git a/src/pages/Worker/Department/Card/DepartmentCard.vue b/src/pages/Worker/Department/Card/DepartmentCard.vue
index 2e3f11521..0fbc90332 100644
--- a/src/pages/Worker/Department/Card/DepartmentCard.vue
+++ b/src/pages/Worker/Department/Card/DepartmentCard.vue
@@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 205ed074b..2ce4193a0 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,7 +1,7 @@
 <script setup>
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
+    <VnCard data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
 </template>

From 1a824cd36317b297f4943371b32f8b6d84e97813 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 10 Mar 2025 11:39:49 +0100
Subject: [PATCH 24/25] fix: refs #8583 fix AddCard

---
 test/cypress/integration/worker/workerBusiness.spec.js | 2 +-
 test/cypress/integration/worker/workerMutual.spec.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 256ca9719..1650b66c7 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -21,7 +21,7 @@ describe('WorkerBusiness', () => {
         cy.viewport(1280, 720);
         cy.login('hr');
         cy.visit('/#/worker/1107/business');
-        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.addCard();
     });
 
     it('should create a business', () => {
diff --git a/test/cypress/integration/worker/workerMutual.spec.js b/test/cypress/integration/worker/workerMutual.spec.js
index 24ecd3c60..a6d2c5f4f 100644
--- a/test/cypress/integration/worker/workerMutual.spec.js
+++ b/test/cypress/integration/worker/workerMutual.spec.js
@@ -12,7 +12,7 @@ describe('WorkerMutual', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit(`/#/worker/${userId}/medical`);
-        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.addCard();
     });
 
     it('should create a medical Review', () => {

From 18909b429dafc91300f5862367091cd15c7a6c2a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 10 Mar 2025 12:36:19 +0100
Subject: [PATCH 25/25] test(OrderList): fix inconsistency

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

diff --git a/test/cypress/integration/order/orderList.spec.js b/test/cypress/integration/order/orderList.spec.js
index 8b8852a02..c48b317a8 100644
--- a/test/cypress/integration/order/orderList.spec.js
+++ b/test/cypress/integration/order/orderList.spec.js
@@ -34,8 +34,8 @@ describe('OrderList', () => {
         cy.dataCy('Customer ID_input').type('1101{enter}');
         cy.dataCy('vnTableCreateBtn').click();
         cy.dataCy('landedDate').find('input').type('06/01/2001');
-        cy.get(agencyCreateSelect).click();
-        cy.get('.q-menu > div> .q-item:nth-child(1)').click();
+        cy.selectOption(agencyCreateSelect, 1);
+
         cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
         cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
         cy.wait('@orderSale');
@@ -60,8 +60,8 @@ describe('OrderList', () => {
         cy.get(clientCreateSelect).should('have.value', 'Bruce Wayne');
         cy.get(addressCreateSelect).should('have.value', 'Bruce Wayne');
         cy.dataCy('landedDate').find('input').type('06/01/2001');
-        cy.get(agencyCreateSelect).click();
-        cy.get('.q-menu > div> .q-item:nth-child(1)').click();
+        cy.selectOption(agencyCreateSelect, 1);
+
         cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
         cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
         cy.wait('@orderSale');