Test fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
e22da9b0d5
commit
2e7d56cc26
|
@ -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 => {
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
vn-id="model"
|
||||
url="Buys/latestBuysFilter"
|
||||
limit="20"
|
||||
data="$ctrl.buys">
|
||||
data="$ctrl.buys"
|
||||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<vn-portal slot="topbar">
|
||||
<vn-searchbar
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
"menus": {
|
||||
"main": [
|
||||
{"state": "entry.index", "icon": "icon-entry"},
|
||||
{"state": "entry.latestBuys", "icon": "icon-latestBuys"}
|
||||
{"state": "entry.latestBuys", "icon": "contact_support"}
|
||||
],
|
||||
"card": [
|
||||
{"state": "entry.card.basicData", "icon": "settings"},
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<vn-th field="clientFk">Client</vn-th>
|
||||
<vn-th field="isConfirmed" center>Confirmed</vn-th>
|
||||
<vn-th field="created" center expand>Created</vn-th>
|
||||
<vn-th field="landed" default-order="DESC" shrink-date>Landed</vn-th>
|
||||
<vn-th field="landed" shrink-date>Landed</vn-th>
|
||||
<vn-th field="created" center>Hour</vn-th>
|
||||
<vn-th field="agencyName" center>Agency</vn-th>
|
||||
<vn-th center>Total</vn-th>
|
||||
|
|
|
@ -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}">
|
||||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<vn-crud-model auto-load="false"
|
||||
<vn-crud-model
|
||||
vn-id="model"
|
||||
url="Tickets/{{$ctrl.$params.id}}/getSales"
|
||||
data="$ctrl.sales">
|
||||
data="$ctrl.sales"
|
||||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<vn-watcher
|
||||
vn-id="watcher"
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
<vn-crud-model auto-load="false"
|
||||
<vn-crud-model
|
||||
vn-id="model"
|
||||
url="Travels/extraCommunityFilter"
|
||||
data="travels"
|
||||
order="landed ASC, shipped ASC, travelFk, loadPriority, agencyModeFk, evaNotes"
|
||||
limit="20">
|
||||
limit="20"
|
||||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<vn-portal slot="topbar">
|
||||
<vn-searchbar
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<vn-crud-model auto-load="true"
|
||||
<vn-crud-model
|
||||
vn-id="model"
|
||||
url="Zones/getUpcomingDeliveries"
|
||||
data="details">
|
||||
data="details"
|
||||
auto-load="true">
|
||||
</vn-crud-model>
|
||||
<vn-data-viewer model="model">
|
||||
<vn-card>
|
||||
|
|
Loading…
Reference in New Issue