From 38ccf464b761e4724c5688a6e01af39a16c07d59 Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 19 Nov 2024 11:52:00 +0100 Subject: [PATCH 1/3] fix: refs #7323 locale #7396 --- src/i18n/locale/en.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index ae7007c32..531b3bc14 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -583,15 +583,15 @@ worker: role: Role sipExtension: Extension locker: Locker - fiDueDate: Fecha de caducidad del DNI - sex: Sexo - seniority: Antigüedad + fiDueDate: FI due date + sex: Sex + seniority: Seniority fi: DNI/NIE/NIF - birth: Fecha de nacimiento - isFreelance: Autónomo + birth: Birth + isFreelance: Freelance isSsDiscounted: Bonificación SS - hasMachineryAuthorized: Autorizado para llevar maquinaria - isDisable: Trabajador desactivado + hasMachineryAuthorized: Machinery authorized + isDisable: Disable notificationsManager: activeNotifications: Active notifications availableNotifications: Available notifications From 1faab668b16baceb6ebec80c9075b1e38ff12acd Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 19 Nov 2024 11:53:33 +0100 Subject: [PATCH 2/3] fix: refs #7323 show advanced fields --- src/i18n/locale/es.yml | 6 +++--- src/pages/Worker/Card/WorkerSummary.vue | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index eb0978ddd..9bfa43c49 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -579,9 +579,9 @@ worker: newWorker: Nuevo trabajador summary: boss: Jefe - phoneExtension: Extensión de teléfono - entPhone: Teléfono de empresa - personalPhone: Teléfono personal + phoneExtension: Ext. de teléfono + entPhone: Tel. de empresa + personalPhone: Tel. personal noBoss: Sin jefe userData: Datos de usuario userId: ID del usuario diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 93866b79f..496f1ca16 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -75,10 +75,10 @@ onBeforeMount(async () => { - + @@ -86,12 +86,12 @@ onBeforeMount(async () => { Date: Tue, 19 Nov 2024 14:14:50 +0100 Subject: [PATCH 3/3] fix: worker test e2e --- src/pages/Worker/WorkerList.vue | 2 +- test/cypress/support/commands.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index 022cecdc6..71df273c1 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -306,7 +306,7 @@ async function autofillBic(worker) { { case 'select': cy.wrap(el).type(val); cy.get('.q-menu .q-item').contains(val).click(); - cy.get('body').click(); break; case 'date': cy.wrap(el).type(val.split('-').join(''));