From 6e261b7793648260911acc104cb4b9060af54874 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 3 Jun 2024 14:38:48 +0200 Subject: [PATCH] refs #6553 fix business summary traductions --- src/i18n/locale/en.yml | 23 ++++++---- src/i18n/locale/es.yml | 16 +++++++ src/pages/Worker/Card/WorkerBusiness.vue | 17 +++++++ src/pages/Worker/Card/WorkerSummary.vue | 58 ++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 8 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 5562fea1c..a9be22d7d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -863,15 +863,22 @@ worker: role: Role sipExtension: Extension locker: Locker - fiDueDate: Fecha de caducidad del DNI - sex: Sexo - seniority: Antigüedad + fiDueDate: DNI expiration date + sex: Sex + seniority: Antiquity fi: DNI/NIE/NIF - birth: Fecha de nacimiento - isFreelance: Autónomo - isSsDiscounted: Bonificación SS - hasMachineryAuthorized: Autorizado para llevar maquinaria - isDisable: Trabajador desactivado + birth: Date of birth + isFreelance: Autonomous + isSsDiscounted: Bonus SS + hasMachineryAuthorized: Authorized to carry machinery + isDisable: Disabled worker + business: Business + started: Start Date + ended: End Date + reasonEnd: Reason for Termination + department: Deparment + workerBusinessCategory: Professional Category + notes: Notes notificationsManager: activeNotifications: Active notifications availableNotifications: Available notifications diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 543239bbf..17e61371a 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -861,6 +861,22 @@ worker: role: Rol sipExtension: Extensión locker: Taquilla + fiDueDate: Fecha de caducidad del DNI + sex: Sexo + seniority: Antigüedad + fi: DNI/NIE/NIF + birth: Fecha de nacimiento + isFreelance: Autónomo + isSsDiscounted: Bonificación SS + hasMachineryAuthorized: Autorizado para llevar maquinaria + isDisable: Trabajador desactivado + business: Contrato + started: Fecha de incio + ended: Finalización + reasonEnd: Razón de finalización + department: Departamento + workerBusinessCategory: Categoria profesional + notes: Notas notificationsManager: activeNotifications: Notificaciones activas availableNotifications: Notificaciones disponibles diff --git a/src/pages/Worker/Card/WorkerBusiness.vue b/src/pages/Worker/Card/WorkerBusiness.vue index 172a1a6a1..782772095 100644 --- a/src/pages/Worker/Card/WorkerBusiness.vue +++ b/src/pages/Worker/Card/WorkerBusiness.vue @@ -75,6 +75,7 @@ const columns = computed(() => [ format: ({ started }) => toDate(started), component: VnInputDate, cardVisible: true, + created: true, }, { align: 'left', @@ -83,6 +84,7 @@ const columns = computed(() => [ format: ({ ended }) => toDate(ended), component: VnInputDate, cardVisible: true, + created: true, }, { align: 'left', @@ -95,6 +97,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -119,6 +122,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -131,6 +135,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -143,6 +148,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -155,6 +161,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -179,6 +186,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -199,6 +207,7 @@ const columns = computed(() => [ }, disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -207,6 +216,7 @@ const columns = computed(() => [ component: 'input', disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -215,6 +225,7 @@ const columns = computed(() => [ component: 'input', disable: false, cardVisible: true, + created: true, }, { align: 'left', @@ -232,6 +243,12 @@ const columns = computed(() => [ ref="tableRef" data-key="WorkerBusiness" :url="`Workers/${entityId}/Business`" + :create="{ + urlCreate: `Workers/${entityId}/Business`, + title: 'Create business', + onDataSaved: ({ id }) => tableRef.redirect(id), + formInitialData: {}, + }" order="id DESC" :columns="columns" :user-filter="businessFilter" diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 6d6dde97b..ed7eb5856 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -61,6 +61,31 @@ const filter = { { relation: 'sip', }, + { + relation: 'business', + scope: { + include: [ + { + relation: 'department', + scope: { + fields: ['id', 'name'], + }, + }, + { + relation: 'reasonEnd', + scope: { + fields: ['id', 'reason'], + }, + }, + { + relation: 'workerBusinessProfessionalCategory', + scope: { + fields: ['id', 'description'], + }, + }, + ], + }, + }, ], }; @@ -164,6 +189,39 @@ const filter = { + + + + + + + + + +