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

Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-03-27 10:03:53 +01:00
parent 8433e15875 59d99db6b4
commit 3b3e4a96e9
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,13 @@
<vn-icon <vn-icon
ng-show="ticket.hasTicketRequest" ng-show="ticket.hasTicketRequest"
class="bright" class="bright"
vn-tooltip="{{ticket.hasTicketRequest}}" vn-tooltip="Purchase request"
icon="icon-100"> icon="icon-100">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
ng-show="ticket.isAvailable === 0" ng-show="ticket.isAvailable === 0"
class="bright" class="bright"
vn-tooltip="{{ticket.isAvailable}}" vn-tooltip="Not available"
icon="icon-unavailable"> icon="icon-unavailable">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
@ -73,7 +73,7 @@
<vn-icon <vn-icon
ng-show="ticket.risk" ng-show="ticket.risk"
class="bright" class="bright"
vn-tooltip="Risk : {{ticket.risk}}" vn-tooltip="{{::$ctrl.$translate.instant('Risk')}}: {{ticket.risk}}"
icon="icon-risk"> icon="icon-risk">
</vn-icon> </vn-icon>
</vn-td> </vn-td>

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

@ -2,8 +2,9 @@ import ngModule from '../module';
import './style.scss'; import './style.scss';
export default class Controller { export default class Controller {
constructor($scope, $state, $stateParams) { constructor($scope, $state, $stateParams, $translate) {
this.$ = $scope; this.$ = $scope;
this.$translate = $translate;
this.$stateParams = $stateParams; this.$stateParams = $stateParams;
this.$state = $state; this.$state = $state;
this.selectedTicket = null; this.selectedTicket = null;
@ -41,9 +42,9 @@ export default class Controller {
} }
goToLines(event, ticketFk) { goToLines(event, ticketFk) {
event.preventDefault(); this.preventDefault(event);
event.stopImmediatePropagation(); let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
this.$state.go('ticket.card.sale', {id: ticketFk}); window.open(url, '_blank');
} }
goToTurns() { goToTurns() {
@ -85,30 +86,32 @@ export default class Controller {
} }
showClientDescriptor(event, clientFk) { showClientDescriptor(event, clientFk) {
event.preventDefault(); this.preventDefault(event);
event.stopImmediatePropagation();
this.$.clientDescriptor.clientFk = clientFk; this.$.clientDescriptor.clientFk = clientFk;
this.$.clientDescriptor.parent = event.target; this.$.clientDescriptor.parent = event.target;
this.$.clientDescriptor.show(); this.$.clientDescriptor.show();
} }
showWorkerDescriptor(event, userId) { showWorkerDescriptor(event, userId) {
event.preventDefault(); this.preventDefault(event);
event.stopImmediatePropagation();
this.selectedWorker = userId; this.selectedWorker = userId;
this.$.workerDescriptor.parent = event.target; this.$.workerDescriptor.parent = event.target;
this.$.workerDescriptor.show(); this.$.workerDescriptor.show();
} }
preview(event, ticket) { preview(event, ticket) {
event.preventDefault(); this.preventDefault(event);
event.stopImmediatePropagation();
this.selectedTicket = ticket; this.selectedTicket = ticket;
this.$.summary.show(); this.$.summary.show();
} }
preventDefault(event) {
event.preventDefault();
event.stopImmediatePropagation();
}
} }
Controller.$inject = ['$scope', '$state', '$stateParams']; Controller.$inject = ['$scope', '$state', '$stateParams', '$translate'];
ngModule.component('vnTicketIndex', { ngModule.component('vnTicketIndex', {
template: require('./index.html'), template: require('./index.html'),

3
modules/ticket/front/index/locale/es.yml
View File

@ -1,2 +1,3 @@
Turns: Turnos Turns: Turnos
Go to lines: Ir a lineas Go to lines: Ir a lineas
Not available: No disponible