diff --git a/modules/worker/front/department/basic-data/index.js b/modules/worker/front/department/basic-data/index.js index d9b60c683..d5f988141 100644 --- a/modules/worker/front/department/basic-data/index.js +++ b/modules/worker/front/department/basic-data/index.js @@ -4,10 +4,6 @@ import Section from 'salix/components/section'; class Controller extends Section { constructor($element, $) { super($element, $); - this.maritalStatus = [ - {code: 'M', name: this.$t('Married')}, - {code: 'S', name: this.$t('Single')} - ]; } onSubmit() { return this.$.watcher.submit() diff --git a/modules/worker/front/department/descriptor/index.js b/modules/worker/front/department/descriptor/index.js index 937f4c351..eb6489826 100644 --- a/modules/worker/front/department/descriptor/index.js +++ b/modules/worker/front/department/descriptor/index.js @@ -16,35 +16,19 @@ class Controller extends Descriptor { } loadData() { const filter = { + fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName', + 'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMai', 'hasToMistake', 'clientFk'], include: [ { - relation: 'user', - scope: { - fields: ['name'], - include: { - relation: 'emailUser', - scope: { - fields: ['email'] - } - } - } - }, { relation: 'client', - scope: { - fields: ['fi'] - } - }, { - relation: 'sip', - scope: { - fields: ['extension'] - } + scope: {fields: ['name']} + }, + { + relation: 'worker', + scope: {fields: ['name']} }, { relation: 'department', - scope: { - include: { - relation: 'department' - } - } + scope: {fields: ['name']} } ] }; diff --git a/modules/worker/front/department/summary/index.html b/modules/worker/front/department/summary/index.html index 6b7ded649..979f01dc0 100644 --- a/modules/worker/front/department/summary/index.html +++ b/modules/worker/front/department/summary/index.html @@ -2,9 +2,9 @@
- + {{department.name}}
@@ -12,7 +12,7 @@

+ ui-sref="department.card.basicData({id:$ctrl.worker.department.id})"> Basic data

@@ -24,21 +24,17 @@ - - - {{::worker.boss.nickname}} - + label="Boss department" + value="{{$ctrl.worker.department.workerFk}}"> -