From ca4f6b2e5e4b2e052bcb22335eb0d784cb889d17 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Dec 2024 23:00:08 +0100
Subject: [PATCH 1/4] test: change id
---
test/cypress/integration/worker/workerCreate.spec.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 50afe1892..555b15597 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -1,7 +1,7 @@
describe('WorkerCreate', () => {
const externalRadio = '.q-radio:nth-child(2)';
const notification = '.q-notification__message';
- const developerBossId = 120;
+ const teamBossId = 13;
const payMethodCross =
'.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
const saveBtn = '.q-mt-lg > .q-btn--standard';
@@ -17,7 +17,7 @@ describe('WorkerCreate', () => {
Location: { val: 1, type: 'select' },
Phone: { val: '123456789' },
'Worker code': { val: 'DWW' },
- Boss: { val: developerBossId, type: 'select' },
+ Boss: { val: teamBossId, type: 'select' },
Birth: { val: '11-12-2022', type: 'date' },
};
const external = {
@@ -27,7 +27,7 @@ describe('WorkerCreate', () => {
'Last name': { val: 'GARCIA' },
'Personal email': { val: 'pepe@gmail.com' },
'Worker code': { val: 'PG' },
- Boss: { val: developerBossId, type: 'select' },
+ Boss: { val: teamBossId, type: 'select' },
};
beforeEach(() => {
--
2.40.1
From 1e88f83f7d43355c4c6f2a1df8b55efca1d79da8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Dec 2024 23:00:59 +0100
Subject: [PATCH 2/4] fix: #8282 VnSelect Woker sortBy
---
src/pages/Worker/WorkerList.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 81b231710..013fa9f0c 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -265,7 +265,8 @@ async function autofillBic(worker) {
v-model="data.bossFk"
url="Workers/search"
option-value="id"
- option-label="name"
+ :fields="['id', 'name', 'nickname', 'code']"
+ sort-by="nickname ASC"
hide-selected
>
<template #option="scope">
@@ -377,5 +378,6 @@ async function autofillBic(worker) {
<i18n>
es:
Search worker: Buscar trabajador
+ Create worker: Crear trabajador
You can search by worker id or name: Puedes buscar por id o nombre del trabajador
</i18n>
--
2.40.1
From 7f4c807fcf68ebf580a7e3a567f55f557c5d784f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Dec 2024 23:41:48 +0100
Subject: [PATCH 3/4] test: #8282 itemFixedPrice
---
src/components/VnTable/VnTable.vue | 1 +
test/cypress/integration/item/ItemFixedPrice.spec.js | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index ea7cf1dda..d9ddb85f6 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -429,6 +429,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
</template>
<template #body="{ rows }">
<QTable
+ data-cy="vnTable"
ref="tableRef"
v-bind="table"
class="vnTable"
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index 824ecf7a0..18111967f 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -48,7 +48,15 @@ describe('Handle Items FixedPrice', () => {
cy.get('#subToolbar > .q-btn--standard').click();
cy.selectOption("[data-cy='field-to-edit']", 'Min price');
cy.dataCy('value-to-edit').find('input').type('1');
- cy.get('.countLines').should('have.text', ' 1 ');
+
+ cy.get('.q-table__bottom > .q-table__control > div').then((row) => {
+ // Asegúrate de que rows sea un objeto iterable
+ const numRows = row.text().match(/(\d+)/);
+ const numSelectedRows = numRows ? parseInt(numRows[1], 10) : 0;
+ cy.log(`Número de filas: ${numSelectedRows}`);
+ // expect(numRows).to.be.greaterThan(0); // Ejemplo de aserción
+ cy.get('.countLines').should('have.text', ` ${numSelectedRows} `);
+ });
cy.get('.q-mt-lg > .q-btn--standard').click();
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
--
2.40.1
From cb0392b1b15f9b6b958b50a451d200f80efbbf13 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Dec 2024 00:32:02 +0100
Subject: [PATCH 4/4] perf: #8282 itemFixedPrice
---
src/pages/Item/ItemFixedPrice.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 09fccfd6d..cc9520b1b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -307,7 +307,7 @@ const openEditTableCellDialog = () => {
const onEditCellDataSaved = async () => {
rowsSelected.value = [];
- tableRef.value.reload();
+ tableRef.value.reload({});
};
const removeFuturePrice = async () => {
@@ -324,7 +324,6 @@ function confirmRemove(item, isFuture) {
component: VnConfirm,
componentProps: {
title: t('globals.rowWillBeRemoved'),
- message: t('globals.confirmDeletion'),
promise,
},
});
--
2.40.1