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

2863 - Added monitor module #618

Merged
joan merged 12 commits from 2863-monitor_module into dev 2021-05-12 12:09:35 +00:00
Conversation 0 Commits 12 Files Changed 49 +10 -6
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b828609d33 - Show all commits

1
front/salix/locale/es.yml
View File

@ -47,6 +47,7 @@ Invoices in: Fact. recibidas
Entries: Entradas Entries: Entradas
Users: Usuarios Users: Usuarios
Suppliers: Proveedores Suppliers: Proveedores
Monitors: Monitores
# Common # Common

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

@ -20,9 +20,9 @@
<vn-table model="model" class="fixed-header scrollable sm"> <vn-table model="model" class="fixed-header scrollable sm">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="date_send" shrink-datetime>Date</vn-th> <vn-th field="date_send" shrink-datetime default-order="DESC">Date</vn-th>
<vn-th field="clientFk">Client</vn-th> <vn-th field="clientFk">Client</vn-th>
<vn-th field="nickname">Import</vn-th> <vn-th>Import</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody ng-repeat="order in model.data"> <vn-tbody ng-repeat="order in model.data">

2
modules/monitor/front/index/tickets/index.html
View File

@ -2,7 +2,7 @@
vn-id="model" vn-id="model"
params="::$ctrl.filterParams" params="::$ctrl.filterParams"
url="SalesMonitors/salesFilter" url="SalesMonitors/salesFilter"
limit="18" limit="20"
order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id"> order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id">
</vn-crud-model> </vn-crud-model>
<vn-portal slot="topbar"> <vn-portal slot="topbar">

4
modules/monitor/front/index/tickets/style.scss
View File

@ -16,4 +16,8 @@ vn-monitor-sales-tickets {
margin-left: 3px; margin-left: 3px;
margin-right: 3px; margin-right: 3px;
} }
vn-table.scrollable.lg {
height: 736px
}
} }

1
modules/monitor/front/locale/es.yml
View File

@ -1,2 +1 @@
Monitors: Monitores
Sales monitor: Monitor de ventas Sales monitor: Monitor de ventas

4
modules/monitor/front/routes.json
View File

@ -1,12 +1,12 @@
{ {
"module": "monitor", "module": "monitor",
"name": "Monitors", "name": "Monitors",
"icon" : "icon-supplier", "icon" : "grid_view",
"dependencies": ["ticket", "worker", "client"], "dependencies": ["ticket", "worker", "client"],
"validations" : true, "validations" : true,
"menus": { "menus": {
"main": [ "main": [
{"state": "monitor.index", "icon": "leaderboard"} {"state": "monitor.index", "icon": "grid_view"}
], ],
"card": [] "card": []
}, },