verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

Refactor
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-03-18 12:55:22 +01:00
parent 934e057a67
commit a9c622377e
44 changed files with 112 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/route/front/log/index.html
View File

@ -1 +1 @@
<vn-log url="RouteLogs" origin-id="$ctrl.$stateParams.id"></vn-log> <vn-log url="RouteLogs" origin-id="$ctrl.$params.id"></vn-log>

2
modules/ticket/front/log/index.html
View File

@ -1 +1 @@
<vn-log url="TicketLogs" origin-id="$ctrl.$stateParams.id"></vn-log> <vn-log url="TicketLogs" origin-id="$ctrl.$params.id"></vn-log>

14
modules/travel/front/basic-data/index.js
View File

@ -1,17 +1,13 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($scope) {
this.$ = $scope;
}
onSubmit() { onSubmit() {
return this.$.watcher.submit().then(() => { return this.$.watcher.submit().then(() =>
this.card.reload(); this.card.reload()
}); );
} }
} }
Controller.$inject = ['$scope'];
ngModule.component('vnTravelBasicData', { ngModule.component('vnTravelBasicData', {
template: require('./index.html'), template: require('./index.html'),

8
modules/travel/front/basic-data/index.spec.js
View File

@ -2,14 +2,14 @@ import './index.js';
describe('Travel Component vnTravelBasicData', () => { describe('Travel Component vnTravelBasicData', () => {
let controller; let controller;
let $scope;
beforeEach(angular.mock.module('travel', $translateProvider => { beforeEach(angular.mock.module('travel', $translateProvider => {
$translateProvider.translations('en', {}); $translateProvider.translations('en', {});
})); }));
beforeEach(angular.mock.inject(($componentController, $rootScope) => { beforeEach(angular.mock.inject($componentController => {
$scope = $rootScope.$new(); const $element = angular.element('<vn-travel-basic-data></vn-travel-basic-data>');
controller = $componentController('vnTravelBasicData', $scope); controller = $componentController('vnTravelBasicData', {$element});
controller.card = {reload: () => {}}; controller.card = {reload: () => {}};
controller.$.watcher = {submit: () => {}}; controller.$.watcher = {submit: () => {}};
})); }));

11
modules/travel/front/create/index.js
View File

@ -2,14 +2,9 @@ import ngModule from '../module';
import Section from 'salix/components/section'; import Section from 'salix/components/section';
class Controller extends Section { class Controller extends Section {
constructor($element, $, $stateParams) {
super($element, $);
this.$stateParams = $stateParams;
}
$onChanges() { $onChanges() {
if (this.$stateParams && this.$stateParams.q) if (this.$params && this.$params.q)
this.travel = JSON.parse(this.$stateParams.q); this.travel = JSON.parse(this.$params.q);
} }
onSubmit() { onSubmit() {
@ -19,8 +14,6 @@ class Controller extends Section {
} }
} }
Controller.$inject = ['$element', '$scope', '$stateParams'];
ngModule.component('vnTravelCreate', { ngModule.component('vnTravelCreate', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller controller: Controller

7
modules/travel/front/create/index.spec.js
View File

@ -2,7 +2,6 @@ import './index';
import watcher from 'core/mocks/watcher'; import watcher from 'core/mocks/watcher';
describe('Travel Component vnTravelCreate', () => { describe('Travel Component vnTravelCreate', () => {
let $element;
let $scope; let $scope;
let $state; let $state;
let controller; let controller;
@ -13,7 +12,7 @@ describe('Travel Component vnTravelCreate', () => {
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$state = _$state_; $state = _$state_;
$scope.watcher = watcher; $scope.watcher = watcher;
$element = angular.element('<div></div>'); const $element = angular.element('<vn-travel-create></vn-travel-create>');
controller = $componentController('vnTravelCreate', {$element, $scope}); controller = $componentController('vnTravelCreate', {$element, $scope});
})); }));
@ -28,8 +27,8 @@ describe('Travel Component vnTravelCreate', () => {
}); });
describe('$onChanges()', () => { describe('$onChanges()', () => {
it('should update the travel data when stateParams.q is defined', () => { it('should update the travel data when $params.q is defined', () => {
controller.$stateParams = {q: '{"ref": 1,"agencyModeFk": 1}'}; controller.$params = {q: '{"ref": 1,"agencyModeFk": 1}'};
const params = {q: '{"ref": 1, "agencyModeFk": 1}'}; const params = {q: '{"ref": 1, "agencyModeFk": 1}'};
const json = JSON.parse(params.q); const json = JSON.parse(params.q);

8
modules/travel/front/descriptor-popover/index.js
View File

@ -2,11 +2,8 @@ import ngModule from '../module';
import Component from 'core/lib/component'; import Component from 'core/lib/component';
class Controller extends Component { class Controller extends Component {
constructor($element, $scope, $http, $timeout, $q) { constructor($element, $) {
super($element, $scope); super($element, $);
this.$timeout = $timeout;
this.$http = $http;
this.$q = $q;
this.travel = null; this.travel = null;
this._quicklinks = {}; this._quicklinks = {};
} }
@ -76,7 +73,6 @@ class Controller extends Component {
}); });
} }
} }
Controller.$inject = ['$element', '$scope', '$http', '$timeout', '$q'];
ngModule.component('vnTravelDescriptorPopover', { ngModule.component('vnTravelDescriptorPopover', {
template: require('./index.html'), template: require('./index.html'),

11
modules/travel/front/descriptor/index.js
View File

@ -1,20 +1,13 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component';
class Controller {
constructor($scope) {
this.$ = $scope;
}
}
Controller.$inject = ['$scope'];
ngModule.component('vnTravelDescriptor', { ngModule.component('vnTravelDescriptor', {
template: require('./index.html'), template: require('./index.html'),
controller: Component,
bindings: { bindings: {
travel: '<' travel: '<'
}, },
require: { require: {
card: '^?vnTravelCard' card: '^?vnTravelCard'
}, },
controller: Controller
}); });

11
modules/travel/front/index/index.js
View File

@ -1,12 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller { export default class Controller extends Section {
constructor($scope, $state) {
this.$ = $scope;
this.ticketSelected = null;
this.$state = $state;
}
getScopeDates(days) { getScopeDates(days) {
const today = new Date(); const today = new Date();
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
@ -66,8 +61,6 @@ export default class Controller {
} }
} }
Controller.$inject = ['$scope', '$state'];
ngModule.component('vnTravelIndex', { ngModule.component('vnTravelIndex', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller controller: Controller

6
modules/travel/front/index/index.spec.js
View File

@ -25,10 +25,10 @@ describe('Travel Component vnTravelIndex', () => {
$translateProvider.translations('en', {}); $translateProvider.translations('en', {});
})); }));
beforeEach(angular.mock.inject((_$componentController_, $rootScope) => { beforeEach(angular.mock.inject(_$componentController_ => {
$componentController = _$componentController_; $componentController = _$componentController_;
let $scope = $rootScope.$new(); const $element = angular.element('<vn-travel-index></vn-travel-index>');
controller = $componentController('vnTravelIndex', $scope); controller = $componentController('vnTravelIndex', {$element});
controller.$.summary = {show: jasmine.createSpy('show')}; controller.$.summary = {show: jasmine.createSpy('show')};
})); }));

2
modules/travel/front/log/index.html
View File

@ -1 +1 @@
<vn-log url="TravelLogs" origin-id="$ctrl.$stateParams.id"></vn-log> <vn-log url="TravelLogs" origin-id="$ctrl.$params.id"></vn-log>

12
modules/travel/front/log/index.js
View File

@ -1,15 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller {
constructor($scope, $stateParams) {
this.$scope = $scope;
this.$stateParams = $stateParams;
}
}
Controller.$inject = ['$scope', '$stateParams'];
ngModule.component('vnTravelLog', { ngModule.component('vnTravelLog', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Section,
}); });

13
modules/travel/front/summary/index.js
View File

@ -1,12 +1,10 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
import Component from 'core/lib/component';
class Controller extends Component { class Controller extends Section {
constructor($element, $, $httpParamSerializer) { $onInit() {
super($element, $);
this.entries = []; this.entries = [];
this.$httpParamSerializer = $httpParamSerializer;
} }
get travel() { get travel() {
@ -50,8 +48,7 @@ class Controller extends Component {
} }
}; };
const serializedParams = this.$httpParamSerializer(params); return this.$http.get(`TravelThermographs`, {params}).then(res => {
return this.$http.get(`TravelThermographs?${serializedParams}`).then(res => {
this.travelThermographs = res.data; this.travelThermographs = res.data;
}); });
} }
@ -66,8 +63,6 @@ class Controller extends Component {
} }
} }
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
ngModule.component('vnTravelSummary', { ngModule.component('vnTravelSummary', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

3
modules/travel/front/summary/index.spec.js
View File

@ -4,7 +4,6 @@ describe('component vnTravelSummary', () => {
let controller; let controller;
let $httpBackend; let $httpBackend;
let $scope; let $scope;
let $element;
let $httpParamSerializer; let $httpParamSerializer;
beforeEach(angular.mock.module('travel', $translateProvider => { beforeEach(angular.mock.module('travel', $translateProvider => {
@ -15,7 +14,7 @@ describe('component vnTravelSummary', () => {
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_; $httpParamSerializer = _$httpParamSerializer_;
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$element = angular.element(`<vn-travel-summary></vn-travel-summary>`); const $element = angular.element(`<vn-travel-summary></vn-travel-summary>`);
controller = $componentController('vnTravelSummary', {$element, $scope}); controller = $componentController('vnTravelSummary', {$element, $scope});
})); }));

14
modules/travel/front/thermograph/create/index.js
View File

@ -1,13 +1,9 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($scope, $http, $state, $translate, vnApp, vnConfig) { constructor($element, $) {
this.$ = $scope; super($element, $);
this.$http = $http;
this.$state = $state;
this.$translate = $translate;
this.vnApp = vnApp;
this.vnConfig = vnConfig;
this.dms = {files: [], state: 'Ok'}; this.dms = {files: [], state: 'Ok'};
} }
@ -86,8 +82,6 @@ class Controller {
} }
} }
Controller.$inject = ['$scope', '$http', '$state', '$translate', 'vnApp', 'vnConfig'];
ngModule.component('vnTravelThermographCreate', { ngModule.component('vnTravelThermographCreate', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

7
modules/travel/front/thermograph/create/index.spec.js
View File

@ -3,7 +3,6 @@ import './index';
describe('Ticket', () => { describe('Ticket', () => {
describe('Component vnTravelThermographCreate', () => { describe('Component vnTravelThermographCreate', () => {
let controller; let controller;
let $scope;
let $httpBackend; let $httpBackend;
let $httpParamSerializer; let $httpParamSerializer;
const travelId = 3; const travelId = 3;
@ -11,11 +10,11 @@ describe('Ticket', () => {
beforeEach(ngModule('travel')); beforeEach(ngModule('travel'));
beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => { beforeEach(angular.mock.inject(($componentController, _$httpBackend_, _$httpParamSerializer_) => {
$scope = $rootScope.$new();
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_; $httpParamSerializer = _$httpParamSerializer_;
controller = $componentController('vnTravelThermographCreate', {$scope}); const $element = angular.element('<vn-travel-thermograph-create></vn-travel-thermograph-create>');
controller = $componentController('vnTravelThermographCreate', {$element});
controller._travel = { controller._travel = {
id: travelId id: travelId
}; };

4
modules/travel/front/thermograph/edit/index.js
View File

@ -1,8 +1,8 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
class Controller extends Component { class Controller extends Section {
get travel() { get travel() {
return this._travel; return this._travel;
} }

3
modules/travel/front/thermograph/edit/index.spec.js
View File

@ -5,7 +5,6 @@ describe('Worker', () => {
describe('Component vnTravelThermographEdit', () => { describe('Component vnTravelThermographEdit', () => {
let controller; let controller;
let $scope; let $scope;
let $element;
let $httpBackend; let $httpBackend;
let $httpParamSerializer; let $httpParamSerializer;
@ -15,7 +14,7 @@ describe('Worker', () => {
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_; $httpParamSerializer = _$httpParamSerializer_;
$element = angular.element(`<vn-travel-thermograph-edit></vn-travel-thermograph-edit`); const $element = angular.element(`<vn-travel-thermograph-edit></vn-travel-thermograph-edit`);
controller = $componentController('vnTravelThermographEdit', {$element, $scope}); controller = $componentController('vnTravelThermographEdit', {$element, $scope});
controller._travel = {id: 3}; controller._travel = {id: 3};
controller.$params = {id: 3, thermographId: 6}; controller.$params = {id: 3, thermographId: 6};

10
modules/travel/front/thermograph/index/index.js
View File

@ -1,11 +1,9 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
import Component from 'core/lib/component';
class Controller extends Component { class Controller extends Section {
constructor($element, $, vnToken) { $onInit() {
super($element, $);
this.accessToken = vnToken.token;
this.filter = { this.filter = {
include: include:
{relation: 'warehouse', {relation: 'warehouse',
@ -33,8 +31,6 @@ class Controller extends Component {
} }
} }
Controller.$inject = ['$element', '$scope', 'vnToken'];
ngModule.component('vnTravelThermographIndex', { ngModule.component('vnTravelThermographIndex', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

8
modules/worker/front/basic-data/index.js
View File

@ -1,16 +1,12 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($) {
Object.assign(this, {$});
}
onSubmit() { onSubmit() {
this.$.watcher.submit() this.$.watcher.submit()
.then(() => this.card.reload()); .then(() => this.card.reload());
} }
} }
Controller.$inject = ['$scope'];
ngModule.component('vnWorkerBasicData', { ngModule.component('vnWorkerBasicData', {
template: require('./index.html'), template: require('./index.html'),

9
modules/worker/front/calendar/index.js
View File

@ -1,10 +1,10 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
class Controller { class Controller extends Section {
constructor($element, $http) { constructor($element, $) {
this.element = $element[0]; super($element, $);
this.$http = $http;
this.date = new Date(); this.date = new Date();
this.events = {}; this.events = {};
} }
@ -103,7 +103,6 @@ class Controller {
dayNumber.style.color = 'rgba(0, 0, 0, 0.7)'; dayNumber.style.color = 'rgba(0, 0, 0, 0.7)';
} }
} }
Controller.$inject = ['$element', '$http'];
ngModule.component('vnWorkerCalendar', { ngModule.component('vnWorkerCalendar', {
template: require('./index.html'), template: require('./index.html'),

8
modules/worker/front/calendar/index.spec.js
View File

@ -4,7 +4,6 @@ describe('Worker', () => {
describe('Component vnWorkerCalendar', () => { describe('Component vnWorkerCalendar', () => {
let $httpBackend; let $httpBackend;
let $scope; let $scope;
let $element;
let controller; let controller;
let year = new Date().getFullYear(); let year = new Date().getFullYear();
@ -13,15 +12,10 @@ describe('Worker', () => {
beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_) => { beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_) => {
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$element = angular.element('<div></div>'); const $element = angular.element('<vn-worker-calencar></vn-worker-calencar>');
controller = $componentController('vnWorkerCalendar', {$element, $scope}); controller = $componentController('vnWorkerCalendar', {$element, $scope});
})); }));
afterEach(() => {
$element.remove();
$scope.$destroy();
});
describe('started property', () => { describe('started property', () => {
it(`should return first day and month of current year`, () => { it(`should return first day and month of current year`, () => {
let started = new Date(year, 0, 1); let started = new Date(year, 0, 1);

12
modules/worker/front/department/index.js
View File

@ -1,13 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($scope, $http, vnApp, $translate) {
this.$ = $scope;
this.$http = $http;
this.vnApp = vnApp;
this.$translate = $translate;
}
$postLink() { $postLink() {
this.$.treeview.fetch(); this.$.treeview.fetch();
} }
@ -87,8 +81,6 @@ class Controller {
} }
} }
Controller.$inject = ['$scope', '$http', 'vnApp', '$translate'];
ngModule.component('vnWorkerDepartment', { ngModule.component('vnWorkerDepartment', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller controller: Controller

8
modules/worker/front/descriptor-popover/index.js
View File

@ -2,11 +2,8 @@ import ngModule from '../module';
import Component from 'core/lib/component'; import Component from 'core/lib/component';
class Controller extends Component { class Controller extends Component {
constructor($element, $scope, $http, $timeout, $q) { constructor($element, $) {
super($element, $scope); super($element, $);
this.$timeout = $timeout;
this.$http = $http;
this.$q = $q;
this.worker = null; this.worker = null;
this._quicklinks = {}; this._quicklinks = {};
} }
@ -84,7 +81,6 @@ class Controller extends Component {
}); });
} }
} }
Controller.$inject = ['$element', '$scope', '$http', '$timeout', '$q'];
ngModule.component('vnWorkerDescriptorPopover', { ngModule.component('vnWorkerDescriptorPopover', {
template: require('./index.html'), template: require('./index.html'),

5
modules/worker/front/descriptor-popover/index.spec.js
View File

@ -5,17 +5,16 @@ describe('worker Component vnWorkerDescriptorPopover', () => {
let $httpParamSerializer; let $httpParamSerializer;
let $scope; let $scope;
let controller; let controller;
let $element;
beforeEach(ngModule('worker')); beforeEach(ngModule('worker'));
beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => { beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_; $httpParamSerializer = _$httpParamSerializer_;
$element = angular.element(`<div></div>`);
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$scope.popover = {relocate: () => {}, show: () => {}}; $scope.popover = {relocate: () => {}, show: () => {}};
controller = $componentController('vnWorkerDescriptorPopover', {$scope, $element}); const $element = angular.element(`<vn-worker-descriptor-popover></vn-worker-descriptor-popover>`);
controller = $componentController('vnWorkerDescriptorPopover', {$element, $scope});
})); }));
describe('workerFk()', () => { describe('workerFk()', () => {

11
modules/worker/front/descriptor/index.js
View File

@ -1,11 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component';
class Controller { class Controller extends Component {
constructor($http, $state) {
this.$state = $state;
this.$http = $http;
}
get worker() { get worker() {
return this._worker; return this._worker;
} }
@ -33,9 +29,6 @@ class Controller {
} }
} }
Controller.$inject = ['$http', '$state'];
ngModule.component('vnWorkerDescriptor', { ngModule.component('vnWorkerDescriptor', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

7
modules/worker/front/dms/create/index.js
View File

@ -1,11 +1,10 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
class Controller extends Component { class Controller extends Section {
constructor($element, $, vnConfig) { constructor($element, $) {
super($element, $); super($element, $);
this.vnConfig = vnConfig;
this.dms = { this.dms = {
files: [], files: [],
hasFile: false, hasFile: false,

4
modules/worker/front/dms/edit/index.js
View File

@ -1,8 +1,8 @@
import ngModule from '../../module'; import ngModule from '../../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
class Controller extends Component { class Controller extends Section {
get worker() { get worker() {
return this._worker; return this._worker;
} }

5
modules/worker/front/dms/index/index.js
View File

@ -3,9 +3,8 @@ import Component from 'core/lib/component';
import './style.scss'; import './style.scss';
class Controller extends Component { class Controller extends Component {
constructor($element, $, vnToken) { constructor($element, $) {
super($element, $); super($element, $);
this.accessToken = vnToken.token;
this.filter = { this.filter = {
include: { include: {
relation: 'dms', relation: 'dms',
@ -68,8 +67,6 @@ class Controller extends Component {
} }
} }
Controller.$inject = ['$element', '$scope', 'vnToken'];
ngModule.component('vnWorkerDmsIndex', { ngModule.component('vnWorkerDmsIndex', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

14
modules/worker/front/index/index.js
View File

@ -1,14 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller { export default class Controller extends Section {
constructor($, $state) {
this.$state = $state;
Object.assign(this, {
$,
selectedWorker: null,
});
}
onSearch(params) { onSearch(params) {
if (params) if (params)
this.$.model.applyFilter(null, params); this.$.model.applyFilter(null, params);
@ -26,7 +19,6 @@ export default class Controller {
this.$.preview.show(); this.$.preview.show();
} }
goToTimeControl(event, workerId) { goToTimeControl(event, workerId) {
if (event.defaultPrevented) return; if (event.defaultPrevented) return;
@ -34,11 +26,11 @@ export default class Controller {
event.stopPropagation(); event.stopPropagation();
this.$state.go('worker.card.timeControl', {id: workerId}, {absolute: true}); this.$state.go('worker.card.timeControl', {id: workerId}, {absolute: true});
} }
onMoreChange(callback) { onMoreChange(callback) {
callback.call(this); callback.call(this);
} }
} }
Controller.$inject = ['$scope', '$state'];
ngModule.component('vnWorkerIndex', { ngModule.component('vnWorkerIndex', {
template: require('./index.html'), template: require('./index.html'),

9
modules/worker/front/log/index.js
View File

@ -1,9 +1,10 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
export default class Controller { export default class Controller extends Section {
constructor($scope) { constructor($element, $) {
this.$ = $scope; super($element, $);
this.actionsText = { this.actionsText = {
'insert': 'Creates', 'insert': 'Creates',
'update': 'Updates', 'update': 'Updates',
@ -70,8 +71,6 @@ export default class Controller {
} }
} }
Controller.$inject = ['$scope'];
ngModule.component('vnLog', { ngModule.component('vnLog', {
controller: Controller, controller: Controller,
template: require('./index.html'), template: require('./index.html'),

4
modules/worker/front/pbx/index.js
View File

@ -1,7 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
class Controller extends Component { class Controller extends Section {
onSubmit() { onSubmit() {
const sip = this.worker.sip; const sip = this.worker.sip;
const params = { const params = {

12
modules/worker/front/summary/index.js
View File

@ -1,13 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($, $http) {
Object.assign(this, {
$,
$http
});
}
get worker() { get worker() {
return this._worker; return this._worker;
} }
@ -60,8 +54,6 @@ class Controller {
} }
} }
Controller.$inject = ['$scope', '$http'];
ngModule.component('vnWorkerSummary', { ngModule.component('vnWorkerSummary', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

5
modules/worker/front/time-control/index.js
View File

@ -1,7 +1,8 @@
import Component from 'core/lib/component';
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
import './style.scss'; import './style.scss';
class Controller extends Component {
class Controller extends Section {
constructor($element, $, vnWeekDays) { constructor($element, $, vnWeekDays) {
super($element, $); super($element, $);
this.weekDays = []; this.weekDays = [];

16
modules/zone/front/basic-data/index.js
View File

@ -1,20 +1,14 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
class Controller { class Controller extends Section {
constructor($scope, $state) {
this.$scope = $scope;
this.$state = $state;
}
onSubmit() { onSubmit() {
this.$scope.watcher.submit().then(() => { this.$.watcher.submit().then(() =>
this.card.reload(); this.card.reload()
}); );
} }
} }
Controller.$inject = ['$scope', '$state'];
ngModule.component('vnZoneBasicData', { ngModule.component('vnZoneBasicData', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

14
modules/zone/front/create/index.js
View File

@ -1,9 +1,8 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller { export default class Controller extends Section {
constructor($scope, $state) { $onInit() {
this.$scope = $scope;
this.$state = $state;
this.zone = { this.zone = {
travelingDays: 0, travelingDays: 0,
price: 0.20, price: 0.20,
@ -13,12 +12,11 @@ export default class Controller {
} }
onSubmit() { onSubmit() {
return this.$scope.watcher.submit().then(res => { return this.$.watcher.submit().then(res =>
this.$state.go('zone.card.location', {id: res.data.id}); this.$state.go('zone.card.location', {id: res.data.id})
}); );
} }
} }
Controller.$inject = ['$scope', '$state'];
ngModule.component('vnZoneCreate', { ngModule.component('vnZoneCreate', {
template: require('./index.html'), template: require('./index.html'),

3
modules/zone/front/create/index.spec.js
View File

@ -19,7 +19,8 @@ describe('Zone Component vnZoneCreate', () => {
} }
}; };
}; };
controller = $componentController('vnZoneCreate', {$scope}); const $element = angular.element('<vn-zone-create></vn-zone-create>');
controller = $componentController('vnZoneCreate', {$element, $scope});
})); }));
describe('onSubmit()', () => { describe('onSubmit()', () => {

12
modules/zone/front/descriptor/index.js
View File

@ -1,10 +1,8 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component';
class Controller { class Controller extends Component {
constructor($scope, $state, $http) { $onInit() {
this.$scope = $scope;
this.$state = $state;
this.$http = $http;
this.moreOptions = [ this.moreOptions = [
{callback: this.deleteZone, name: 'Delete'} {callback: this.deleteZone, name: 'Delete'}
]; ];
@ -15,7 +13,7 @@ class Controller {
} }
deleteZone() { deleteZone() {
this.$scope.deleteZone.show(); this.$.deleteZone.show();
} }
returnDialog(response) { returnDialog(response) {
@ -27,8 +25,6 @@ class Controller {
} }
} }
Controller.$inject = ['$scope', '$state', '$http'];
ngModule.component('vnZoneDescriptor', { ngModule.component('vnZoneDescriptor', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

10
modules/zone/front/index/index.js
View File

@ -1,10 +1,8 @@
import ngModule from '../module'; import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller { export default class Controller extends Section {
constructor($scope, $http, $state) { $onInit() {
this.$scope = $scope;
this.$http = $http;
this.$state = $state;
this.filter = { this.filter = {
include: { include: {
relation: 'agencyMode', relation: 'agencyMode',
@ -73,8 +71,6 @@ export default class Controller {
} }
} }
Controller.$inject = ['$scope', '$http', '$state'];
ngModule.component('vnZoneIndex', { ngModule.component('vnZoneIndex', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller controller: Controller

3
modules/zone/front/index/index.spec.js
View File

@ -8,7 +8,8 @@ describe('Zone Component vnZoneIndex', () => {
beforeEach(angular.mock.inject(_$componentController_ => { beforeEach(angular.mock.inject(_$componentController_ => {
$componentController = _$componentController_; $componentController = _$componentController_;
controller = $componentController('vnZoneIndex'); const $element = angular.element('<vn-zone-index></vn-zone-index>');
controller = $componentController('vnZoneIndex', {$element});
})); }));
describe('exprBuilder()', () => { describe('exprBuilder()', () => {

4
modules/zone/front/location/index.js
View File

@ -1,8 +1,8 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component'; import Section from 'salix/component/section';
import './style.scss'; import './style.scss';
class Controller extends Component { class Controller extends Section {
$postLink() { $postLink() {
this.onSearch(); this.onSearch();
} }

17
modules/zone/front/summary/index.js
View File

@ -1,12 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
class Controller extends Component { class Controller extends Section {
constructor($element, $, $httpParamSerializer) {
super($element, $);
this.$httpParamSerializer = $httpParamSerializer;
}
get zone() { get zone() {
return this._zone; return this._zone;
} }
@ -32,8 +27,7 @@ class Controller extends Component {
} }
} }
}; };
const serializedParams = this.$httpParamSerializer(params); this.$http.get(`Zones/findOne`, {params}).then(res => {
this.$http.get(`Zones/findOne?${serializedParams}`).then(res => {
this.summary = res.data; this.summary = res.data;
}); });
} }
@ -47,15 +41,12 @@ class Controller extends Component {
} }
} }
}; };
const serializedParams = this.$httpParamSerializer(params); this.$http.get(`Zones/${this.zone.id}/warehouses`, {params}).then(res => {
this.$http.get(`Zones/${this.zone.id}/warehouses?${serializedParams}`).then(res => {
this.zoneWarehouses = res.data; this.zoneWarehouses = res.data;
}); });
} }
} }
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
ngModule.component('vnZoneSummary', { ngModule.component('vnZoneSummary', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,

16
modules/zone/front/summary/index.spec.js
View File

@ -1,7 +1,6 @@
import './index'; import './index';
describe('component vnZoneSummary', () => { describe('component vnZoneSummary', () => {
let $element;
let $scope; let $scope;
let controller; let controller;
let $httpBackend; let $httpBackend;
@ -13,7 +12,7 @@ describe('component vnZoneSummary', () => {
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_; $httpParamSerializer = _$httpParamSerializer_;
$scope = $rootScope.$new(); $scope = $rootScope.$new();
$element = angular.element(`<vn-zone-summary></vn-zone-summary>`); const $element = angular.element(`<vn-zone-summary></vn-zone-summary>`);
controller = $componentController('vnZoneSummary', {$element, $scope}); controller = $componentController('vnZoneSummary', {$element, $scope});
})); }));
@ -52,17 +51,4 @@ describe('component vnZoneSummary', () => {
expect(controller.summary).toBeDefined(); expect(controller.summary).toBeDefined();
}); });
}); });
xdescribe('getEntries()', () => {
it('should call the getEntries method to get the entries data', () => {
controller._travel = {id: 999};
const query = `/api/Travels/${controller._travel.id}/getEntries`;
$httpBackend.expectGET(query).respond('I am the entries');
controller.getEntries();
$httpBackend.flush();
expect(controller.entries).toEqual('I am the entries');
});
});
}); });

4
modules/zone/front/warehouses/index.js
View File

@ -1,7 +1,7 @@
import ngModule from '../module'; import ngModule from '../module';
import Component from 'core/lib/component'; import Section from 'salix/components/section';
class Controller extends Component { class Controller extends Section {
constructor($element, $) { constructor($element, $) {
super($element, $); super($element, $);