From 1dcaba1fdc4960aed89de578d0cf10a90d242041 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 30 May 2023 15:13:16 +0200 Subject: [PATCH] refs #5334 department workers list --- .../worker/front/department/descriptor-popover/index.js | 2 +- modules/worker/front/department/descriptor/index.html | 5 ++++- modules/worker/front/department/descriptor/index.js | 8 ++++++++ modules/worker/front/department/locale/es.yml | 3 ++- modules/worker/front/summary/index.html | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/worker/front/department/descriptor-popover/index.js b/modules/worker/front/department/descriptor-popover/index.js index d4126892f..dfbc2c1fc 100644 --- a/modules/worker/front/department/descriptor-popover/index.js +++ b/modules/worker/front/department/descriptor-popover/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import DescriptorPopover from 'salix/components/descriptor-popover'; class Controller extends DescriptorPopover {} diff --git a/modules/worker/front/department/descriptor/index.html b/modules/worker/front/department/descriptor/index.html index 1ae279ccc..e6128d89f 100644 --- a/modules/worker/front/department/descriptor/index.html +++ b/modules/worker/front/department/descriptor/index.html @@ -30,7 +30,10 @@ value="{{$ctrl.department.worker.firstName}} {{$ctrl.department.worker.secondName}}"> - + + diff --git a/modules/worker/front/department/descriptor/index.js b/modules/worker/front/department/descriptor/index.js index 12545c5fd..8ead3affd 100644 --- a/modules/worker/front/department/descriptor/index.js +++ b/modules/worker/front/department/descriptor/index.js @@ -15,6 +15,14 @@ class Controller extends Descriptor { this.entity = value; } + filterDepartments(department, event) { + if (event.defaultPrevented) return; + event.preventDefault(); + event.stopPropagation(); + + this.$state.go(`worker.index`, + {q: JSON.stringify({departmentFk: department.id})}); + } deleteDepartment() { return this.$http.post(`Departments/${this.id}/setDeleted`) .then(() => this.reload()) diff --git a/modules/worker/front/department/locale/es.yml b/modules/worker/front/department/locale/es.yml index 74dec0c45..64dfe01ee 100644 --- a/modules/worker/front/department/locale/es.yml +++ b/modules/worker/front/department/locale/es.yml @@ -1,4 +1,5 @@ New department: Nuevo departamento Delete department: Eliminar departamento Are you sure you want to delete it?: ¿Seguro que quieres eliminarlo? -Name can't be empty: El nombre esta vacio \ No newline at end of file +Name can't be empty: El nombre esta vacio +Department workers: Trabajadores del departamento \ No newline at end of file diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html index ec30c15a7..89ba4a682 100644 --- a/modules/worker/front/summary/index.html +++ b/modules/worker/front/summary/index.html @@ -31,7 +31,7 @@ - {{::worker.department.department.name}} + {{worker.department.department.name}}