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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-05-12 15:11:18 +02:00
parent c4537b0562 8af66a7ca5
commit fc00e759c2
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
front/core/components/table/index.js
View File

@ -27,13 +27,6 @@ export default class Table {
return this.table.classList.contains('scrollable'); return this.table.classList.contains('scrollable');
} }
$postLink() {
if (this.isScrollable()) {
const childCells = this.table.querySelector('vn-tbody');
console.log(childCells);
}
}
setActiveArrow() { setActiveArrow() {
let columns = this.table.querySelectorAll('vn-thead vn-th'); let columns = this.table.querySelectorAll('vn-thead vn-th');
columns.forEach(column => { columns.forEach(column => {

2
modules/monitor/back/methods/sales-monitor/ordersFilter.js
View File

@ -61,7 +61,7 @@ module.exports = Self => {
stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeWhere(filter.where));
stmt.merge(conn.makeGroupBy('o.id')); stmt.merge(conn.makeGroupBy('o.id'));
stmt.merge(conn.makeLimit(filter)); stmt.merge(conn.makePagination(filter));
return conn.executeStmt(stmt); return conn.executeStmt(stmt);
}; };

6
modules/monitor/front/index/orders/index.html
View File

@ -1,8 +1,8 @@
<vn-crud-model auto-load="true" <vn-crud-model
vn-id="model" vn-id="model"
url="SalesMonitors/ordersFilter" url="SalesMonitors/ordersFilter"
limit="6" limit="6"
order="dated DESC"> order="date_make DESC">
</vn-crud-model> </vn-crud-model>
<vn-horizontal class="header"> <vn-horizontal class="header">
<vn-one translate> <vn-one translate>
@ -20,7 +20,7 @@
<vn-table model="model" class="scrollable sm"> <vn-table model="model" class="scrollable sm">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="date_send" shrink-datetime default-order="DESC">Date</vn-th> <vn-th field="date_make" shrink-datetime default-order="DESC">Date</vn-th>
<vn-th field="clientFk">Client</vn-th> <vn-th field="clientFk">Client</vn-th>
<vn-th>Import</vn-th> <vn-th>Import</vn-th>
</vn-tr> </vn-tr>