Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-06-08 14:08:56 +00:00
commit 7d53f274de
5 changed files with 30 additions and 4 deletions

View File

@ -76,8 +76,8 @@
<span <span
ng-if="balance.isInvoice" ng-if="balance.isInvoice"
title="{{'BILL' | translate: {ref: balance.ref} }}" title="{{'BILL' | translate: {ref: balance.ref} }}"
vn-click-stop="invoiceOutDescriptor.show($event, balance)" vn-click-stop="$ctrl.showInvoiceOutDescriptor($event, balance)"
ng-class="link"> class="link">
{{'BILL' | translate: {ref: balance.ref} }} {{'BILL' | translate: {ref: balance.ref} }}
</span> </span>
<span <span

View File

@ -72,6 +72,13 @@ class Controller extends Section {
} }
}); });
} }
showInvoiceOutDescriptor(event, balance) {
if (!balance.isInvoice) return;
if (event.defaultPrevented) return;
this.$.invoiceOutDescriptor.show(event.target, balance.id);
}
} }
Controller.$inject = ['$element', '$scope']; Controller.$inject = ['$element', '$scope'];

View File

@ -17,6 +17,20 @@ class Controller extends Section {
] ]
}; };
} }
showDescriptor(event, sale) {
this.quicklinks = {
btnThree: {
icon: 'icon-transaction',
state: `item.card.diary({
id: ${sale.itemFk},
warehouseFk: ${this.ticket.warehouseFk},
lineFk: ${sale.id}
})`,
tooltip: 'Item diary'
}
};
this.$.descriptor.show(event.target, sale.itemFk);
}
} }
ngModule.component('vnTicketSaleChecked', { ngModule.component('vnTicketSaleChecked', {

View File

@ -32,7 +32,7 @@
<span translate class="label">Changed by</span><span class="label">: </span> <span translate class="label">Changed by</span><span class="label">: </span>
<span <span
ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}" ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
ng-click="workerDescriptor.show($event, log.user.id)" ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
translate>{{::log.user.name | dashIfEmpty}} translate>{{::log.user.name | dashIfEmpty}}
</span> </span>
</div> </div>
@ -53,7 +53,7 @@
<vn-td class="expendable"> <vn-td class="expendable">
<span <span
ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}" ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
ng-click="workerDescriptor.show($event, log.user.id)" ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
translate>{{::log.user.name | dashIfEmpty}} translate>{{::log.user.name | dashIfEmpty}}
</span> </span>
</vn-td> </vn-td>

View File

@ -57,6 +57,11 @@ export default class Controller extends Section {
} }
return null; return null;
} }
showWorkerDescriptor(event, workerId) {
if (!workerId) return;
this.$.workerDescriptor.show(event.target, workerId);
}
} }
ngModule.component('vnLog', { ngModule.component('vnLog', {