From 2e7d56cc268d8fb1b9487dd340793b186652357e Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 12 May 2021 12:11:27 +0200 Subject: [PATCH] Test fixes --- front/core/components/table/index.js | 5 ----- front/core/components/th/index.js | 5 ++++- modules/entry/front/latest-buys/index.html | 3 ++- modules/entry/front/routes.json | 2 +- modules/order/front/index/index.html | 2 +- modules/ticket/front/request/create/index.html | 2 +- modules/ticket/front/sale/index.html | 5 +++-- modules/travel/front/extra-community/index.html | 5 +++-- modules/zone/front/upcoming-deliveries/index.html | 5 +++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/front/core/components/table/index.js b/front/core/components/table/index.js index a114ea379..81eff872c 100644 --- a/front/core/components/table/index.js +++ b/front/core/components/table/index.js @@ -34,11 +34,6 @@ export default class Table { } } - /* $onChanges() { - if (this.model && !this.model.data) - this.applyOrder(); - } */ - setActiveArrow() { let columns = this.table.querySelectorAll('vn-thead vn-th'); columns.forEach(column => { diff --git a/front/core/components/th/index.js b/front/core/components/th/index.js index b9ea8fde8..341558fb1 100644 --- a/front/core/components/th/index.js +++ b/front/core/components/th/index.js @@ -14,8 +14,11 @@ export default class Th { $onInit() { if (!this.field) return; - if (this.defaultOrder) + if (this.defaultOrder) { this.order = this.defaultOrder; + this.table.applyOrder(this.field, this.order); + this.updateArrow(); + } this.updateArrow(); } diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index 277b1b347..5fa092485 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -2,7 +2,8 @@ vn-id="model" url="Buys/latestBuysFilter" limit="20" - data="$ctrl.buys"> + data="$ctrl.buys" + auto-load="true"> Client Confirmed Created - Landed + Landed Hour Agency Total diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html index f7280b2de..8d25358b5 100644 --- a/modules/ticket/front/request/create/index.html +++ b/modules/ticket/front/request/create/index.html @@ -20,7 +20,7 @@ ng-model="$ctrl.ticketRequest.attenderFk" url="Workers/activeWithRole" show-field="nickname" - where="{role: 'buyer'}" + where="{role: {inq: ['logistic', 'buyer']}}" search-function="{firstName: $search}"> diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index d4dfe1a8a..5bba457ca 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -1,7 +1,8 @@ - + data="$ctrl.sales" + auto-load="true"> + limit="20" + auto-load="true"> + data="details" + auto-load="true">