From 25ab5a1b9f3bd5a4111b42b46bb177a208a88699 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 17 Jun 2024 13:55:16 +0200 Subject: [PATCH 1/5] refs #7409 front section --- src/pages/Worker/Card/WorkerBalance.vue | 81 +++++++++++++++++++++++++ src/router/modules/worker.js | 10 +++ 2 files changed, 91 insertions(+) create mode 100644 src/pages/Worker/Card/WorkerBalance.vue diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue new file mode 100644 index 000000000..7491dbb36 --- /dev/null +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js index 384978d13..e67849a59 100644 --- a/src/router/modules/worker.js +++ b/src/router/modules/worker.js @@ -23,6 +23,7 @@ export default { 'WorkerDms', 'WorkerTimeControl', 'WorkerLocker', + 'WorkerBalance', ], departmentCard: ['BasicData'], }, @@ -177,6 +178,15 @@ export default { }, component: () => import('src/pages/Worker/Card/WorkerLocker.vue'), }, + { + name: 'WorkerBalance', + path: 'balance', + meta: { + title: 'balance', + icon: 'balance', + }, + component: () => import('src/pages/Worker/Card/WorkerBalance.vue'), + }, ], }, ], From 0ccfd9ae75422510e4bd7b7b06ab7f82c3cc3144 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 17 Jun 2024 15:50:33 +0200 Subject: [PATCH 2/5] refs #7409 columns trad --- src/i18n/locale/en.yml | 9 ++++++++- src/i18n/locale/es.yml | 8 ++++++++ src/pages/Worker/Card/WorkerBalance.vue | 11 ++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 2b46649e1..86e330d5d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -830,7 +830,7 @@ worker: calendar: Calendar timeControl: Time control locker: Locker - + balance: Balance list: name: Name email: Email @@ -901,6 +901,13 @@ worker: iban: IBAN bankEntity: Swift / BIC imageNotFound: Image not found + balance: + tableVisibleColumns: + paymentDate: Date + incomeType: Type + debit: Debt + credit: Have + concept: Concept wagon: pageTitles: wagons: Wagons diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index a8b9ecd51..94aed4cc6 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -828,6 +828,7 @@ worker: calendar: Calendario timeControl: Control de horario locker: Taquilla + balance: Balance list: name: Nombre email: Email @@ -889,6 +890,13 @@ worker: iban: IBAN bankEntity: Swift / BIC imageNotFound: No se ha encontrado la imagen + balance: + tableVisibleColumns: + paymentDate: Fecha + incomeType: Tipo + debit: Debe + credit: Haber + concept: Concepto wagon: pageTitles: wagons: Vagones diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 7491dbb36..6a76856d5 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -59,12 +59,12 @@ const columns = computed(() => [ + + + es: + Create workerIncomes: Crear + From ac28a6728aaf5888df32bb3452f04b6f10ca9dc2 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 19 Jun 2024 08:41:36 +0200 Subject: [PATCH 3/5] refs #7409 change icon --- src/router/modules/customer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index 3aece0dfe..9e3b39479 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -274,7 +274,7 @@ export default { name: 'CustomerBalance', meta: { title: 'balance', - icon: 'vn:invoice', + icon: 'balance', }, component: () => import('src/pages/Customer/Card/CustomerBalance.vue'), From 0107c2178974f0f633e9272314aab1a3409419ae Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 21 Jun 2024 09:57:01 +0200 Subject: [PATCH 4/5] refs #7409 fix trad --- src/pages/Worker/Card/WorkerBalance.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 6a76856d5..068438b0e 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -64,7 +64,7 @@ const columns = computed(() => [ save-url="WorkerIncomes/crud" :create="{ urlCreate: 'workerIncomes', - title: t('Create workerIncomes'), + title: t('Create workerBalance'), onDataSaved: () => tableRef.reload(), formInitialData: { workerFk: entityId, @@ -82,5 +82,5 @@ const columns = computed(() => [ es: - Create workerIncomes: Crear + Create workerBalance: Crear balance From 6f2573880c7a42771cc21e9d08b223ab898a6bbc Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 26 Jun 2024 09:59:37 +0200 Subject: [PATCH 5/5] refs #7409 fix balance and formation --- src/pages/Worker/Card/WorkerBalance.vue | 5 +++++ src/pages/Worker/Card/WorkerFormation.vue | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 068438b0e..ad18d61e0 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -16,6 +16,7 @@ const columns = computed(() => [ create: true, component: 'date', field: 'paymentDate', + cardVisible: true, }, { align: 'left', @@ -27,6 +28,7 @@ const columns = computed(() => [ url: 'payrollComponents', fields: ['id', 'name'], }, + cardVisible: true, }, { align: 'left', @@ -35,6 +37,7 @@ const columns = computed(() => [ create: true, component: 'input', field: 'debit', + cardVisible: true, }, { align: 'left', @@ -43,6 +46,7 @@ const columns = computed(() => [ create: true, component: 'input', field: 'credit', + cardVisible: true, }, { align: 'left', @@ -51,6 +55,7 @@ const columns = computed(() => [ create: true, component: 'input', field: 'concept', + cardVisible: true, }, ]); diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue index 52b22a295..0ac97d9ef 100644 --- a/src/pages/Worker/Card/WorkerFormation.vue +++ b/src/pages/Worker/Card/WorkerFormation.vue @@ -35,6 +35,7 @@ const columns = computed(() => [ url: 'TrainingCourseTypes', fields: ['id', 'name'], }, + cardVisible: true, }, { align: 'left', @@ -52,6 +53,7 @@ const columns = computed(() => [ component: 'date', field: 'ended', create: true, + cardVisible: true, }, { align: 'left', @@ -63,6 +65,7 @@ const columns = computed(() => [ url: 'TrainingCenters', fields: ['id', 'name'], }, + cardVisible: true, }, { align: 'left', @@ -78,6 +81,7 @@ const columns = computed(() => [ component: 'input', field: 'amount', create: true, + cardVisible: true, }, { align: 'left',