diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 4cf35d1e9..2255a557c 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -1,20 +1,10 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $, $httpParamSerializer) {
super($element, $);
this.$httpParamSerializer = $httpParamSerializer;
-
- this.moreOptions = [
- {name: 'Simple ticket', callback: this.newTicket},
- {name: 'Send SMS', callback: this.showSMSDialog},
- {name: 'Send consumer report', callback: this.showConsumerReportDialog}
- ];
- }
-
- onMoreChange(callback) {
- callback.call(this);
}
get client() {
@@ -23,7 +13,6 @@ class Controller extends Component {
set client(value) {
this._client = value;
-
if (!value) return;
if (this.$params.sendSMS)
@@ -43,56 +32,37 @@ class Controller extends Component {
};
}
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- newTicket() {
- this.$state.go('ticket.create', {clientFk: this.client.id});
+ get filter() {
+ return this.client ? JSON.stringify({clientFk: this.client.id}) : null;
}
showSMSDialog() {
- const client = this.client;
- const phone = this.$params.phone || client.mobile || client.phone;
- const message = this.$params.message || '';
+ const client = this.client || {};
this.newSMS = {
destinationFk: client.id,
- destination: phone,
- message: message
+ destination: this.$params.phone || client.mobile || client.phone,
+ message: this.$params.message || ''
};
this.$.sms.open();
}
- showConsumerReportDialog() {
- this.$.consumerReportDialog.show();
- }
-
- sendConsumerReport(response) {
- if (response === 'accept') {
- const params = {
- authorization: this.vnToken.token,
- clientId: this.client.id,
- from: this.from,
- to: this.to,
- };
- const serializedParams = this.$httpParamSerializer(params);
- const url = `api/report/campaign-metrics?${serializedParams}`;
- window.open(url);
- }
+ onConsumerReportAccept() {
+ const params = this.$httpParamSerializer({
+ authorization: this.vnToken.token,
+ clientId: this.client.id,
+ from: this.from,
+ to: this.to,
+ });
+ window.open(`api/report/campaign-metrics?${params}`);
}
}
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
-ngModule.component('vnClientDescriptor', {
+ngModule.vnComponent('vnClientDescriptor', {
template: require('./index.html'),
bindings: {
- client: '<',
- quicklinks: '<'
+ client: '<'
},
controller: Controller
});
diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html
index dfd662ba5..78d46f56a 100644
--- a/modules/client/front/sample/index/index.html
+++ b/modules/client/front/sample/index/index.html
@@ -41,8 +41,7 @@
+ vn-id="workerDescriptor">
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor-popover/index.js b/modules/invoiceOut/front/descriptor-popover/index.js
index c530bdd0f..918707fb6 100644
--- a/modules/invoiceOut/front/descriptor-popover/index.js
+++ b/modules/invoiceOut/front/descriptor-popover/index.js
@@ -1,55 +1,20 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $,) {
- super($element, $);
- this.worker = null;
- this._quicklinks = {};
- }
-
- set invoiceOutId(id) {
- if (id == this._invoiceOutId) return;
-
- this._invoiceOutId = id;
- this.invoiceOut = null;
- this.loadData();
- }
-
- get invoiceOutId() {
- return this._invoiceOutId;
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
+class Controller extends DescriptorPopover {
+ get invoiceOut() {
+ return this.entity;
}
loadData() {
- let query = `InvoiceOuts/findOne`;
- let filter = {
- where: {
- id: this._invoiceOutId
- },
+ const filter = {
include: [
{
relation: 'company',
scope: {
fields: ['id', 'code']
}
- },
- {
+ }, {
relation: 'client',
scope: {
fields: ['id', 'name']
@@ -58,20 +23,12 @@ class Controller extends Component {
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.invoiceOut = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+ return this.getData(`InvoiceOuts/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnInvoiceOutDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- invoiceOutId: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnInvoiceOutDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/invoiceOut/front/descriptor-popover/style.scss b/modules/invoiceOut/front/descriptor-popover/style.scss
deleted file mode 100644
index f50481083..000000000
--- a/modules/invoiceOut/front/descriptor-popover/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-vn-ticket-descriptor-popover {
- vn-ticket-descriptor {
- display: block;
- width: 256px;
- max-height: 448px;
-
- & > vn-card {
- margin: 0!important;
- }
- }
-}
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.js b/modules/invoiceOut/front/descriptor/index.js
index b813214bc..fd9f786d3 100644
--- a/modules/invoiceOut/front/descriptor/index.js
+++ b/modules/invoiceOut/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $) {
super($element, $);
this.moreOptions = [
@@ -82,21 +82,12 @@ class Controller extends Component {
.then(() => this.$state.reload())
.then(() => this.vnApp.showSuccess(this.$t('InvoiceOut booked')));
}
-
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
}
-ngModule.component('vnInvoiceOutDescriptor', {
+ngModule.vnComponent('vnInvoiceOutDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
- invoiceOut: '<',
- quicklinks: '<'
- },
- controller: Controller
+ invoiceOut: '<'
+ }
});
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index ad7c363ce..52d296e86 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -29,7 +29,7 @@
+ vn-click-stop="clientDescriptor.show($event, invoiceOut.clientFk)">
{{::invoiceOut.clientSocialName | dashIfEmpty}}
@@ -39,7 +39,7 @@
@@ -47,7 +47,7 @@
diff --git a/modules/invoiceOut/front/index/index.js b/modules/invoiceOut/front/index/index.js
index d5c0fde3a..17eb44fec 100644
--- a/modules/invoiceOut/front/index/index.js
+++ b/modules/invoiceOut/front/index/index.js
@@ -2,30 +2,14 @@ import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller extends Section {
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- event.stopImmediatePropagation();
- }
-
- preview(event, invoiceOut) {
+ preview(invoiceOut) {
this.selectedInvoiceOut = invoiceOut;
this.$.summary.show();
- event.preventDefault();
- event.stopImmediatePropagation();
}
- onDescriptorLoad() {
- this.$.popover.relocate();
- }
-
- openPdf(id, event) {
+ openPdf(id) {
let url = `api/InvoiceOuts/${id}/download?access_token=${this.vnToken.token}`;
window.open(url, '_blank');
- event.preventDefault();
- event.stopImmediatePropagation();
}
}
diff --git a/modules/invoiceOut/front/summary/index.html b/modules/invoiceOut/front/summary/index.html
index 19ceeb3ab..8deb7ddf8 100644
--- a/modules/invoiceOut/front/summary/index.html
+++ b/modules/invoiceOut/front/summary/index.html
@@ -54,14 +54,14 @@
{{ticket.id}}
{{ticket.nickname}}
diff --git a/modules/invoiceOut/front/summary/index.js b/modules/invoiceOut/front/summary/index.js
index 7b9bb9efd..ef76768de 100644
--- a/modules/invoiceOut/front/summary/index.js
+++ b/modules/invoiceOut/front/summary/index.js
@@ -14,29 +14,8 @@ class Controller extends Section {
}
getSummary() {
- this.$http.get(`InvoiceOuts/${this.invoiceOut.id}/summary`).then(response => {
- this.summary = response.data;
- });
- }
-
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- }
-
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- event.preventDefault();
- }
-
- preview(event, invoiceOut) {
- this.selectedInvoiceOut = invoiceOut;
- this.$.invoiceOutSummaryDialog.show();
- event.preventDefault();
+ return this.$http.get(`InvoiceOuts/${this.invoiceOut.id}/summary`)
+ .then(res => this.summary = res.data);
}
}
diff --git a/modules/item/front/descriptor-popover/index.html b/modules/item/front/descriptor-popover/index.html
index 41b4badb4..ccc2b899f 100644
--- a/modules/item/front/descriptor-popover/index.html
+++ b/modules/item/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
+
-
+
diff --git a/modules/item/front/descriptor-popover/index.js b/modules/item/front/descriptor-popover/index.js
index c7a62baae..35918a171 100644
--- a/modules/item/front/descriptor-popover/index.js
+++ b/modules/item/front/descriptor-popover/index.js
@@ -1,77 +1,29 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.item = null;
- this._quicklinks = {};
- }
-
- set itemFk(id) {
- if (id == this._itemFk) return;
-
- this._itemFk = id;
- this.item = null;
+class Controller extends DescriptorPopover {
+ constructor(...args) {
+ super(...args);
this._quicklinks = {
btnThree: {
icon: 'icon-transaction',
- state: `item.card.diary({
- id: ${id},
- })`,
+ state: `item.card.diary({id: $ctrl.id})`,
tooltip: 'Item diary'
}
};
- this.getCard();
- }
-
- set item(value) {
- this._item = value;
- this.$timeout(() => this.$.popover.relocate());
}
get item() {
- return this._item;
+ return this.entity;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
- }
-
- getCard() {
- if (this.canceler)
- this.canceler.resolve();
-
- this.canceler = this.$q.defer();
-
- let options = {timeout: this.canceler.promise};
- this.$http.get(`Items/${this._itemFk}/getCard`, options).then(
- response => {
- this.item = response.data;
- this.canceler = null;
- }
- );
+ loadData() {
+ return this.getData(`Items/${this.id}/getCard`)
+ .then(res => this.entity = res.data);
}
}
-Controller.$inject = ['$element', '$scope'];
-ngModule.component('vnItemDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- itemFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnItemDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/item/front/descriptor-popover/index.spec.js b/modules/item/front/descriptor-popover/index.spec.js
index dfc673b0b..3d9ae3b8f 100644
--- a/modules/item/front/descriptor-popover/index.spec.js
+++ b/modules/item/front/descriptor-popover/index.spec.js
@@ -1,79 +1,29 @@
-import './index.js';
+import './index';
-describe('Item', () => {
- describe('Component vnItemDescriptorPopover', () => {
- let $httpBackend;
- let $scope;
- let controller;
- let $timeout;
+describe('vnItemDescriptorPopover', () => {
+ let controller;
+ let $httpBackend;
- beforeEach(ngModule('item'));
+ beforeEach(ngModule('item'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$timeout_) => {
- $httpBackend = _$httpBackend_;
- $timeout = _$timeout_;
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- const $element = angular.element('![]()
{{::sale.origin | dashIfEmpty}}
@@ -57,9 +57,13 @@
{{::sale.stateName | dashIfEmpty}}
{{::sale.reference | dashIfEmpty}}
-
+
+ {{::sale.name | dashIfEmpty}}
+
+
{{::sale.name | dashIfEmpty}}
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index e77ad1c2c..370039e1f 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -119,10 +119,10 @@ class Controller extends Section {
}
/**
- * Compares a date with the current one
- * @param {Object} date - Date to compare
- * @return {Boolean} - Returns true if the two dates equals
- */
+ * Compares a date with the current one
+ * @param {Object} date - Date to compare
+ * @return {Boolean} - Returns true if the two dates equals
+ */
isToday(date) {
let today = new Date();
today.setHours(0, 0, 0, 0);
@@ -133,30 +133,6 @@ class Controller extends Section {
if (!(today - comparedDate))
return true;
}
-
- showDescriptor(event, sale) {
- if (!sale.isTicket) return;
-
- this.$.descriptor.ticketFk = sale.origin;
- this.$.descriptor.parent = event.target;
- this.$.descriptor.show();
-
- event.preventDefault();
- }
-
- showClientDescriptor(event, sale) {
- if (!sale.isTicket) return;
-
- this.$.clientDescriptor.clientFk = sale.clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
-
- event.preventDefault();
- }
-
- onDescriptorLoad() {
- this.$.popover.relocate();
- }
}
ngModule.component('vnItemDiary', {
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 154c64bb1..0ee6a8815 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -35,15 +35,15 @@
ui-sref="item.card.summary({id: item.id})">
![]()
-
+
{{::item.id | zeroFill:6}}
@@ -73,7 +73,7 @@
+ vn-click-stop="workerDescriptor.show($event, item.buyerFk)">
{{::item.userNickname}}
@@ -87,12 +87,12 @@
@@ -106,18 +106,20 @@
-
+
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js
index ad978e0aa..e852d7985 100644
--- a/modules/item/front/index/index.js
+++ b/modules/item/front/index/index.js
@@ -5,68 +5,25 @@ import './style.scss';
class Controller extends Section {
constructor($element, $) {
super($element, $);
- this.itemSelected = null;
- this.imagesPath = '//verdnatura.es/vn-image-data/catalog';
this.showFields = {
id: false,
actions: false
};
}
- stopEvent(event) {
- event.preventDefault();
- event.stopImmediatePropagation();
- }
-
- showItemDescriptor(event, itemFk) {
- if (event.defaultPrevented) return;
-
- event.preventDefault();
- event.stopPropagation();
-
- this.$.itemDescriptor.itemFk = itemFk;
- this.$.itemDescriptor.parent = event.target;
- this.$.itemDescriptor.show();
- }
-
- showWorkerDescriptor(event, workerFk) {
- if (event.defaltPrevented) return;
-
- event.preventDefault();
- event.stopPropagation();
-
- this.selectedWorker = workerFk;
- this.$.workerDescriptor.parent = event.target;
- this.$.workerDescriptor.show();
- }
-
- cloneItem(event, item) {
- this.stopEvent(event);
- this.itemSelected = item;
- this.$.clone.show();
- }
-
- onCloneAccept(response) {
- if (!(response == 'accept' && this.itemSelected))
- return;
-
- this.$http.post(`Items/${this.itemSelected.id}/clone`).then(res => {
- if (res && res.data && res.data.id)
+ onCloneAccept(itemFk) {
+ return this.$http.post(`Items/${itemFk}/clone`)
+ .then(res => {
this.$state.go('item.card.tags', {id: res.data.id});
- });
-
- this.itemSelected = null;
+ });
}
- preview(event, item) {
- this.stopEvent(event);
+ preview(item) {
this.itemSelected = item;
this.$.preview.show();
}
}
-Controller.$inject = ['$element', '$scope'];
-
ngModule.component('vnItemIndex', {
template: require('./index.html'),
controller: Controller
diff --git a/modules/item/front/index/index.spec.js b/modules/item/front/index/index.spec.js
index de07cd04d..f8cf07fe3 100644
--- a/modules/item/front/index/index.spec.js
+++ b/modules/item/front/index/index.spec.js
@@ -16,43 +16,14 @@ describe('Item', () => {
}));
describe('onCloneAccept()', () => {
- it('should do nothing if response is not accept', () => {
- jest.spyOn(controller.$state, 'go');
-
- let response = 'ERROR!';
- controller.itemSelected = 'check me';
-
- controller.onCloneAccept(response);
-
- expect(controller.$state.go).not.toHaveBeenCalledWith();
- expect(controller.itemSelected).toEqual('check me');
- });
-
- it('should do nothing if response is accept but itemSelected is not defined in the controller', () => {
- jest.spyOn(controller.$state, 'go');
-
- let response = 'accept';
- controller.itemSelected = undefined;
-
- controller.onCloneAccept(response);
-
- expect(controller.$state.go).not.toHaveBeenCalledWith();
- expect(controller.itemSelected).toBeUndefined();
- });
-
it('should perform a post query and then call go() then update itemSelected in the controller', () => {
jest.spyOn(controller.$state, 'go');
- let response = 'accept';
- controller.itemSelected = {id: 1};
-
- $httpBackend.when('POST', `Items/1/clone`).respond({id: 99});
- $httpBackend.expect('POST', `Items/1/clone`);
- controller.onCloneAccept(response);
+ $httpBackend.expectRoute('POST', `Items/:id/clone`).respond({id: 99});
+ controller.onCloneAccept(1);
$httpBackend.flush();
expect(controller.$state.go).toHaveBeenCalledWith('item.card.tags', {id: 99});
- expect(controller.itemSelected).toBeNull();
});
});
});
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index bee9df310..938005828 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -3,8 +3,8 @@
![]()
+ ng-src="{{::$root.imagePath}}/catalog/200x200/{{$ctrl.item.image}}"
+ zoom-image="{{::$root.imagePath}}/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
Visible
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html
index 7a588a464..bc01dcc6c 100644
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@@ -5,8 +5,8 @@
![]()
diff --git a/modules/order/front/descriptor/index.js b/modules/order/front/descriptor/index.js
index b9d1e7973..b60d44e78 100644
--- a/modules/order/front/descriptor/index.js
+++ b/modules/order/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $) {
super($element, $);
this.moreOptions = [
@@ -33,14 +33,6 @@ class Controller extends Component {
return this._order;
}
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
deleteOrder(response) {
if (response === 'accept') {
const params = {id: this.order.id};
@@ -56,10 +48,10 @@ class Controller extends Component {
}
}
-ngModule.component('vnOrderDescriptor', {
+ngModule.vnComponent('vnOrderDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
order: '<'
- },
- controller: Controller
+ }
});
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index b16a1b25d..1633b0ea1 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -27,14 +27,16 @@
ui-sref="order.card.summary({id: {{::order.id}}})">
{{::order.id}}
-
+
{{::order.clientName}}
-
+
{{::order.workerNickname | dashIfEmpty}}
@@ -51,9 +53,9 @@
{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}
+ vn-click-stop="$ctrl.preview(order)"
+ icon="desktop_windows"
+ vn-tooltip="Preview">
@@ -72,10 +74,11 @@
vn-id="clientDescriptor">
+ vn-id="workerDescriptor">
-
+
![]()
diff --git a/modules/route/front/descriptor-popover/index.html b/modules/route/front/descriptor-popover/index.html
index a0295c138..75233bd77 100644
--- a/modules/route/front/descriptor-popover/index.html
+++ b/modules/route/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/route/front/descriptor-popover/index.js b/modules/route/front/descriptor-popover/index.js
index a0363839f..ce62ee853 100644
--- a/modules/route/front/descriptor-popover/index.js
+++ b/modules/route/front/descriptor-popover/index.js
@@ -1,59 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
-
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.route = null;
- this._quicklinks = {};
- }
-
- set routeFk(id) {
- if (id == this._routeFk) return;
-
- this._routeFk = id;
- this.route = null;
- this.getCard();
- }
-
- get routeFk() {
- return this._routeFk;
- }
-
- set route(value) {
- this._route = value;
- this.$timeout(() => this.$.popover.relocate());
- }
+import DescriptorPopover from 'salix/components/descriptor-popover';
+class Controller extends DescriptorPopover {
get route() {
- return this._route;
+ return this.entity;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
- }
-
- getCard() {
- if (this.canceler)
- this.canceler.resolve();
-
- this.canceler = this.$q.defer();
-
- let query = 'Routes/findOne';
-
- let filter = {
+ loadData() {
+ const filter = {
fields: [
'id',
'workerFk',
@@ -86,8 +40,7 @@ class Controller extends Component {
scope: {
fields: ['id', 'name']
}
- },
- {
+ }, {
relation: 'worker',
scope: {
fields: ['userFk'],
@@ -107,20 +60,13 @@ class Controller extends Component {
}
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.route = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+
+ return this.getData(`Routes/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnRouteDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- routeFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnRouteDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/route/front/descriptor-popover/index.spec.js b/modules/route/front/descriptor-popover/index.spec.js
index e3277a9c1..971a101fe 100644
--- a/modules/route/front/descriptor-popover/index.spec.js
+++ b/modules/route/front/descriptor-popover/index.spec.js
@@ -1,74 +1,26 @@
import './index';
describe('vnRouteDescriptorPopover', () => {
- let $httpBackend;
- let $scope;
let controller;
- let $element;
- let $timeout;
+ let $httpBackend;
beforeEach(ngModule('route'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$timeout_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $timeout = _$timeout_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnRouteDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnRouteDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('routeFk()', () => {
- it(`should do nothing if the received id isn't a new one`, () => {
- controller.route = 'I exist!';
- controller._routeFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.routeFk = 1;
-
- expect(controller.route).toEqual('I exist!');
- expect(controller._routeFk).toEqual(1);
- expect(controller.getCard).not.toHaveBeenCalled();
- });
-
- it(`should set the received id, set the route null and then call getCard()`, () => {
- controller.route = `Please don't`;
- controller._routeFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.routeFk = 999;
-
- expect(controller.route).toBeNull();
- expect(controller._routeFk).toEqual(999);
- expect(controller.getCard).toHaveBeenCalledWith();
- });
- });
-
- describe('route()', () => {
- it(`should save the client on the controller and then call relocate()`, () => {
- jest.spyOn(controller.$.popover, 'relocate');
- let route = `i'm the route!`;
- controller.route = route;
- $timeout.flush();
-
- expect(controller.route).toEqual(route);
- expect(controller.$.popover.relocate).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the popover show() method`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
- describe('getCard()', () => {
+ describe('loadData()', () => {
it(`should perform a get query to store the client data into the controller`, () => {
- let response = {the: 'route'};
+ const id = 1;
+ const response = 'foo';
- $httpBackend.whenRoute('GET', 'Routes/findOne').respond(response);
- controller.routeFk = 1;
+ $httpBackend.expectGET(`Routes/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.route).toEqual(response);
diff --git a/modules/route/front/descriptor-popover/style.scss b/modules/route/front/descriptor-popover/style.scss
deleted file mode 100644
index 163a032e3..000000000
--- a/modules/route/front/descriptor-popover/style.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-vn-route-descriptor-popover {
- vn-route-descriptor {
- display: block;
- width: 256px;
- & > vn-card{
- margin: 0!important;
- }
- }
-}
diff --git a/modules/route/front/descriptor/index.js b/modules/route/front/descriptor/index.js
index 558d236b7..c4f4d17f2 100644
--- a/modules/route/front/descriptor/index.js
+++ b/modules/route/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $, $httpParamSerializer) {
super($element, $);
@@ -22,14 +22,6 @@ class Controller extends Component {
this.$.moreButton.data = options;
}
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
onMoreChange(callback) {
callback.call(this);
}
@@ -73,12 +65,11 @@ class Controller extends Component {
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
-ngModule.component('vnRouteDescriptor', {
+ngModule.vnComponent('vnRouteDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
route: '<',
- cardReload: '&?',
- quicklinks: '<'
- },
- controller: Controller
+ cardReload: '&?'
+ }
});
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index ab8b1364b..b2b8484ac 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -53,8 +53,7 @@
+ vn-id="workerDescriptor">
{{ticket.priority | dashIfEmpty}}
{{ticket.id | zeroFill:6}}
{{ticket.nickname}}
diff --git a/modules/route/front/summary/index.js b/modules/route/front/summary/index.js
index a922ad008..95e208b84 100644
--- a/modules/route/front/summary/index.js
+++ b/modules/route/front/summary/index.js
@@ -16,20 +16,6 @@ class Controller extends Section {
});
}
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- event.preventDefault();
- }
-
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- }
-
get route() {
return this._route;
}
diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index c4e4f8d7e..ef88f6d9e 100644
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@@ -60,14 +60,14 @@
{{ticket.id}}
{{ticket.nickname}}
@@ -118,10 +118,10 @@
+
+ Tickets to add
+
-
- Tickets to add
-
diff --git a/modules/route/front/tickets/index.js b/modules/route/front/tickets/index.js
index 556ad0b6c..e7c6cb7b1 100644
--- a/modules/route/front/tickets/index.js
+++ b/modules/route/front/tickets/index.js
@@ -128,20 +128,6 @@ class Controller extends Section {
});
}
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- event.preventDefault();
- }
-
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- }
-
openPossibleTicketsDialog() {
this.$.possibleTicketsModel.refresh();
this.$.possibleTicketsDialog.show();
diff --git a/modules/route/front/tickets/index.spec.js b/modules/route/front/tickets/index.spec.js
index f3c02cf51..c2671c3d7 100644
--- a/modules/route/front/tickets/index.spec.js
+++ b/modules/route/front/tickets/index.spec.js
@@ -213,36 +213,6 @@ describe('Route', () => {
});
});
- describe('showTicketDescriptor()', () => {
- it('should call the descriptor show function after setting the parent and the ticket id', () => {
- controller.$.ticketDescriptor = {show: () => {}};
- jest.spyOn(controller.$.ticketDescriptor, 'show');
- const event = {target: {}, preventDefault: () => {}};
- jest.spyOn(event, 'preventDefault');
- const ticketId = 999;
- controller.showTicketDescriptor(event, ticketId);
-
- expect(controller.$.ticketDescriptor.ticketFk).toEqual(ticketId);
- expect(controller.$.ticketDescriptor.show).toHaveBeenCalledWith();
- expect(event.preventDefault).toHaveBeenCalledWith();
- });
- });
-
- describe('showClientDescriptor()', () => {
- it('should call the descriptor show method after setting the parent and the client id', () => {
- controller.$.clientDescriptor = {show: () => {}};
- jest.spyOn(controller.$.clientDescriptor, 'show');
- const event = {target: {}, preventDefault: () => {}};
- jest.spyOn(event, 'preventDefault');
- const clientId = 999;
- controller.showClientDescriptor(event, clientId);
-
- expect(controller.$.clientDescriptor.clientFk).toEqual(clientId);
- expect(controller.$.clientDescriptor.show).toHaveBeenCalledWith();
- expect(event.preventDefault).toHaveBeenCalledWith();
- });
- });
-
describe('openPossibleTicketsDialog()', () => {
it('should call both refresh and show methods in posible tickets model and dialog', () => {
controller.$.possibleTicketsModel = {refresh: () => {}};
diff --git a/modules/ticket/front/descriptor-popover/index.html b/modules/ticket/front/descriptor-popover/index.html
index 00d387f73..d76a41380 100644
--- a/modules/ticket/front/descriptor-popover/index.html
+++ b/modules/ticket/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor-popover/index.js b/modules/ticket/front/descriptor-popover/index.js
index 822296c5b..fc61bc6ca 100644
--- a/modules/ticket/front/descriptor-popover/index.js
+++ b/modules/ticket/front/descriptor-popover/index.js
@@ -1,72 +1,34 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
-
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.ticket = null;
- this._quicklinks = {};
- }
-
- set ticketFk(id) {
- if (id == this._ticketFk) return;
-
- this._ticketFk = id;
- this.ticket = null;
- this.getCard();
- }
-
- set ticket(value) {
- this._ticket = value;
- this.$timeout(() => this.$.popover.relocate());
- }
+import DescriptorPopover from 'salix/components/descriptor-popover';
+class Controller extends DescriptorPopover {
get ticket() {
- return this._ticket;
+ return this.entity;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
- }
-
- getCard() {
- if (this.canceler)
- this.canceler.resolve();
-
- this.canceler = this.$q.defer();
-
- let options = {timeout: this.canceler.promise};
-
- let filter = {
+ loadData() {
+ const filter = {
include: [
{
relation: 'warehouse',
scope: {
fields: ['name']
}
- },
- {
+ }, {
relation: 'agencyMode',
scope: {
fields: ['name']
}
- },
- {
+ }, {
relation: 'client',
scope: {
- fields: ['salesPersonFk', 'name', 'isActive', 'isFreezed', 'isTaxDataChecked'],
+ fields: [
+ 'salesPersonFk',
+ 'name',
+ 'isActive',
+ 'isFreezed',
+ 'isTaxDataChecked'
+ ],
include: {
relation: 'salesPerson',
scope: {
@@ -80,8 +42,7 @@ class Controller extends Component {
}
}
}
- },
- {
+ }, {
relation: 'state',
scope: {
fields: ['stateFk'],
@@ -93,22 +54,13 @@ class Controller extends Component {
}
]
};
- let json = encodeURIComponent(JSON.stringify(filter));
- let query = `Tickets/${this._ticketFk}?filter=${json}`;
- this.$http.get(query, options).then(
- response => {
- this.ticket = response.data;
- this.canceler = null;
- }
- );
+
+ return this.getData(`Tickets/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnTicketDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- ticketFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnTicketDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/ticket/front/descriptor-popover/index.spec.js b/modules/ticket/front/descriptor-popover/index.spec.js
index 17682e5de..fccdb5f96 100644
--- a/modules/ticket/front/descriptor-popover/index.spec.js
+++ b/modules/ticket/front/descriptor-popover/index.spec.js
@@ -1,121 +1,26 @@
import './index.js';
-describe('ticket Component vnTicketDescriptorPopover', () => {
- let $httpBackend;
- let $scope;
+describe('vnTicketDescriptorPopover', () => {
let controller;
- let $element;
- let $timeout;
+ let $httpBackend;
beforeEach(ngModule('ticket'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$timeout_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $timeout = _$timeout_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnTicketDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnTicketDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('ticketFk()', () => {
- it(`should not apply any changes if the received id is the same stored in _ticketFk`, () => {
- controller.ticket = 'I exist!';
- controller._ticketFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.ticketFk = 1;
-
- expect(controller.ticket).toEqual('I exist!');
- expect(controller._ticketFk).toEqual(1);
- expect(controller.getCard).not.toHaveBeenCalled();
- });
-
- it(`should set the received id into _ticketFk, set the ticket to null and then call getCard()`, () => {
- controller.ticket = `Please don't`;
- controller._ticketFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.ticketFk = 999;
-
- expect(controller.ticket).toBeNull();
- expect(controller._ticketFk).toEqual(999);
- expect(controller.getCard).toHaveBeenCalledWith();
- });
- });
-
- describe('ticket()', () => {
- it(`should save the ticket into _ticket and then call relocate()`, () => {
- jest.spyOn(controller.$.popover, 'relocate');
- controller.ticket = `i'm the ticket!`;
- $timeout.flush();
-
- expect(controller._ticket).toEqual(`i'm the ticket!`);
- expect(controller.$.popover.relocate).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the show()`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
- describe('getCard()', () => {
+ describe('loadData()', () => {
it(`should perform a get query to store the ticket data into the controller`, () => {
- controller.ticketFk = 1;
- controller.canceler = null;
- let response = {};
+ const id = 1;
+ const response = 'foo';
- let filter = {
- include: [
- {
- relation: 'warehouse',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'agencyMode',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'client',
- scope: {
- fields: ['salesPersonFk', 'name', 'isActive', 'isFreezed', 'isTaxDataChecked'],
- include: {
- relation: 'salesPerson',
- scope: {
- fields: ['userFk'],
- include: {
- relation: 'user',
- scope: {
- fields: ['nickname']
- }
- }
- }
- }
- }
- },
- {
- relation: 'state',
- scope: {
- fields: ['stateFk'],
- include: {
- relation: 'state',
- fields: ['id', 'name'],
- }
- }
- }
- ]
- };
- let json = encodeURIComponent(JSON.stringify(filter));
- $httpBackend.when('GET', `Tickets/${controller._ticketFk}?filter=${json}`).respond(response);
- $httpBackend.expect('GET', `Tickets/${controller._ticketFk}?filter=${json}`);
- controller.getCard();
+ $httpBackend.expectGET(`Tickets/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.ticket).toEqual(response);
diff --git a/modules/ticket/front/descriptor-popover/style.scss b/modules/ticket/front/descriptor-popover/style.scss
deleted file mode 100644
index f50481083..000000000
--- a/modules/ticket/front/descriptor-popover/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-vn-ticket-descriptor-popover {
- vn-ticket-descriptor {
- display: block;
- width: 256px;
- max-height: 448px;
-
- & > vn-card {
- margin: 0!important;
- }
- }
-}
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/addStowaway.js b/modules/ticket/front/descriptor/addStowaway.js
index 28286386b..4497fef82 100644
--- a/modules/ticket/front/descriptor/addStowaway.js
+++ b/modules/ticket/front/descriptor/addStowaway.js
@@ -6,8 +6,8 @@ class Controller extends Component {
addStowaway(stowaway) {
let params = {id: stowaway.id, shipFk: this.ticket.id};
this.$http.post(`Stowaways/`, params)
+ .then(() => this.cardReload())
.then(() => {
- this.cardReload();
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
this.$.dialog.hide();
});
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index 5dc7a3f70..2be4cf9b9 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $, $httpParamSerializer) {
super($element, $);
this.$httpParamSerializer = $httpParamSerializer;
@@ -95,14 +95,6 @@ class Controller extends Component {
this._quicklinks = links;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
showChangeShipped() {
if (!this.isEditable) {
this.vnApp.showError(this.$t(`This ticket can't be modified`));
@@ -356,11 +348,11 @@ class Controller extends Component {
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
-ngModule.component('vnTicketDescriptor', {
+ngModule.vnComponent('vnTicketDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
ticket: '<',
cardReload: '&'
- },
- controller: Controller
+ }
});
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index a90d48670..3beb6ecde 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -63,8 +63,7 @@
quicklinks="$ctrl.quicklinks">
+ vn-id="workerDescriptor">
+ vn-click-stop>
@@ -67,9 +67,9 @@
{{::ticket.id}}
-
+
{{::ticket.userNickname | dashIfEmpty}}
@@ -80,9 +80,9 @@
{{::ticket.shipped | date: 'HH:mm'}}
-
+
{{::ticket.nickname}}
@@ -103,12 +103,12 @@
@@ -118,7 +118,6 @@
-
-
-
+
+ vn-id="workerDescriptor">
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 4803f40ff..59e5d949d 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -43,12 +43,6 @@ export default class Controller extends Section {
return this.checked.length;
}
- goToLines(event, ticketFk) {
- this.preventDefault(event);
- let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
- window.open(url, '_blank');
- }
-
onMoreOpen() {
let options = this.moreOptions.filter(o => o.always || this.isChecked);
this.$.moreButton.data = options;
@@ -89,30 +83,15 @@ export default class Controller extends Section {
return 'warning';
}
- showClientDescriptor(event, clientFk) {
- this.preventDefault(event);
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
+ goToLines(ticketFk) {
+ let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
+ window.open(url, '_blank');
}
- showWorkerDescriptor(event, workerFk) {
- this.preventDefault(event);
- this.selectedWorker = workerFk;
- this.$.workerDescriptor.parent = event.target;
- this.$.workerDescriptor.show();
- }
-
- preview(event, ticket) {
- this.preventDefault(event);
+ preview(ticket) {
this.selectedTicket = ticket;
this.$.summary.show();
}
-
- preventDefault(event) {
- event.preventDefault();
- event.stopImmediatePropagation();
- }
}
ngModule.component('vnTicketIndex', {
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 10bd88d3d..de619ef26 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -52,21 +52,6 @@ describe('Component vnTicketIndex', () => {
});
});
- describe('showClientDescriptor()', () => {
- it('should show the client descriptor popover', () => {
- controller.$.clientDescriptor = {show: () => {}};
- controller.$.clientDescriptor.show = jasmine.createSpy('show');
- let event = new MouseEvent('click', {
- view: $window,
- bubbles: true,
- cancelable: true
- });
- controller.showClientDescriptor(event, tickets[0].clientFk);
-
- expect(controller.$.clientDescriptor.show).toHaveBeenCalledWith();
- });
- });
-
describe('preview()', () => {
it('should show the dialog summary', () => {
controller.$.summary = {show: () => {}};
diff --git a/modules/ticket/front/picture/index.html b/modules/ticket/front/picture/index.html
index 58e13a451..e240d28ac 100644
--- a/modules/ticket/front/picture/index.html
+++ b/modules/ticket/front/picture/index.html
@@ -19,8 +19,8 @@
![]()
@@ -62,4 +62,6 @@
+
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 0acb661e3..3dd8691d5 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -105,8 +105,7 @@
quicklinks="$ctrl.quicklinks">
+ vn-id="workerDescriptor">
-
+ vn-id="workerDescriptor">
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index e120ad942..51798537f 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -100,8 +100,8 @@
![]()
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index fe19696f3..0bf960b1e 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -32,7 +32,6 @@ class Controller extends Section {
},
];
this._sales = [];
- this.imagesPath = '//verdnatura.es/vn-image-data/catalog';
}
get ticket() {
diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html
index f66c62449..99d0b838a 100644
--- a/modules/ticket/front/tracking/index/index.html
+++ b/modules/ticket/front/tracking/index/index.html
@@ -38,6 +38,5 @@
+ vn-id="workerDescriptor">
\ No newline at end of file
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 977f76513..610e517c9 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -58,7 +58,8 @@
diff --git a/modules/ticket/front/weekly/index.html b/modules/ticket/front/weekly/index.html
index e97d47eef..8411d4f72 100644
--- a/modules/ticket/front/weekly/index.html
+++ b/modules/ticket/front/weekly/index.html
@@ -32,23 +32,27 @@
-
+
-
+
{{weekly.ticketFk}}
-
+
{{::weekly.clientName}}
-
+
-
+
{{::weekly.warehouseName}}
-
+
{{::weekly.nickName}}
diff --git a/modules/ticket/front/weekly/index.js b/modules/ticket/front/weekly/index.js
index a89dbbc2e..0c373eae3 100644
--- a/modules/ticket/front/weekly/index.js
+++ b/modules/ticket/front/weekly/index.js
@@ -19,36 +19,10 @@ export default class Controller extends Section {
onUpdate(ticketFk, field, value) {
const params = {ticketFk, [field]: value};
- this.$http.patch('TicketWeeklies', params).then(() => {
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
+ this.$http.patch('TicketWeeklies', params)
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- this.stopEvent(event);
- }
-
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- this.stopEvent(event);
- }
-
- showWorkerDescriptor(event, workerFk) {
- this.$.workerDescriptor.workerFk = workerFk;
- this.$.workerDescriptor.parent = event.target;
- this.$.workerDescriptor.show();
- this.stopEvent(event);
- }
-
- deleteWeekly(event, ticketFk) {
- this.$.deleteWeekly.show(ticketFk);
- this.stopEvent(event);
- }
onDeleteWeeklyAccept(ticketFk) {
return this.$http.delete(`TicketWeeklies/${ticketFk}`).then(() => {
this.vnApp.showSuccess(this.$t('Data saved!'));
diff --git a/modules/travel/front/descriptor-popover/index.html b/modules/travel/front/descriptor-popover/index.html
index fc0fb0301..46fb787a0 100644
--- a/modules/travel/front/descriptor-popover/index.html
+++ b/modules/travel/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/travel/front/descriptor-popover/index.js b/modules/travel/front/descriptor-popover/index.js
index cb7e29bda..b9839b04b 100644
--- a/modules/travel/front/descriptor-popover/index.js
+++ b/modules/travel/front/descriptor-popover/index.js
@@ -1,43 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.travel = null;
- this._quicklinks = {};
- }
-
- set travelId(travelId) {
- if (travelId == this._travelId) return;
-
- this._travelId = travelId;
- this.travel = null;
- this.loadData();
- }
-
- get travelId() {
- return this._travelId;
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
+class Controller extends DescriptorPopover {
+ get travel() {
+ return this.entity;
}
loadData() {
- let query = `Travels/findOne`;
- let filter = {
+ const filter = {
fields: [
'id',
'ref',
@@ -47,9 +17,6 @@ class Controller extends Component {
'warehouseInFk',
'warehouseOutFk'
],
- where: {
- id: this._travelId
- },
include: [
{
relation: 'warehouseIn',
@@ -65,20 +32,12 @@ class Controller extends Component {
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.travel = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+ return this.getData(`Travels/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnTravelDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- travelId: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnTravelDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/travel/front/descriptor-popover/index.spec.js b/modules/travel/front/descriptor-popover/index.spec.js
index 0403c902a..c191414c9 100644
--- a/modules/travel/front/descriptor-popover/index.spec.js
+++ b/modules/travel/front/descriptor-popover/index.spec.js
@@ -1,97 +1,26 @@
import './index.js';
-describe('travel Component vnTravelDescriptorPopover', () => {
- let $httpBackend;
- let $httpParamSerializer;
- let $scope;
+describe('vnTravelDescriptorPopover', () => {
let controller;
- let $element;
+ let $httpBackend;
beforeEach(ngModule('travel'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnTravelDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnTravelDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('travelId()', () => {
- it(`should not apply any changes if the received id is the same stored in _travelId`, () => {
- controller.travel = 'I exist!';
- controller._travelId = 1;
- jest.spyOn(controller, 'loadData');
- controller.travelId = 1;
-
- expect(controller.travel).toEqual('I exist!');
- expect(controller._travelId).toEqual(1);
- expect(controller.loadData).not.toHaveBeenCalled();
- });
-
- it(`should set the received id into _travelId, set the travel to null and then call loadData()`, () => {
- controller.travel = `Please don't`;
- controller._travelId = 1;
- jest.spyOn(controller, 'loadData');
- controller.travelId = 999;
-
- expect(controller.travel).toBeNull();
- expect(controller._travelId).toEqual(999);
- expect(controller.loadData).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the show()`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
describe('loadData()', () => {
it(`should perform a get query to store the worker data into the controller`, () => {
- controller.travelId = 1;
- controller.canceler = null;
- let response = {};
+ const id = 1;
+ const response = 'foo';
- let config = {
- filter: {
- fields: [
- 'id',
- 'ref',
- 'shipped',
- 'landed',
- 'totalEntries',
- 'warehouseInFk',
- 'warehouseOutFk'
- ],
- where: {
- id: controller.travelId
- },
- include: [
- {
- relation: 'warehouseIn',
- scope: {
- fields: ['name']
- }
- }, {
- relation: 'warehouseOut',
- scope: {
- fields: ['name']
- }
- }
- ]
- }
- };
-
- let json = $httpParamSerializer(config);
-
- $httpBackend.whenGET(`Travels/findOne?${json}`).respond(response);
- $httpBackend.expectGET(`Travels/findOne?${json}`);
- controller.loadData();
+ $httpBackend.expectGET(`Travels/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.travel).toEqual(response);
diff --git a/modules/travel/front/descriptor/index.js b/modules/travel/front/descriptor/index.js
index 911cae010..c38dd91a2 100644
--- a/modules/travel/front/descriptor/index.js
+++ b/modules/travel/front/descriptor/index.js
@@ -1,9 +1,9 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-ngModule.component('vnTravelDescriptor', {
+ngModule.vnComponent('vnTravelDescriptor', {
template: require('./index.html'),
- controller: Component,
+ controller: Descriptor,
bindings: {
travel: '<'
},
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 1cb176d13..b1af5c8dd 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -37,12 +37,12 @@
@@ -70,5 +70,4 @@
on-accept="$ctrl.onCloneAccept($data)"
question="Do you want to clone this travel?"
message="All it's properties will be copied">
-
-{{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}}
-
-
-
-
-
-
-
-
@@ -131,10 +139,4 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/travel/front/summary/index.js b/modules/travel/front/summary/index.js
index af940aa6c..1f2d14e58 100644
--- a/modules/travel/front/summary/index.js
+++ b/modules/travel/front/summary/index.js
@@ -22,35 +22,30 @@ class Controller extends Section {
}
getTravel() {
- return this.$http.get(`/api/Travels/${this.travel.id}/getTravel`).then(response => {
- this.travelData = response.data;
- });
+ return this.$http.get(`Travels/${this.travel.id}/getTravel`)
+ .then(res => this.travelData = res.data);
}
getEntries() {
- return this.$http.get(`/api/Travels/${this.travel.id}/getEntries`).then(response => {
- this.entries = response.data;
- });
+ return this.$http.get(`Travels/${this.travel.id}/getEntries`)
+ .then(res => this.entries = res.data);
}
getThermographs() {
- const params = {
- filter: {
- include: {
- relation: 'warehouse',
- scope: {
- fields: ['id', 'name']
- }
- },
- where: {
- travelFk: this.travel.id
+ const filter = {
+ include: {
+ relation: 'warehouse',
+ scope: {
+ fields: ['id', 'name']
}
+ },
+ where: {
+ travelFk: this.travel.id
}
};
- return this.$http.get(`TravelThermographs`, {params}).then(res => {
- this.travelThermographs = res.data;
- });
+ return this.$http.get(`TravelThermographs`, {filter})
+ .then(res => this.travelThermographs = res.data);
}
total(field) {
diff --git a/modules/travel/front/summary/index.spec.js b/modules/travel/front/summary/index.spec.js
index 7f5c68aec..95f98bb85 100644
--- a/modules/travel/front/summary/index.spec.js
+++ b/modules/travel/front/summary/index.spec.js
@@ -36,7 +36,7 @@ describe('component vnTravelSummary', () => {
it('should perform a get and then store data on the controller', () => {
controller._travel = {id: 999};
- const query = `/api/Travels/${controller._travel.id}/getTravel`;
+ const query = `Travels/${controller._travel.id}/getTravel`;
$httpBackend.expectGET(query).respond('I am the travelData');
controller.getTravel();
$httpBackend.flush();
@@ -49,7 +49,7 @@ describe('component vnTravelSummary', () => {
it('should call the getEntries method to get the entries data', () => {
controller._travel = {id: 999};
- const query = `/api/Travels/${controller._travel.id}/getEntries`;
+ const query = `Travels/${controller._travel.id}/getEntries`;
$httpBackend.expectGET(query).respond('I am the entries');
controller.getEntries();
$httpBackend.flush();
@@ -61,22 +61,8 @@ describe('component vnTravelSummary', () => {
describe('getThermographs()', () => {
it('should call the getThermographs method to get the thermographs', () => {
controller._travel = {id: 2};
- const params = {
- filter: {
- include: {
- relation: 'warehouse',
- scope: {
- fields: ['id', 'name']
- }
- },
- where: {
- travelFk: controller._travel.id
- }
- }
- };
- const serializedParams = $httpParamSerializer(params);
- const query = `TravelThermographs?${serializedParams}`;
- $httpBackend.expectGET(query).respond('I am the thermographs');
+
+ $httpBackend.expectGET(`TravelThermographs`).respond('I am the thermographs');
controller.getThermographs();
$httpBackend.flush();
diff --git a/modules/worker/front/descriptor-popover/index.html b/modules/worker/front/descriptor-popover/index.html
index 21f32f0c2..7c9155dda 100644
--- a/modules/worker/front/descriptor-popover/index.html
+++ b/modules/worker/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/worker/front/descriptor-popover/index.js b/modules/worker/front/descriptor-popover/index.js
index 6463853f9..eedcebe48 100644
--- a/modules/worker/front/descriptor-popover/index.js
+++ b/modules/worker/front/descriptor-popover/index.js
@@ -1,46 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.worker = null;
- this._quicklinks = {};
- }
-
- set workerFk(workerFk) {
- if (workerFk == this._workerFk) return;
-
- this._workerFk = workerFk;
- this.worker = null;
- this.loadData();
- }
-
- get workerFk() {
- return this._workerFk;
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
+class Controller extends DescriptorPopover {
+ get worker() {
+ return this.entity;
}
loadData() {
- let query = `Workers/findOne`;
- let filter = {
- where: {
- id: this._workerFk
- },
+ const filter = {
include: [
{
relation: 'user',
@@ -53,16 +20,13 @@ class Controller extends Component {
}
}
}
- },
- {
+ }, {
relation: 'client',
scope: {fields: ['fi']}
- },
- {
+ }, {
relation: 'sip',
scope: {fields: ['extension']}
- },
- {
+ }, {
relation: 'department',
scope: {
include: {
@@ -73,20 +37,12 @@ class Controller extends Component {
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.worker = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+ return this.getData(`Workers/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnWorkerDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- workerFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnWorkerDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/worker/front/descriptor-popover/index.spec.js b/modules/worker/front/descriptor-popover/index.spec.js
index 0b2746475..4b9a17e8a 100644
--- a/modules/worker/front/descriptor-popover/index.spec.js
+++ b/modules/worker/front/descriptor-popover/index.spec.js
@@ -1,101 +1,26 @@
import './index.js';
-describe('worker Component vnWorkerDescriptorPopover', () => {
- let $httpBackend;
- let $httpParamSerializer;
- let $scope;
+describe('vnWorkerDescriptorPopover', () => {
let controller;
+ let $httpBackend;
beforeEach(ngModule('worker'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- const $element = angular.element(`
+ vn-id="workerDescriptor">
diff --git a/modules/zone/front/delivery-days/index.html b/modules/zone/front/delivery-days/index.html
index 59ed5c944..ebecef899 100644
--- a/modules/zone/front/delivery-days/index.html
+++ b/modules/zone/front/delivery-days/index.html
@@ -85,7 +85,7 @@
diff --git a/modules/zone/front/delivery-days/index.js b/modules/zone/front/delivery-days/index.js
index cf7ef14da..eb6d7795d 100644
--- a/modules/zone/front/delivery-days/index.js
+++ b/modules/zone/front/delivery-days/index.js
@@ -61,8 +61,7 @@ class Controller extends Section {
});
}
- preview(event, zone) {
- this.stopEvent(event);
+ preview(zone) {
this.selectedZone = zone;
this.$.summary.show();
}
diff --git a/modules/zone/front/descriptor/index.html b/modules/zone/front/descriptor/index.html
index 58441d10d..90f4effea 100644
--- a/modules/zone/front/descriptor/index.html
+++ b/modules/zone/front/descriptor/index.html
@@ -18,36 +18,44 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/zone/front/descriptor/index.js b/modules/zone/front/descriptor/index.js
index b3808f256..5c0c4dcce 100644
--- a/modules/zone/front/descriptor/index.js
+++ b/modules/zone/front/descriptor/index.js
@@ -1,10 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
$onInit() {
this.moreOptions = [
- {callback: this.deleteZone, name: 'Delete'}
+ {
+ name: 'Delete',
+ callback: () => this.$.deleteZone.show(),
+ }
];
}
@@ -12,20 +15,14 @@ class Controller extends Component {
callback.call(this);
}
- deleteZone() {
- this.$.deleteZone.show();
- }
-
- returnDialog(response) {
- if (response === 'accept') {
- this.$http.delete(`Zones/${this.zone.id}`).then(() => {
- this.$state.go('zone.index');
- });
- }
+ onDeleteAccept() {
+ return this.$http.delete(`Zones/${this.zone.id}`).then(() => {
+ this.$state.go('zone.index');
+ });
}
}
-ngModule.component('vnZoneDescriptor', {
+ngModule.vnComponent('vnZoneDescriptor', {
template: require('./index.html'),
controller: Controller,
bindings: {
diff --git a/modules/zone/front/index/index.html b/modules/zone/front/index/index.html
index 64450e451..39d5446d1 100644
--- a/modules/zone/front/index/index.html
+++ b/modules/zone/front/index/index.html
@@ -29,14 +29,14 @@
diff --git a/modules/zone/front/index/index.js b/modules/zone/front/index/index.js
index 9750a949f..b39c6139a 100644
--- a/modules/zone/front/index/index.js
+++ b/modules/zone/front/index/index.js
@@ -2,17 +2,11 @@ import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller extends Section {
- preview(event, zone) {
- this.stopEvent(event);
+ preview(zone) {
this.selectedZone = zone;
this.$.summary.show();
}
- clone(event, zone) {
- this.stopEvent(event);
- this.$.clone.show(zone);
- }
-
onCloneAccept(zone) {
return this.$http.post(`Zones/${zone.id}/clone`)
.then(res => {
Visible
diff --git a/modules/order/front/catalog-view/index.html b/modules/order/front/catalog-view/index.html index 7a588a464..bc01dcc6c 100644 --- a/modules/order/front/catalog-view/index.html +++ b/modules/order/front/catalog-view/index.html @@ -5,8 +5,8 @@
diff --git a/modules/order/front/descriptor/index.js b/modules/order/front/descriptor/index.js
index b9d1e7973..b60d44e78 100644
--- a/modules/order/front/descriptor/index.js
+++ b/modules/order/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $) {
super($element, $);
this.moreOptions = [
@@ -33,14 +33,6 @@ class Controller extends Component {
return this._order;
}
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
deleteOrder(response) {
if (response === 'accept') {
const params = {id: this.order.id};
@@ -56,10 +48,10 @@ class Controller extends Component {
}
}
-ngModule.component('vnOrderDescriptor', {
+ngModule.vnComponent('vnOrderDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
order: '<'
- },
- controller: Controller
+ }
});
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index b16a1b25d..1633b0ea1 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -27,14 +27,16 @@
ui-sref="order.card.summary({id: {{::order.id}}})">
{{::order.id}}
-
+
{{::order.clientName}}
-
+
{{::order.workerNickname | dashIfEmpty}}
@@ -51,9 +53,9 @@
{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}
+ vn-click-stop="$ctrl.preview(order)"
+ icon="desktop_windows"
+ vn-tooltip="Preview">
@@ -72,10 +74,11 @@
vn-id="clientDescriptor">
+ vn-id="workerDescriptor">
-
+
![]()
diff --git a/modules/route/front/descriptor-popover/index.html b/modules/route/front/descriptor-popover/index.html
index a0295c138..75233bd77 100644
--- a/modules/route/front/descriptor-popover/index.html
+++ b/modules/route/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/route/front/descriptor-popover/index.js b/modules/route/front/descriptor-popover/index.js
index a0363839f..ce62ee853 100644
--- a/modules/route/front/descriptor-popover/index.js
+++ b/modules/route/front/descriptor-popover/index.js
@@ -1,59 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
-
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.route = null;
- this._quicklinks = {};
- }
-
- set routeFk(id) {
- if (id == this._routeFk) return;
-
- this._routeFk = id;
- this.route = null;
- this.getCard();
- }
-
- get routeFk() {
- return this._routeFk;
- }
-
- set route(value) {
- this._route = value;
- this.$timeout(() => this.$.popover.relocate());
- }
+import DescriptorPopover from 'salix/components/descriptor-popover';
+class Controller extends DescriptorPopover {
get route() {
- return this._route;
+ return this.entity;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
- }
-
- getCard() {
- if (this.canceler)
- this.canceler.resolve();
-
- this.canceler = this.$q.defer();
-
- let query = 'Routes/findOne';
-
- let filter = {
+ loadData() {
+ const filter = {
fields: [
'id',
'workerFk',
@@ -86,8 +40,7 @@ class Controller extends Component {
scope: {
fields: ['id', 'name']
}
- },
- {
+ }, {
relation: 'worker',
scope: {
fields: ['userFk'],
@@ -107,20 +60,13 @@ class Controller extends Component {
}
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.route = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+
+ return this.getData(`Routes/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnRouteDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- routeFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnRouteDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/route/front/descriptor-popover/index.spec.js b/modules/route/front/descriptor-popover/index.spec.js
index e3277a9c1..971a101fe 100644
--- a/modules/route/front/descriptor-popover/index.spec.js
+++ b/modules/route/front/descriptor-popover/index.spec.js
@@ -1,74 +1,26 @@
import './index';
describe('vnRouteDescriptorPopover', () => {
- let $httpBackend;
- let $scope;
let controller;
- let $element;
- let $timeout;
+ let $httpBackend;
beforeEach(ngModule('route'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$timeout_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $timeout = _$timeout_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnRouteDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnRouteDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('routeFk()', () => {
- it(`should do nothing if the received id isn't a new one`, () => {
- controller.route = 'I exist!';
- controller._routeFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.routeFk = 1;
-
- expect(controller.route).toEqual('I exist!');
- expect(controller._routeFk).toEqual(1);
- expect(controller.getCard).not.toHaveBeenCalled();
- });
-
- it(`should set the received id, set the route null and then call getCard()`, () => {
- controller.route = `Please don't`;
- controller._routeFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.routeFk = 999;
-
- expect(controller.route).toBeNull();
- expect(controller._routeFk).toEqual(999);
- expect(controller.getCard).toHaveBeenCalledWith();
- });
- });
-
- describe('route()', () => {
- it(`should save the client on the controller and then call relocate()`, () => {
- jest.spyOn(controller.$.popover, 'relocate');
- let route = `i'm the route!`;
- controller.route = route;
- $timeout.flush();
-
- expect(controller.route).toEqual(route);
- expect(controller.$.popover.relocate).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the popover show() method`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
- describe('getCard()', () => {
+ describe('loadData()', () => {
it(`should perform a get query to store the client data into the controller`, () => {
- let response = {the: 'route'};
+ const id = 1;
+ const response = 'foo';
- $httpBackend.whenRoute('GET', 'Routes/findOne').respond(response);
- controller.routeFk = 1;
+ $httpBackend.expectGET(`Routes/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.route).toEqual(response);
diff --git a/modules/route/front/descriptor-popover/style.scss b/modules/route/front/descriptor-popover/style.scss
deleted file mode 100644
index 163a032e3..000000000
--- a/modules/route/front/descriptor-popover/style.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-vn-route-descriptor-popover {
- vn-route-descriptor {
- display: block;
- width: 256px;
- & > vn-card{
- margin: 0!important;
- }
- }
-}
diff --git a/modules/route/front/descriptor/index.js b/modules/route/front/descriptor/index.js
index 558d236b7..c4f4d17f2 100644
--- a/modules/route/front/descriptor/index.js
+++ b/modules/route/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $, $httpParamSerializer) {
super($element, $);
@@ -22,14 +22,6 @@ class Controller extends Component {
this.$.moreButton.data = options;
}
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
onMoreChange(callback) {
callback.call(this);
}
@@ -73,12 +65,11 @@ class Controller extends Component {
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
-ngModule.component('vnRouteDescriptor', {
+ngModule.vnComponent('vnRouteDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
route: '<',
- cardReload: '&?',
- quicklinks: '<'
- },
- controller: Controller
+ cardReload: '&?'
+ }
});
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index ab8b1364b..b2b8484ac 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -53,8 +53,7 @@
+ vn-id="workerDescriptor">
{{ticket.priority | dashIfEmpty}}
{{ticket.id | zeroFill:6}}
{{ticket.nickname}}
diff --git a/modules/route/front/summary/index.js b/modules/route/front/summary/index.js
index a922ad008..95e208b84 100644
--- a/modules/route/front/summary/index.js
+++ b/modules/route/front/summary/index.js
@@ -16,20 +16,6 @@ class Controller extends Section {
});
}
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- event.preventDefault();
- }
-
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- }
-
get route() {
return this._route;
}
diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index c4e4f8d7e..ef88f6d9e 100644
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@@ -60,14 +60,14 @@
{{ticket.id}}
{{ticket.nickname}}
@@ -118,10 +118,10 @@
+
+ Tickets to add
+
-
-
diff --git a/modules/route/front/tickets/index.js b/modules/route/front/tickets/index.js
index 556ad0b6c..e7c6cb7b1 100644
--- a/modules/route/front/tickets/index.js
+++ b/modules/route/front/tickets/index.js
@@ -128,20 +128,6 @@ class Controller extends Section {
});
}
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- event.preventDefault();
- }
-
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- event.preventDefault();
- }
-
openPossibleTicketsDialog() {
this.$.possibleTicketsModel.refresh();
this.$.possibleTicketsDialog.show();
diff --git a/modules/route/front/tickets/index.spec.js b/modules/route/front/tickets/index.spec.js
index f3c02cf51..c2671c3d7 100644
--- a/modules/route/front/tickets/index.spec.js
+++ b/modules/route/front/tickets/index.spec.js
@@ -213,36 +213,6 @@ describe('Route', () => {
});
});
- describe('showTicketDescriptor()', () => {
- it('should call the descriptor show function after setting the parent and the ticket id', () => {
- controller.$.ticketDescriptor = {show: () => {}};
- jest.spyOn(controller.$.ticketDescriptor, 'show');
- const event = {target: {}, preventDefault: () => {}};
- jest.spyOn(event, 'preventDefault');
- const ticketId = 999;
- controller.showTicketDescriptor(event, ticketId);
-
- expect(controller.$.ticketDescriptor.ticketFk).toEqual(ticketId);
- expect(controller.$.ticketDescriptor.show).toHaveBeenCalledWith();
- expect(event.preventDefault).toHaveBeenCalledWith();
- });
- });
-
- describe('showClientDescriptor()', () => {
- it('should call the descriptor show method after setting the parent and the client id', () => {
- controller.$.clientDescriptor = {show: () => {}};
- jest.spyOn(controller.$.clientDescriptor, 'show');
- const event = {target: {}, preventDefault: () => {}};
- jest.spyOn(event, 'preventDefault');
- const clientId = 999;
- controller.showClientDescriptor(event, clientId);
-
- expect(controller.$.clientDescriptor.clientFk).toEqual(clientId);
- expect(controller.$.clientDescriptor.show).toHaveBeenCalledWith();
- expect(event.preventDefault).toHaveBeenCalledWith();
- });
- });
-
describe('openPossibleTicketsDialog()', () => {
it('should call both refresh and show methods in posible tickets model and dialog', () => {
controller.$.possibleTicketsModel = {refresh: () => {}};
diff --git a/modules/ticket/front/descriptor-popover/index.html b/modules/ticket/front/descriptor-popover/index.html
index 00d387f73..d76a41380 100644
--- a/modules/ticket/front/descriptor-popover/index.html
+++ b/modules/ticket/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor-popover/index.js b/modules/ticket/front/descriptor-popover/index.js
index 822296c5b..fc61bc6ca 100644
--- a/modules/ticket/front/descriptor-popover/index.js
+++ b/modules/ticket/front/descriptor-popover/index.js
@@ -1,72 +1,34 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
-
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.ticket = null;
- this._quicklinks = {};
- }
-
- set ticketFk(id) {
- if (id == this._ticketFk) return;
-
- this._ticketFk = id;
- this.ticket = null;
- this.getCard();
- }
-
- set ticket(value) {
- this._ticket = value;
- this.$timeout(() => this.$.popover.relocate());
- }
+import DescriptorPopover from 'salix/components/descriptor-popover';
+class Controller extends DescriptorPopover {
get ticket() {
- return this._ticket;
+ return this.entity;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
- }
-
- getCard() {
- if (this.canceler)
- this.canceler.resolve();
-
- this.canceler = this.$q.defer();
-
- let options = {timeout: this.canceler.promise};
-
- let filter = {
+ loadData() {
+ const filter = {
include: [
{
relation: 'warehouse',
scope: {
fields: ['name']
}
- },
- {
+ }, {
relation: 'agencyMode',
scope: {
fields: ['name']
}
- },
- {
+ }, {
relation: 'client',
scope: {
- fields: ['salesPersonFk', 'name', 'isActive', 'isFreezed', 'isTaxDataChecked'],
+ fields: [
+ 'salesPersonFk',
+ 'name',
+ 'isActive',
+ 'isFreezed',
+ 'isTaxDataChecked'
+ ],
include: {
relation: 'salesPerson',
scope: {
@@ -80,8 +42,7 @@ class Controller extends Component {
}
}
}
- },
- {
+ }, {
relation: 'state',
scope: {
fields: ['stateFk'],
@@ -93,22 +54,13 @@ class Controller extends Component {
}
]
};
- let json = encodeURIComponent(JSON.stringify(filter));
- let query = `Tickets/${this._ticketFk}?filter=${json}`;
- this.$http.get(query, options).then(
- response => {
- this.ticket = response.data;
- this.canceler = null;
- }
- );
+
+ return this.getData(`Tickets/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnTicketDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- ticketFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnTicketDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/ticket/front/descriptor-popover/index.spec.js b/modules/ticket/front/descriptor-popover/index.spec.js
index 17682e5de..fccdb5f96 100644
--- a/modules/ticket/front/descriptor-popover/index.spec.js
+++ b/modules/ticket/front/descriptor-popover/index.spec.js
@@ -1,121 +1,26 @@
import './index.js';
-describe('ticket Component vnTicketDescriptorPopover', () => {
- let $httpBackend;
- let $scope;
+describe('vnTicketDescriptorPopover', () => {
let controller;
- let $element;
- let $timeout;
+ let $httpBackend;
beforeEach(ngModule('ticket'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$timeout_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $timeout = _$timeout_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnTicketDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnTicketDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('ticketFk()', () => {
- it(`should not apply any changes if the received id is the same stored in _ticketFk`, () => {
- controller.ticket = 'I exist!';
- controller._ticketFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.ticketFk = 1;
-
- expect(controller.ticket).toEqual('I exist!');
- expect(controller._ticketFk).toEqual(1);
- expect(controller.getCard).not.toHaveBeenCalled();
- });
-
- it(`should set the received id into _ticketFk, set the ticket to null and then call getCard()`, () => {
- controller.ticket = `Please don't`;
- controller._ticketFk = 1;
- jest.spyOn(controller, 'getCard');
- controller.ticketFk = 999;
-
- expect(controller.ticket).toBeNull();
- expect(controller._ticketFk).toEqual(999);
- expect(controller.getCard).toHaveBeenCalledWith();
- });
- });
-
- describe('ticket()', () => {
- it(`should save the ticket into _ticket and then call relocate()`, () => {
- jest.spyOn(controller.$.popover, 'relocate');
- controller.ticket = `i'm the ticket!`;
- $timeout.flush();
-
- expect(controller._ticket).toEqual(`i'm the ticket!`);
- expect(controller.$.popover.relocate).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the show()`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
- describe('getCard()', () => {
+ describe('loadData()', () => {
it(`should perform a get query to store the ticket data into the controller`, () => {
- controller.ticketFk = 1;
- controller.canceler = null;
- let response = {};
+ const id = 1;
+ const response = 'foo';
- let filter = {
- include: [
- {
- relation: 'warehouse',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'agencyMode',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'client',
- scope: {
- fields: ['salesPersonFk', 'name', 'isActive', 'isFreezed', 'isTaxDataChecked'],
- include: {
- relation: 'salesPerson',
- scope: {
- fields: ['userFk'],
- include: {
- relation: 'user',
- scope: {
- fields: ['nickname']
- }
- }
- }
- }
- }
- },
- {
- relation: 'state',
- scope: {
- fields: ['stateFk'],
- include: {
- relation: 'state',
- fields: ['id', 'name'],
- }
- }
- }
- ]
- };
- let json = encodeURIComponent(JSON.stringify(filter));
- $httpBackend.when('GET', `Tickets/${controller._ticketFk}?filter=${json}`).respond(response);
- $httpBackend.expect('GET', `Tickets/${controller._ticketFk}?filter=${json}`);
- controller.getCard();
+ $httpBackend.expectGET(`Tickets/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.ticket).toEqual(response);
diff --git a/modules/ticket/front/descriptor-popover/style.scss b/modules/ticket/front/descriptor-popover/style.scss
deleted file mode 100644
index f50481083..000000000
--- a/modules/ticket/front/descriptor-popover/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-vn-ticket-descriptor-popover {
- vn-ticket-descriptor {
- display: block;
- width: 256px;
- max-height: 448px;
-
- & > vn-card {
- margin: 0!important;
- }
- }
-}
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/addStowaway.js b/modules/ticket/front/descriptor/addStowaway.js
index 28286386b..4497fef82 100644
--- a/modules/ticket/front/descriptor/addStowaway.js
+++ b/modules/ticket/front/descriptor/addStowaway.js
@@ -6,8 +6,8 @@ class Controller extends Component {
addStowaway(stowaway) {
let params = {id: stowaway.id, shipFk: this.ticket.id};
this.$http.post(`Stowaways/`, params)
+ .then(() => this.cardReload())
.then(() => {
- this.cardReload();
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
this.$.dialog.hide();
});
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index 5dc7a3f70..2be4cf9b9 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -1,7 +1,7 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
constructor($element, $, $httpParamSerializer) {
super($element, $);
this.$httpParamSerializer = $httpParamSerializer;
@@ -95,14 +95,6 @@ class Controller extends Component {
this._quicklinks = links;
}
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- this._quicklinks = Object.assign(value, this._quicklinks);
- }
-
showChangeShipped() {
if (!this.isEditable) {
this.vnApp.showError(this.$t(`This ticket can't be modified`));
@@ -356,11 +348,11 @@ class Controller extends Component {
Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
-ngModule.component('vnTicketDescriptor', {
+ngModule.vnComponent('vnTicketDescriptor', {
template: require('./index.html'),
+ controller: Controller,
bindings: {
ticket: '<',
cardReload: '&'
- },
- controller: Controller
+ }
});
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index a90d48670..3beb6ecde 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -63,8 +63,7 @@
quicklinks="$ctrl.quicklinks">
+ vn-id="workerDescriptor">
+ vn-click-stop>
@@ -67,9 +67,9 @@
{{::ticket.id}}
-
+
{{::ticket.userNickname | dashIfEmpty}}
@@ -80,9 +80,9 @@
{{::ticket.shipped | date: 'HH:mm'}}
-
+
{{::ticket.nickname}}
@@ -103,12 +103,12 @@
@@ -118,7 +118,6 @@
-
-
-
+
+ vn-id="workerDescriptor">
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 4803f40ff..59e5d949d 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -43,12 +43,6 @@ export default class Controller extends Section {
return this.checked.length;
}
- goToLines(event, ticketFk) {
- this.preventDefault(event);
- let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
- window.open(url, '_blank');
- }
-
onMoreOpen() {
let options = this.moreOptions.filter(o => o.always || this.isChecked);
this.$.moreButton.data = options;
@@ -89,30 +83,15 @@ export default class Controller extends Section {
return 'warning';
}
- showClientDescriptor(event, clientFk) {
- this.preventDefault(event);
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
+ goToLines(ticketFk) {
+ let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
+ window.open(url, '_blank');
}
- showWorkerDescriptor(event, workerFk) {
- this.preventDefault(event);
- this.selectedWorker = workerFk;
- this.$.workerDescriptor.parent = event.target;
- this.$.workerDescriptor.show();
- }
-
- preview(event, ticket) {
- this.preventDefault(event);
+ preview(ticket) {
this.selectedTicket = ticket;
this.$.summary.show();
}
-
- preventDefault(event) {
- event.preventDefault();
- event.stopImmediatePropagation();
- }
}
ngModule.component('vnTicketIndex', {
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 10bd88d3d..de619ef26 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -52,21 +52,6 @@ describe('Component vnTicketIndex', () => {
});
});
- describe('showClientDescriptor()', () => {
- it('should show the client descriptor popover', () => {
- controller.$.clientDescriptor = {show: () => {}};
- controller.$.clientDescriptor.show = jasmine.createSpy('show');
- let event = new MouseEvent('click', {
- view: $window,
- bubbles: true,
- cancelable: true
- });
- controller.showClientDescriptor(event, tickets[0].clientFk);
-
- expect(controller.$.clientDescriptor.show).toHaveBeenCalledWith();
- });
- });
-
describe('preview()', () => {
it('should show the dialog summary', () => {
controller.$.summary = {show: () => {}};
diff --git a/modules/ticket/front/picture/index.html b/modules/ticket/front/picture/index.html
index 58e13a451..e240d28ac 100644
--- a/modules/ticket/front/picture/index.html
+++ b/modules/ticket/front/picture/index.html
@@ -19,8 +19,8 @@
![]()
\ No newline at end of file
diff --git a/modules/zone/front/descriptor/index.js b/modules/zone/front/descriptor/index.js
index b3808f256..5c0c4dcce 100644
--- a/modules/zone/front/descriptor/index.js
+++ b/modules/zone/front/descriptor/index.js
@@ -1,10 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-class Controller extends Component {
+class Controller extends Descriptor {
$onInit() {
this.moreOptions = [
- {callback: this.deleteZone, name: 'Delete'}
+ {
+ name: 'Delete',
+ callback: () => this.$.deleteZone.show(),
+ }
];
}
@@ -12,20 +15,14 @@ class Controller extends Component {
callback.call(this);
}
- deleteZone() {
- this.$.deleteZone.show();
- }
-
- returnDialog(response) {
- if (response === 'accept') {
- this.$http.delete(`Zones/${this.zone.id}`).then(() => {
- this.$state.go('zone.index');
- });
- }
+ onDeleteAccept() {
+ return this.$http.delete(`Zones/${this.zone.id}`).then(() => {
+ this.$state.go('zone.index');
+ });
}
}
-ngModule.component('vnZoneDescriptor', {
+ngModule.vnComponent('vnZoneDescriptor', {
template: require('./index.html'),
controller: Controller,
bindings: {
diff --git a/modules/zone/front/index/index.html b/modules/zone/front/index/index.html
index 64450e451..39d5446d1 100644
--- a/modules/zone/front/index/index.html
+++ b/modules/zone/front/index/index.html
@@ -29,14 +29,14 @@
diff --git a/modules/zone/front/index/index.js b/modules/zone/front/index/index.js
index 9750a949f..b39c6139a 100644
--- a/modules/zone/front/index/index.js
+++ b/modules/zone/front/index/index.js
@@ -2,17 +2,11 @@ import ngModule from '../module';
import Section from 'salix/components/section';
export default class Controller extends Section {
- preview(event, zone) {
- this.stopEvent(event);
+ preview(zone) {
this.selectedZone = zone;
this.$.summary.show();
}
- clone(event, zone) {
- this.stopEvent(event);
- this.$.clone.show(zone);
- }
-
onCloneAccept(zone) {
return this.$http.post(`Zones/${zone.id}/clone`)
.then(res => {
Tickets to add
-
@@ -62,4 +62,6 @@
+
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 0acb661e3..3dd8691d5 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -105,8 +105,7 @@
quicklinks="$ctrl.quicklinks">
+ vn-id="workerDescriptor">
-
+ vn-id="workerDescriptor">
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index e120ad942..51798537f 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -100,8 +100,8 @@
![]()
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index fe19696f3..0bf960b1e 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -32,7 +32,6 @@ class Controller extends Section {
},
];
this._sales = [];
- this.imagesPath = '//verdnatura.es/vn-image-data/catalog';
}
get ticket() {
diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html
index f66c62449..99d0b838a 100644
--- a/modules/ticket/front/tracking/index/index.html
+++ b/modules/ticket/front/tracking/index/index.html
@@ -38,6 +38,5 @@
+ vn-id="workerDescriptor">
\ No newline at end of file
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 977f76513..610e517c9 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -58,7 +58,8 @@
diff --git a/modules/ticket/front/weekly/index.html b/modules/ticket/front/weekly/index.html
index e97d47eef..8411d4f72 100644
--- a/modules/ticket/front/weekly/index.html
+++ b/modules/ticket/front/weekly/index.html
@@ -32,23 +32,27 @@
-
+
-
+
{{weekly.ticketFk}}
-
+
{{::weekly.clientName}}
-
+
-
+
{{::weekly.warehouseName}}
-
+
{{::weekly.nickName}}
diff --git a/modules/ticket/front/weekly/index.js b/modules/ticket/front/weekly/index.js
index a89dbbc2e..0c373eae3 100644
--- a/modules/ticket/front/weekly/index.js
+++ b/modules/ticket/front/weekly/index.js
@@ -19,36 +19,10 @@ export default class Controller extends Section {
onUpdate(ticketFk, field, value) {
const params = {ticketFk, [field]: value};
- this.$http.patch('TicketWeeklies', params).then(() => {
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
+ this.$http.patch('TicketWeeklies', params)
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
}
- showClientDescriptor(event, clientFk) {
- this.$.clientDescriptor.clientFk = clientFk;
- this.$.clientDescriptor.parent = event.target;
- this.$.clientDescriptor.show();
- this.stopEvent(event);
- }
-
- showTicketDescriptor(event, ticketFk) {
- this.$.ticketDescriptor.ticketFk = ticketFk;
- this.$.ticketDescriptor.parent = event.target;
- this.$.ticketDescriptor.show();
- this.stopEvent(event);
- }
-
- showWorkerDescriptor(event, workerFk) {
- this.$.workerDescriptor.workerFk = workerFk;
- this.$.workerDescriptor.parent = event.target;
- this.$.workerDescriptor.show();
- this.stopEvent(event);
- }
-
- deleteWeekly(event, ticketFk) {
- this.$.deleteWeekly.show(ticketFk);
- this.stopEvent(event);
- }
onDeleteWeeklyAccept(ticketFk) {
return this.$http.delete(`TicketWeeklies/${ticketFk}`).then(() => {
this.vnApp.showSuccess(this.$t('Data saved!'));
diff --git a/modules/travel/front/descriptor-popover/index.html b/modules/travel/front/descriptor-popover/index.html
index fc0fb0301..46fb787a0 100644
--- a/modules/travel/front/descriptor-popover/index.html
+++ b/modules/travel/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/travel/front/descriptor-popover/index.js b/modules/travel/front/descriptor-popover/index.js
index cb7e29bda..b9839b04b 100644
--- a/modules/travel/front/descriptor-popover/index.js
+++ b/modules/travel/front/descriptor-popover/index.js
@@ -1,43 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.travel = null;
- this._quicklinks = {};
- }
-
- set travelId(travelId) {
- if (travelId == this._travelId) return;
-
- this._travelId = travelId;
- this.travel = null;
- this.loadData();
- }
-
- get travelId() {
- return this._travelId;
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
+class Controller extends DescriptorPopover {
+ get travel() {
+ return this.entity;
}
loadData() {
- let query = `Travels/findOne`;
- let filter = {
+ const filter = {
fields: [
'id',
'ref',
@@ -47,9 +17,6 @@ class Controller extends Component {
'warehouseInFk',
'warehouseOutFk'
],
- where: {
- id: this._travelId
- },
include: [
{
relation: 'warehouseIn',
@@ -65,20 +32,12 @@ class Controller extends Component {
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.travel = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+ return this.getData(`Travels/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnTravelDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- travelId: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnTravelDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/travel/front/descriptor-popover/index.spec.js b/modules/travel/front/descriptor-popover/index.spec.js
index 0403c902a..c191414c9 100644
--- a/modules/travel/front/descriptor-popover/index.spec.js
+++ b/modules/travel/front/descriptor-popover/index.spec.js
@@ -1,97 +1,26 @@
import './index.js';
-describe('travel Component vnTravelDescriptorPopover', () => {
- let $httpBackend;
- let $httpParamSerializer;
- let $scope;
+describe('vnTravelDescriptorPopover', () => {
let controller;
- let $element;
+ let $httpBackend;
beforeEach(ngModule('travel'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- $element = angular.element(``);
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- controller = $componentController('vnTravelDescriptorPopover', {$scope, $element});
+ controller = $componentController('vnTravelDescriptorPopover', {
+ $element: null,
+ $transclude: null
+ });
}));
- describe('travelId()', () => {
- it(`should not apply any changes if the received id is the same stored in _travelId`, () => {
- controller.travel = 'I exist!';
- controller._travelId = 1;
- jest.spyOn(controller, 'loadData');
- controller.travelId = 1;
-
- expect(controller.travel).toEqual('I exist!');
- expect(controller._travelId).toEqual(1);
- expect(controller.loadData).not.toHaveBeenCalled();
- });
-
- it(`should set the received id into _travelId, set the travel to null and then call loadData()`, () => {
- controller.travel = `Please don't`;
- controller._travelId = 1;
- jest.spyOn(controller, 'loadData');
- controller.travelId = 999;
-
- expect(controller.travel).toBeNull();
- expect(controller._travelId).toEqual(999);
- expect(controller.loadData).toHaveBeenCalledWith();
- });
- });
-
- describe('show()', () => {
- it(`should call the show()`, () => {
- jest.spyOn(controller.$.popover, 'show');
- controller.show();
-
- expect(controller.$.popover.show).toHaveBeenCalledWith();
- });
- });
-
describe('loadData()', () => {
it(`should perform a get query to store the worker data into the controller`, () => {
- controller.travelId = 1;
- controller.canceler = null;
- let response = {};
+ const id = 1;
+ const response = 'foo';
- let config = {
- filter: {
- fields: [
- 'id',
- 'ref',
- 'shipped',
- 'landed',
- 'totalEntries',
- 'warehouseInFk',
- 'warehouseOutFk'
- ],
- where: {
- id: controller.travelId
- },
- include: [
- {
- relation: 'warehouseIn',
- scope: {
- fields: ['name']
- }
- }, {
- relation: 'warehouseOut',
- scope: {
- fields: ['name']
- }
- }
- ]
- }
- };
-
- let json = $httpParamSerializer(config);
-
- $httpBackend.whenGET(`Travels/findOne?${json}`).respond(response);
- $httpBackend.expectGET(`Travels/findOne?${json}`);
- controller.loadData();
+ $httpBackend.expectGET(`Travels/${id}`).respond(response);
+ controller.id = id;
$httpBackend.flush();
expect(controller.travel).toEqual(response);
diff --git a/modules/travel/front/descriptor/index.js b/modules/travel/front/descriptor/index.js
index 911cae010..c38dd91a2 100644
--- a/modules/travel/front/descriptor/index.js
+++ b/modules/travel/front/descriptor/index.js
@@ -1,9 +1,9 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import Descriptor from 'salix/components/descriptor';
-ngModule.component('vnTravelDescriptor', {
+ngModule.vnComponent('vnTravelDescriptor', {
template: require('./index.html'),
- controller: Component,
+ controller: Descriptor,
bindings: {
travel: '<'
},
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 1cb176d13..b1af5c8dd 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -37,12 +37,12 @@
@@ -70,5 +70,4 @@
on-accept="$ctrl.onCloneAccept($data)"
question="Do you want to clone this travel?"
message="All it's properties will be copied">
-
-
-
-
-
-
-
-
-
-
@@ -131,10 +139,4 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/travel/front/summary/index.js b/modules/travel/front/summary/index.js
index af940aa6c..1f2d14e58 100644
--- a/modules/travel/front/summary/index.js
+++ b/modules/travel/front/summary/index.js
@@ -22,35 +22,30 @@ class Controller extends Section {
}
getTravel() {
- return this.$http.get(`/api/Travels/${this.travel.id}/getTravel`).then(response => {
- this.travelData = response.data;
- });
+ return this.$http.get(`Travels/${this.travel.id}/getTravel`)
+ .then(res => this.travelData = res.data);
}
getEntries() {
- return this.$http.get(`/api/Travels/${this.travel.id}/getEntries`).then(response => {
- this.entries = response.data;
- });
+ return this.$http.get(`Travels/${this.travel.id}/getEntries`)
+ .then(res => this.entries = res.data);
}
getThermographs() {
- const params = {
- filter: {
- include: {
- relation: 'warehouse',
- scope: {
- fields: ['id', 'name']
- }
- },
- where: {
- travelFk: this.travel.id
+ const filter = {
+ include: {
+ relation: 'warehouse',
+ scope: {
+ fields: ['id', 'name']
}
+ },
+ where: {
+ travelFk: this.travel.id
}
};
- return this.$http.get(`TravelThermographs`, {params}).then(res => {
- this.travelThermographs = res.data;
- });
+ return this.$http.get(`TravelThermographs`, {filter})
+ .then(res => this.travelThermographs = res.data);
}
total(field) {
diff --git a/modules/travel/front/summary/index.spec.js b/modules/travel/front/summary/index.spec.js
index 7f5c68aec..95f98bb85 100644
--- a/modules/travel/front/summary/index.spec.js
+++ b/modules/travel/front/summary/index.spec.js
@@ -36,7 +36,7 @@ describe('component vnTravelSummary', () => {
it('should perform a get and then store data on the controller', () => {
controller._travel = {id: 999};
- const query = `/api/Travels/${controller._travel.id}/getTravel`;
+ const query = `Travels/${controller._travel.id}/getTravel`;
$httpBackend.expectGET(query).respond('I am the travelData');
controller.getTravel();
$httpBackend.flush();
@@ -49,7 +49,7 @@ describe('component vnTravelSummary', () => {
it('should call the getEntries method to get the entries data', () => {
controller._travel = {id: 999};
- const query = `/api/Travels/${controller._travel.id}/getEntries`;
+ const query = `Travels/${controller._travel.id}/getEntries`;
$httpBackend.expectGET(query).respond('I am the entries');
controller.getEntries();
$httpBackend.flush();
@@ -61,22 +61,8 @@ describe('component vnTravelSummary', () => {
describe('getThermographs()', () => {
it('should call the getThermographs method to get the thermographs', () => {
controller._travel = {id: 2};
- const params = {
- filter: {
- include: {
- relation: 'warehouse',
- scope: {
- fields: ['id', 'name']
- }
- },
- where: {
- travelFk: controller._travel.id
- }
- }
- };
- const serializedParams = $httpParamSerializer(params);
- const query = `TravelThermographs?${serializedParams}`;
- $httpBackend.expectGET(query).respond('I am the thermographs');
+
+ $httpBackend.expectGET(`TravelThermographs`).respond('I am the thermographs');
controller.getThermographs();
$httpBackend.flush();
diff --git a/modules/worker/front/descriptor-popover/index.html b/modules/worker/front/descriptor-popover/index.html
index 21f32f0c2..7c9155dda 100644
--- a/modules/worker/front/descriptor-popover/index.html
+++ b/modules/worker/front/descriptor-popover/index.html
@@ -1,12 +1,6 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/worker/front/descriptor-popover/index.js b/modules/worker/front/descriptor-popover/index.js
index 6463853f9..eedcebe48 100644
--- a/modules/worker/front/descriptor-popover/index.js
+++ b/modules/worker/front/descriptor-popover/index.js
@@ -1,46 +1,13 @@
import ngModule from '../module';
-import Component from 'core/lib/component';
+import DescriptorPopover from 'salix/components/descriptor-popover';
-class Controller extends Component {
- constructor($element, $) {
- super($element, $);
- this.worker = null;
- this._quicklinks = {};
- }
-
- set workerFk(workerFk) {
- if (workerFk == this._workerFk) return;
-
- this._workerFk = workerFk;
- this.worker = null;
- this.loadData();
- }
-
- get workerFk() {
- return this._workerFk;
- }
-
- get quicklinks() {
- return this._quicklinks;
- }
-
- set quicklinks(value = {}) {
- Object.keys(value).forEach(key => {
- this._quicklinks[key] = value[key];
- });
- }
-
- show() {
- this.$.popover.parent = this.parent;
- this.$.popover.show();
+class Controller extends DescriptorPopover {
+ get worker() {
+ return this.entity;
}
loadData() {
- let query = `Workers/findOne`;
- let filter = {
- where: {
- id: this._workerFk
- },
+ const filter = {
include: [
{
relation: 'user',
@@ -53,16 +20,13 @@ class Controller extends Component {
}
}
}
- },
- {
+ }, {
relation: 'client',
scope: {fields: ['fi']}
- },
- {
+ }, {
relation: 'sip',
scope: {fields: ['extension']}
- },
- {
+ }, {
relation: 'department',
scope: {
include: {
@@ -73,20 +37,12 @@ class Controller extends Component {
]
};
- this.$http.get(query, {params: {filter}}).then(res => {
- this.worker = res.data;
- this.$.$applyAsync(() => {
- this.$.popover.relocate();
- });
- });
+ return this.getData(`Workers/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
}
-ngModule.component('vnWorkerDescriptorPopover', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- workerFk: '<',
- quicklinks: '<'
- }
+ngModule.vnComponent('vnWorkerDescriptorPopover', {
+ slotTemplate: require('./index.html'),
+ controller: Controller
});
diff --git a/modules/worker/front/descriptor-popover/index.spec.js b/modules/worker/front/descriptor-popover/index.spec.js
index 0b2746475..4b9a17e8a 100644
--- a/modules/worker/front/descriptor-popover/index.spec.js
+++ b/modules/worker/front/descriptor-popover/index.spec.js
@@ -1,101 +1,26 @@
import './index.js';
-describe('worker Component vnWorkerDescriptorPopover', () => {
- let $httpBackend;
- let $httpParamSerializer;
- let $scope;
+describe('vnWorkerDescriptorPopover', () => {
let controller;
+ let $httpBackend;
beforeEach(ngModule('worker'));
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
+ beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- $scope = $rootScope.$new();
- $scope.popover = {relocate: () => {}, show: () => {}};
- const $element = angular.element(`
+ vn-id="workerDescriptor">
diff --git a/modules/zone/front/delivery-days/index.html b/modules/zone/front/delivery-days/index.html
index 59ed5c944..ebecef899 100644
--- a/modules/zone/front/delivery-days/index.html
+++ b/modules/zone/front/delivery-days/index.html
@@ -85,7 +85,7 @@
diff --git a/modules/zone/front/delivery-days/index.js b/modules/zone/front/delivery-days/index.js
index cf7ef14da..eb6d7795d 100644
--- a/modules/zone/front/delivery-days/index.js
+++ b/modules/zone/front/delivery-days/index.js
@@ -61,8 +61,7 @@ class Controller extends Section {
});
}
- preview(event, zone) {
- this.stopEvent(event);
+ preview(zone) {
this.selectedZone = zone;
this.$.summary.show();
}
diff --git a/modules/zone/front/descriptor/index.html b/modules/zone/front/descriptor/index.html
index 58441d10d..90f4effea 100644
--- a/modules/zone/front/descriptor/index.html
+++ b/modules/zone/front/descriptor/index.html
@@ -18,36 +18,44 @@
{{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}}
-
-
-
-
-
-
-
-