verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Gerard 2019-02-19 12:59:58 +01:00
parent abfbf791f3 acc324c081
commit 5ef524559e
37 changed files with 522 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
e2e/paths/ticket-module/07_edit_sale.spec.js
View File

@ -1,7 +1,8 @@
import selectors from '../../helpers/selectors.js';
import createNightmare from '../../helpers/nightmare';
describe('Ticket Edit sale path', () => {
// #1152 refactor ticket.sale, update price no funciona correctamente.
xdescribe('Ticket Edit sale path', () => {
const nightmare = createNightmare();
beforeAll(() => {
@ -156,8 +157,7 @@ describe('Ticket Edit sale path', () => {
it('should update the price', async() => {
const result = await nightmare
.waitToClick(selectors.ticketSales.firstSalePrice)
.write(selectors.ticketSales.firstSalePriceInput, 5)
.write('body', '\u000d') // simulates enter
.write(selectors.ticketSales.firstSalePriceInput, '5\u000d')
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
@ -181,8 +181,8 @@ describe('Ticket Edit sale path', () => {
const result = await nightmare
.waitToClick(selectors.ticketSales.firstSaleDiscount)
.wait('vn-textfield[label="Discount"] > div[class="container selected"]') // a function selects the text after it's loaded
.write(selectors.ticketSales.firstSaleDiscountInput, 50)
.write('body', '\u000d') // simulates enter
.write(selectors.ticketSales.firstSaleDiscountInput, '50\u000d')
// .write('body', '\u000d') // simulates enter
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
@ -318,7 +318,7 @@ describe('Ticket Edit sale path', () => {
it('should go back to the original ticket sales section', async() => {
const url = await nightmare
.waitToClick(selectors.itemsIndex.goBackToModuleIndexButton)
.write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.write(selectors.ticketsIndex.searchTicketInput, '16')
.waitToClick(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21')
@ -488,7 +488,7 @@ describe('Ticket Edit sale path', () => {
it('should now search for a specific ticket', async() => {
const result = await nightmare
.write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.write(selectors.ticketsIndex.searchTicketInput, '16')
.waitToClick(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult);
@ -574,7 +574,7 @@ describe('Ticket Edit sale path', () => {
it('should once again search for a specific ticket', async() => {
const result = await nightmare
.write(selectors.ticketsIndex.searchTicketInput, 'id:16')
.write(selectors.ticketsIndex.searchTicketInput, '16')
.waitToClick(selectors.ticketsIndex.searchButton)
.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1)
.countElement(selectors.ticketsIndex.searchResult);

33
modules/claim/back/methods/claim/getSummary.js
View File

@ -89,12 +89,33 @@ module.exports = Self => {
filter = {
where: {claimFk: id},
include: [
{relation: 'claimResponsible'},
{relation: 'worker'},
{relation: 'claimDestination'},
{relation: 'claimReason'},
{relation: 'claimResult'},
{relation: 'claimRedelivery'}
{
relation: 'claimResponsible'
},
{
relation: 'worker',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['nickname']
}
}
}
},
{
relation: 'claimDestination'
},
{
relation: 'claimReason'
},
{
relation: 'claimResult'
},
{
relation: 'claimRedelivery'
}
]
};
promises.push(Self.app.models.ClaimDevelopment.find(filter));

16
modules/claim/front/index/index.html
View File

@ -37,12 +37,18 @@
ui-sref="claim.card.summary({id: claim.id})">
<vn-td number>{{::claim.id}}</vn-td>
<vn-td expand>
<span class="link" ng-click="$ctrl.showDescriptor($event, claim.client.id)">
<span class="link" ng-click="$ctrl.showClientDescriptor($event, claim.client.id)">
{{::claim.client.name}}
</span>
</vn-td>
<vn-td center>{{::claim.created | date:'dd/MM/yyyy'}}</vn-td>
<vn-td expand>{{::claim.worker.user.nickname}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, claim.worker.user.id)">
{{::claim.worker.user.nickname}}
</span>
</vn-td>
<vn-td>
<span class="chip {{::$ctrl.stateColor(claim)}}">
{{::claim.claimState.description}}
@ -67,7 +73,11 @@
</vn-card>
<vn-pagination model="model"></vn-pagination>
</div>
<vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
<vn-client-descriptor-popover vn-id="clientDescriptor"></vn-client-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>
<vn-dialog class="dialog-summary"
vn-id="dialog-summary-claim">
<tpl-body>

16
modules/claim/front/index/index.js
View File

@ -65,14 +65,22 @@ export default class Controller {
}
}
showDescriptor(event, clientFk) {
this.$.descriptor.clientFk = clientFk;
this.$.descriptor.parent = event.target;
this.$.descriptor.show();
showClientDescriptor(event, clientFk) {
this.$.clientDescriptor.clientFk = clientFk;
this.$.clientDescriptor.parent = event.target;
this.$.clientDescriptor.show();
event.preventDefault();
event.stopImmediatePropagation();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
preview(event, claim) {
this.claimSelected = claim;
this.$.dialogSummaryClaim.show();

2
modules/claim/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Claims",
"icon": "icon-claims",
"validations": true,
"dependencies": ["item", "client"],
"dependencies": ["worker", "item", "client"],
"menu": [
{"state": "claim.card.basicData", "icon": "settings"},
{"state": "claim.card.detail", "icon": "icon-details"},

20
modules/claim/front/summary/index.html
View File

@ -54,7 +54,7 @@
<vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, saleClaimed.sale.itemFk)"
ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)"
class="link">
{{saleClaimed.sale.itemFk | zeroFill:6}}
</span>
@ -90,7 +90,13 @@
<vn-td>{{development.claimReason.description}}</vn-td>
<vn-td>{{development.claimResult.description}}</vn-td>
<vn-td>{{development.claimResponsible.description}}</vn-td>
<vn-td>{{development.worker.firstName}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, development.worker.user.id)">
{{::development.worker.user.nickname}}
</span>
</vn-td>
<vn-td>{{development.claimRedelivery.description}}</vn-td>
</vn-tr>
</vn-tbody>
@ -115,7 +121,7 @@
<vn-tr ng-repeat="action in $ctrl.summary.actions">
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, action.sale.itemFk)"
ng-click="$ctrl.showItemDescriptor($event, action.sale.itemFk)"
class="link">
{{action.sale.itemFk | zeroFill:6}}
</span>
@ -138,6 +144,10 @@
</vn-horizontal>
</vn-card>
<vn-item-descriptor-popover
vn-id="descriptor"
vn-id="itemDescriptor"
quicklinks="$ctrl.quicklinks">
</vn-item-descriptor-popover>
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>

21
modules/claim/front/summary/index.js
View File

@ -1,7 +1,7 @@
import ngModule from '../module';
class Controller {
constructor($http, $scope) {
constructor($scope, $http) {
this.$http = $http;
this.$ = $scope;
}
@ -17,8 +17,7 @@ class Controller {
this.getSummary();
}
// Item Descriptor
showDescriptor(event, itemFk) {
showItemDescriptor(event, itemFk) {
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
@ -28,13 +27,21 @@ class Controller {
tooltip: 'Item diary'
}
};
this.$.descriptor.itemFk = itemFk;
this.$.descriptor.parent = event.target;
this.$.descriptor.show();
this.$.itemDescriptor.itemFk = itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
}
Controller.$inject = ['$http', '$scope'];
Controller.$inject = ['$scope', '$http'];
ngModule.component('vnClaimSummary', {
template: require('./index.html'),

1
modules/item/back/methods/item/filter.js
View File

@ -72,6 +72,7 @@ module.exports = Self => {
i.size, i.tag5, i.value5, i.tag6, i.value6,
i.tag7, i.value7, i.tag8, i.value8, i.isActive,
t.name type, u.nickname userNickname,
t.name type, u.id userId,
intr.description AS intrastat, i.stems,
ori.code AS origin, t.name AS type,
ic.name AS category, i.density, tc.description AS taxClass

2
modules/item/front/diary/index.html
View File

@ -23,7 +23,7 @@
<vn-thead>
<vn-tr>
<vn-th>Date</vn-th>
<vn-th number order="DESC">Id</vn-th>
<vn-th number order="DESC">Ticket/Entry</vn-th>
<vn-th>State</vn-th>
<vn-th>Reference</vn-th>
<vn-th>Client</vn-th>

3
modules/item/front/diary/locale/es.yml
View File

@ -1,3 +1,4 @@
In: Entrada
Out: Salida
Visible quantity: Cantidad visible
Visible quantity: Cantidad visible
Ticket/Entry: Ticket/Entrada

25
modules/item/front/index/index.html
View File

@ -46,7 +46,13 @@
ng-click="$ctrl.stopEvent($event)"
on-error-src/>
</vn-td>
<vn-td number>{{::item.id | zeroFill:6}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showItemDescriptor($event, item.id)">
{{::item.id | zeroFill:6}}
</span>
</vn-td>
<vn-td expand>
<vn-fetched-tags
max-length="6"
@ -59,7 +65,14 @@
<vn-td>{{::item.category}}</vn-td>
<vn-td>{{::item.intrastat}}</vn-td>
<vn-td>{{::item.origin}}</vn-td>
<vn-td>{{::item.userNickname}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, item.userId)">
{{::item.userNickname}}
</span>
</vn-td>
<vn-td>{{::item.density}}</vn-td>
<vn-td number>{{::item.density}}</vn-td>
<vn-td>{{::item.taxClass}}</vn-td>
<vn-td>
@ -101,4 +114,10 @@
on-response="$ctrl.onCloneAccept(response)"
question="Do you want to clone this item?"
message="All it's properties will be copied">
</vn-confirm>
</vn-confirm>
<vn-item-descriptor-popover vn-id="itemDescriptor">
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>

27
modules/item/front/index/index.js
View File

@ -28,21 +28,36 @@ class Controller {
this.$.model.clear();
}
showDescriptor(event, itemFk) {
showItemDescriptor(event, itemFk) {
if (event.defaultPrevented) return;
event.preventDefault();
event.stopPropagation();
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
state: `item.card.diary({
id: ${itemFk},
warehouseFk: ${this.ticket.warehouseFk},
ticketFk: ${this.ticket.id}
})`,
tooltip: 'Item diary'
}
};
this.$scope.descriptor.itemFk = itemFk;
this.$scope.descriptor.parent = event.target;
this.$scope.descriptor.show();
this.$.itemDescriptor.itemFk = itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}
showWorkerDescriptor(event, userId) {
if (event.defaultPrevented) return;
event.preventDefault();
event.stopPropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
cloneItem(event, item) {

2
modules/item/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Items",
"icon": "inbox",
"validations" : true,
"dependencies": ["client", "ticket"],
"dependencies": ["worker", "client", "ticket"],
"menu": [
{"state": "item.card.data", "icon": "settings"},
{"state": "item.card.tags", "icon": "icon-tags"},

16
modules/order/front/index/index.html
View File

@ -36,11 +36,17 @@
ui-sref="order.card.summary({id: {{::order.id}}})">
<vn-td number>{{::order.id}}</vn-td>
<vn-td expand>
<span class="link" ng-click="$ctrl.showDescriptor($event, order.clientFk)">
<span class="link" ng-click="$ctrl.showClientDescriptor($event, order.clientFk)">
{{::order.client.name}}
</span>
</vn-td>
<vn-td>{{::order.client.salesPerson.user.nickname}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, order.client.salesPerson.user.id)">
{{::order.client.salesPerson.user.nickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td center>
<vn-check
field="order.isConfirmed"
@ -71,8 +77,12 @@
<vn-float-button icon="add"></vn-float-button>
</a>
<vn-client-descriptor-popover
vn-id="descriptor">
vn-id="clientDescriptor">
</vn-client-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>
<vn-dialog
vn-id="summary"
class="dialog-summary">

22
modules/order/front/index/index.js
View File

@ -2,7 +2,7 @@ import ngModule from '../module';
export default class Controller {
constructor($scope) {
this.$scope = $scope;
this.$ = $scope;
this.ticketSelected = null;
this.filter = {
include: [
@ -51,23 +51,31 @@ export default class Controller {
}
}
showDescriptor(event, clientFk) {
this.$scope.descriptor.clientFk = clientFk;
this.$scope.descriptor.parent = event.target;
this.$scope.descriptor.show();
showClientDescriptor(event, clientFk) {
this.$.clientDescriptor.clientFk = clientFk;
this.$.clientDescriptor.parent = event.target;
this.$.clientDescriptor.show();
event.preventDefault();
event.stopImmediatePropagation();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
onDescriptorLoad() {
this.$scope.popover.relocate();
this.$.popover.relocate();
}
preview(event, order) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedOrder = order;
this.$scope.summary.show();
this.$.summary.show();
}
}

2
modules/order/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Orders",
"icon": "shopping_cart",
"validations": true,
"dependencies": ["item", "ticket"],
"dependencies": ["worker", "item", "ticket"],
"menu": [
{"state": "order.card.basicData", "icon": "settings"},
{"state": "order.card.catalog", "icon": "shopping_cart"},

5
modules/ticket/back/methods/expedition/filter.js
View File

@ -33,14 +33,15 @@ module.exports = Self => {
e.checked,
i2.name nameBox,
e.itemFk,
w.name nameWorker,
w.firstName,
u.nickname userNickname,
u.id userId,
e.created
FROM
vn.expedition e
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox
LEFT JOIN vn.worker w ON w.id = e.workerFk
JOIN account.user u ON u.id = w.id
`);
stmt.merge(Self.buildSuffix(filter, 'e'));

1
modules/ticket/back/methods/sale-tracking/listSaleTracking.js
View File

@ -32,6 +32,7 @@ module.exports = Self => {
st.created,
st.workerFk,
u.nickname userNickname,
u.id userId,
ste.name AS state
FROM saleTracking st
JOIN sale s ON s.id = st.saleFk

3
modules/ticket/back/methods/ticket/filter.js
View File

@ -183,7 +183,8 @@ module.exports = Self => {
ts.stateFk as stateFk,
ts.alertLevel as alertLevel,
ts.code as alertLevelCode,
u.nickname userNickname
u.nickname userNickname,
u.id userId
FROM ticket t
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN province p ON p.id = a.provinceFk

18
modules/ticket/front/expedition/index.html
View File

@ -33,7 +33,7 @@
<vn-td number>
<span
ng-class="{link: expedition.itemFk}"
ng-click="$ctrl.showDescriptor($event, expedition.itemFk)">
ng-click="$ctrl.showItemDescriptor($event, expedition.itemFk)">
{{expedition.itemFk | zeroFill:6}}
</span>
</vn-td>
@ -41,7 +41,14 @@
<vn-td>{{::expedition.nameBox}}</vn-td>
<vn-td number>{{::expedition.counter}}</vn-td>
<vn-td number>{{::expedition.checked}}</vn-td>
<vn-td>{{::expedition.firstName}} {{::expedition.nameWorker}}</vn-td>
<vn-td>{{::expedition.userNickname}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, expedition.userId)">
{{::expedition.userNickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
</vn-tr>
</vn-tbody>
@ -51,9 +58,14 @@
</vn-card>
</vn-vertical>
<vn-item-descriptor-popover vn-id="descriptor"
<vn-item-descriptor-popover
vn-id="itemDescriptor"
quicklinks="$ctrl.quicklinks">
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>
<vn-confirm
vn-id="delete-expedition"
on-response="$ctrl.returnDialog(response)"

24
modules/ticket/front/expedition/index.js
View File

@ -2,25 +2,25 @@ import ngModule from '../module';
class Controller {
constructor($scope, $stateParams, $http) {
this.$scope = $scope;
this.$ = $scope;
this.$stateParams = $stateParams;
this.$http = $http;
}
deleteExpedition(expedition) {
this.expeditionId = expedition.id;
this.$scope.deleteExpedition.show();
this.$.deleteExpedition.show();
}
returnDialog(response) {
if (response === 'ACCEPT') {
this.$http.delete(`/ticket/api/Expeditions/${this.expeditionId}`).then(
() => this.$scope.model.refresh()
() => this.$.model.refresh()
);
}
}
showDescriptor(event, itemFk) {
showItemDescriptor(event, itemFk) {
if (!itemFk) return;
this.quicklinks = {
btnThree: {
@ -33,13 +33,21 @@ class Controller {
tooltip: 'Item diary',
},
};
this.$scope.descriptor.itemFk = itemFk;
this.$scope.descriptor.parent = event.target;
this.$scope.descriptor.show();
this.$.itemDescriptor.itemFk = itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
onDescriptorLoad() {
this.$scope.popover.relocate();
this.$.popover.relocate();
}
}

18
modules/ticket/front/index/index.html
View File

@ -59,7 +59,13 @@
</vn-icon>
</vn-td>
<vn-td number>{{::ticket.id}}</vn-td>
<vn-td>{{::ticket.userNickname | dashIfEmpty}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, ticket.userId)">
{{::ticket.userNickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td>
<span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
{{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}
@ -69,7 +75,7 @@
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showDescriptor($event, ticket.clientFk)">
ng-click="$ctrl.showClientDescriptor($event, ticket.clientFk)">
{{::ticket.nickname}}
</span>
</vn-td>
@ -110,5 +116,9 @@
<vn-ticket-summary ticket="$ctrl.selectedTicket"></vn-ticket-summary>
</tpl-body>
</vn-dialog>
<vn-client-descriptor-popover vn-id="descriptor">
</vn-client-descriptor-popover>
<vn-client-descriptor-popover vn-id="clientDescriptor">
</vn-client-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>

16
modules/ticket/front/index/index.js
View File

@ -88,12 +88,20 @@ export default class Controller {
return 'alert';
}
showDescriptor(event, clientFk) {
showClientDescriptor(event, clientFk) {
event.preventDefault();
event.stopImmediatePropagation();
this.$.descriptor.clientFk = clientFk;
this.$.descriptor.parent = event.target;
this.$.descriptor.show();
this.$.clientDescriptor.clientFk = clientFk;
this.$.clientDescriptor.parent = event.target;
this.$.clientDescriptor.show();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
preview(event, ticket) {

13
modules/ticket/front/index/index.spec.js
View File

@ -14,12 +14,13 @@ describe('Component vnTicketIndex', () => {
}];
beforeEach(() => {
ngModule('worker');
ngModule('client');
ngModule('item');
ngModule('ticket');
});
beforeEach(inject(($compile, $rootScope, $httpBackend, _$window_) => {
beforeEach(inject(($compile, $rootScope, _$window_) => {
$window = _$window_;
$element = $compile('<vn-ticket-index></vn-ticket-index>')($rootScope);
controller = $element.controller('vnTicketIndex');
@ -54,18 +55,18 @@ describe('Component vnTicketIndex', () => {
});
});
describe('showDescriptor()', () => {
it('should show the descriptor popover', () => {
spyOn(controller.$.descriptor, 'show');
describe('showClientDescriptor()', () => {
it('should show the client descriptor popover', () => {
spyOn(controller.$.clientDescriptor, 'show');
let event = new MouseEvent('click', {
view: $window,
bubbles: true,
cancelable: true
});
controller.showDescriptor(event, tickets[0].clientFk);
controller.showClientDescriptor(event, tickets[0].clientFk);
expect(controller.$.descriptor.show).toHaveBeenCalledWith();
expect(controller.$.clientDescriptor.show).toHaveBeenCalledWith();
});
});

24
modules/ticket/front/request/index/index.html
View File

@ -35,14 +35,26 @@
<vn-td number>{{::request.id}}</vn-td>
<vn-td expand>{{::request.description}}</vn-td>
<vn-td number>{{::request.created | dateTime: 'dd/MM/yyyy'}}</vn-td>
<vn-td>{{::request.requester.user.nickname}}</vn-td>
<vn-td>{{::request.atender.user.nickname}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, request.requester.user.id)">
{{::request.requester.user.nickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, request.atender.user.id)">
{{::request.atender.user.nickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td number>{{::request.quantity}}</vn-td>
<vn-td number>{{::request.price | currency: 'EUR': 2}}</vn-td>
<vn-td number>
<span
ng-show="::request.saleFk"
ng-click="$ctrl.showDescriptor($event, request.sale)"
ng-click="$ctrl.showItemDescriptor($event, request.sale)"
class="link">
{{request.saleFk | zeroFill:6}}
</span>
@ -69,9 +81,13 @@
</vn-card>
</form>
<vn-item-descriptor-popover
vn-id="descriptor"
vn-id="itemDescriptor"
quicklinks="$ctrl.quicklinks">
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>
<a ui-sref="ticket.card.request.create"
vn-tooltip="New request"
vn-bind="+"

34
modules/ticket/front/request/index/index.js
View File

@ -1,9 +1,9 @@
import ngModule from '../../module';
class Controller {
constructor($stateParams, $scope) {
constructor($scope, $stateParams) {
this.$stateParams = $stateParams;
this.$scope = $scope;
this.$ = $scope;
this.filter = {
include: [
{
@ -36,15 +36,15 @@ class Controller {
}
removeLine(index) {
this.$scope.model.remove(index);
this.$scope.watcher.check();
this.$scope.model.save().then(() => {
this.$scope.watcher.notifySaved();
this.$scope.watcher.updateOriginalData();
this.$.model.remove(index);
this.$.watcher.check();
this.$.model.save().then(() => {
this.$.watcher.notifySaved();
this.$.watcher.updateOriginalData();
});
}
// Item Descriptor
showDescriptor(event, sale) {
showItemDescriptor(event, sale) {
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
@ -55,13 +55,21 @@ class Controller {
tooltip: 'Item diary'
}
};
this.$scope.descriptor.itemFk = sale.itemFk;
this.$scope.descriptor.parent = event.target;
this.$scope.descriptor.show();
this.$.itemDescriptor.itemFk = sale.itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
}
Controller.$inject = ['$stateParams', '$scope'];
Controller.$inject = ['$scope', '$stateParams'];
ngModule.component('vnTicketRequestIndex', {
template: require('./index.html'),

2
modules/ticket/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Tickets",
"icon": "icon-ticket",
"validations": true,
"dependencies": ["item", "client"],
"dependencies": ["worker", "item", "client"],
"menu": [
{"state": "ticket.card.data.stepOne", "icon": "settings"},
{"state": "ticket.card.sale", "icon": "icon-lines"},

19
modules/ticket/front/sale-tracking/index.html
View File

@ -32,7 +32,7 @@
</vn-td>
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
ng-click="$ctrl.showItemDescriptor($event, sale.itemFk)"
class="link">
{{sale.itemFk | zeroFill:6}}
</span>
@ -40,9 +40,12 @@
<vn-td><vn-fetched-tags max-length="6" item="sale.item"/></vn-td>
<vn-td>{{::sale.quantity}}</vn-td>
<vn-td>{{::sale.originalQuantity}}</vn-td>
<vn-td title="{{::sale.firstName}} {{::sale.name}}"
class="ellipsize" style="max-width: 5em">
{{::sale.userNickname}}
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, sale.userId)">
{{::sale.userNickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td>{{::sale.state}}</vn-td>
<vn-td>{{::sale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
@ -53,6 +56,10 @@
<vn-pagination model="model"></vn-pagination>
</vn-card>
</vn-vertical>
<vn-item-descriptor-popover vn-id="descriptor"
<vn-item-descriptor-popover vn-id="itemDescriptor"
quicklinks="$ctrl.quicklinks">
</vn-item-descriptor-popover>
</vn-item-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>

20
modules/ticket/front/sale-tracking/index.js
View File

@ -2,11 +2,11 @@ import ngModule from '../module';
class Controller {
constructor($scope, $stateParams) {
this.$scope = $scope;
this.$ = $scope;
this.$stateParams = $stateParams;
}
showDescriptor(event, itemFk) {
showItemDescriptor(event, itemFk) {
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
@ -18,13 +18,21 @@ class Controller {
tooltip: 'Item diary',
},
};
this.$scope.descriptor.itemFk = itemFk;
this.$scope.descriptor.parent = event.target;
this.$scope.descriptor.show();
this.$.itemDescriptor.itemFk = itemFk;
this.$.itemDescriptor.parent = event.target;
this.$.itemDescriptor.show();
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
onDescriptorLoad() {
this.$scope.popover.relocate();
this.$.popover.relocate();
}
}

15
modules/ticket/front/tracking/index/index.html
View File

@ -6,7 +6,6 @@
limit="20"
data="trackings">
</vn-crud-model>
<vn-vertical compact>
<vn-card pad-large>
<vn-vertical>
@ -22,7 +21,13 @@
<vn-tbody>
<vn-tr ng-repeat="tracking in trackings">
<vn-td>{{::tracking.state.name}}</vn-td>
<vn-td>{{::tracking.worker.firstName}} {{ticket.worker.name}}</vn-td>
<vn-td expand>
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, tracking.worker.user.id)">
{{::tracking.worker.user.nickname | dashIfEmpty}}
</span>
</vn-td>
<vn-td>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
</vn-tr>
</vn-tbody>
@ -33,4 +38,8 @@
</vn-vertical>
<a ui-sref="ticket.card.tracking.edit" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add"></vn-float-button>
</a>
</a>
<vn-worker-descriptor-popover
vn-id="workerDescriptor"
worker-fk="$ctrl.selectedWorker">
</vn-worker-descriptor-popover>

21
modules/ticket/front/tracking/index/index.js
View File

@ -1,14 +1,21 @@
import ngModule from '../../module';
class Controller {
constructor($stateParams) {
constructor($scope, $stateParams) {
this.$ = $scope;
this.$stateParams = $stateParams;
this.filter = {
include: [
{
relation: 'worker',
scope: {
fields: ['firstName', 'name']
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['nickname']
}
}
}
},
{
@ -20,9 +27,17 @@ class Controller {
]
};
}
showWorkerDescriptor(event, userId) {
event.preventDefault();
event.stopImmediatePropagation();
this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show();
}
}
Controller.$inject = ['$stateParams'];
Controller.$inject = ['$scope', '$stateParams'];
ngModule.component('vnTicketTrackingIndex', {
template: require('./index.html'),

12
modules/worker/front/descriptor-popover/index.html Normal file
View File

@ -0,0 +1,12 @@
<vn-popover vn-id="popover">
<vn-spinner
ng-if="$ctrl.worker == null"
style="padding: 1em;"
enable="true">
</vn-spinner>
<vn-worker-descriptor
ng-if="$ctrl.worker"
worker="$ctrl.worker"
quicklinks="$ctrl.quicklinks">
</vn-worker-descriptor>
</vn-popover>

73
modules/worker/front/descriptor-popover/index.js Normal file
View File

@ -0,0 +1,73 @@
import ngModule from '../module';
import Component from 'core/lib/component';
import './style.scss';
class Controller extends Component {
constructor($element, $scope, $http, $timeout, $q) {
super($element, $scope);
this.$timeout = $timeout;
this.$http = $http;
this.$q = $q;
this.worker = null;
}
set workerFk(id) {
if (id == this._workerFk) return;
this._workerFk = id;
this.worker = null;
this.loadData();
}
get workerFk() {
return this._workerFk;
}
set quicklinks(value = {}) {
this._quicklinks = Object.assign(value, this._quicklinks);
}
get quicklinks() {
return this._quicklinks;
}
show() {
this.$.popover.parent = this.parent;
this.$.popover.show();
}
loadData() {
let query = `api/Workers/${this._workerFk}`;
let filter = {
include: [
{
relation: 'user',
scope: {fields: ['name', 'email']}
}, {
relation: 'client',
scope: {fields: ['fi']}
}, {
relation: 'sip',
scope: {fields: ['extension']}
}
]
};
this.$http.get(query, {params: {filter}}).then(res => {
this.worker = res.data;
this.$.$applyAsync(() => {
this.$.popover.relocate();
});
});
}
}
Controller.$inject = ['$element', '$scope', '$http', '$timeout', '$q'];
ngModule.component('vnWorkerDescriptorPopover', {
template: require('./index.html'),
controller: Controller,
bindings: {
workerFk: '<',
quicklinks: '<'
}
});

87
modules/worker/front/descriptor-popover/index.spec.js Normal file
View File

@ -0,0 +1,87 @@
import './index.js';
describe('worker Component vnWorkerDescriptorPopover', () => {
let $httpBackend;
let $httpParamSerializer;
let $scope;
let controller;
let $element;
beforeEach(ngModule('worker'));
beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
$httpBackend = _$httpBackend_;
$httpParamSerializer = _$httpParamSerializer_;
$element = angular.element(`<div></div>`);
$scope = $rootScope.$new();
$scope.popover = {relocate: () => {}, show: () => {}};
controller = $componentController('vnWorkerDescriptorPopover', {$scope, $element});
}));
describe('workerFk()', () => {
it(`should not apply any changes if the received id is the same stored in _workerFk`, () => {
controller.worker = 'I exist!';
controller._workerFk = 1;
spyOn(controller, 'loadData');
controller.workerFk = 1;
expect(controller.worker).toEqual('I exist!');
expect(controller._workerFk).toEqual(1);
expect(controller.loadData).not.toHaveBeenCalled();
});
it(`should set the received id into _workerFk, set the worker to null and then call loadData()`, () => {
controller.worker = `Please don't`;
controller._workerFk = 1;
spyOn(controller, 'loadData');
controller.workerFk = 999;
expect(controller.worker).toBeNull();
expect(controller._workerFk).toEqual(999);
expect(controller.loadData).toHaveBeenCalledWith();
});
});
describe('show()', () => {
it(`should call the show()`, () => {
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.workerFk = 1;
controller.canceler = null;
let response = {};
let config = {
filter: {
include: [
{
relation: 'user',
scope: {fields: ['name', 'email']}
}, {
relation: 'client',
scope: {fields: ['fi']}
}, {
relation: 'sip',
scope: {fields: ['extension']}
}
]
}
};
let json = $httpParamSerializer(config);
$httpBackend.whenGET(`api/Workers/${controller._workerFk}?${json}`).respond(response);
$httpBackend.expectGET(`api/Workers/${controller._workerFk}?${json}`);
controller.loadData();
$httpBackend.flush();
expect(controller.worker).toEqual(response);
});
});
});

11
modules/worker/front/descriptor-popover/style.scss Normal file
View File

@ -0,0 +1,11 @@
vn-ticket-descriptor-popover {
vn-ticket-descriptor {
display: block;
width: 16em;
max-height: 28em;
& > vn-card {
margin: 0!important;
}
}
}

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

@ -4,5 +4,6 @@ import './index/';
import './summary';
import './card';
import './descriptor';
import './descriptor-popover';
import './search-panel';
import './basic-data';

4
services/db/install/dump/fixtures.sql
View File

@ -657,8 +657,8 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`)
VALUES
( 1, 0, CURDATE(), 5, 40, 3, 1, 14),
( 1, 1, CURDATE(), 5, 40, 3, 2, 8),
( 1, 0, CURDATE(), 5, 55, 3, 1, 14),
( 1, 1, CURDATE(), 5, 54, 3, 2, 8),
( 2, 1, CURDATE(), 10, 40, 4, 3, 8),
( 3, 1, CURDATE(), 2, 40, 4, 4, 8);