diff --git a/modules/worker/front/department/basic-data/index.js b/modules/worker/front/department/basic-data/index.js index 31f50ee854..000ef05974 100644 --- a/modules/worker/front/department/basic-data/index.js +++ b/modules/worker/front/department/basic-data/index.js @@ -1,11 +1,10 @@ import ngModule from '../../module'; import Section from 'salix/components/section'; -export default class Controller extends Section {} ngModule.vnComponent('vnWorkerDepartmentBasicData', { template: require('./index.html'), - controller: Controller, + controller: Section, bindings: { department: '<' } diff --git a/modules/worker/front/department/descriptor/index.js b/modules/worker/front/department/descriptor/index.js index 388a7f776b..5ab1059d91 100644 --- a/modules/worker/front/department/descriptor/index.js +++ b/modules/worker/front/department/descriptor/index.js @@ -32,28 +32,6 @@ class Controller extends Descriptor { this.vnApp.showSuccess(this.$t('Department deleted.')); }); } - - loadData() { - const filter = { - fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName', - 'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMail', 'hasToMistake', 'clientFk'], - include: [ - {relation: 'client', - scope: { - fields: ['id', 'name'] - }}, - { - relation: 'worker', - scope: { - fields: ['id', 'firstName', 'lastName'] - } - } - ] - }; - - return this.getData(`Departments/${this.id}`, {filter}) - .then(res => this.entity = res.data); - } } Controller.$inject = ['$element', '$scope', '$rootScope']; diff --git a/modules/worker/front/department/main/index.js b/modules/worker/front/department/main/index.js index 3fda472462..cbdf8689da 100644 --- a/modules/worker/front/department/main/index.js +++ b/modules/worker/front/department/main/index.js @@ -1,9 +1,7 @@ import ngModule from '../../module'; import ModuleMain from 'salix/components/module-main'; -export default class Department extends ModuleMain {} - ngModule.vnComponent('vnWorkerDepartment', { - controller: Department, + controller: ModuleMain, template: require('./index.html') });