From b828609d33a349dfd6e0cbbd6944e511464bf59a Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 12 May 2021 12:39:45 +0200 Subject: [PATCH] Ammends --- front/salix/locale/es.yml | 1 + modules/monitor/front/index/orders/index.html | 4 ++-- modules/monitor/front/index/tickets/index.html | 2 +- modules/monitor/front/index/tickets/style.scss | 4 ++++ modules/monitor/front/locale/es.yml | 1 - modules/monitor/front/routes.json | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml index ae7eb1da7..5e877c372 100644 --- a/front/salix/locale/es.yml +++ b/front/salix/locale/es.yml @@ -47,6 +47,7 @@ Invoices in: Fact. recibidas Entries: Entradas Users: Usuarios Suppliers: Proveedores +Monitors: Monitores # Common diff --git a/modules/monitor/front/index/orders/index.html b/modules/monitor/front/index/orders/index.html index d68815bd3..42bb470b3 100644 --- a/modules/monitor/front/index/orders/index.html +++ b/modules/monitor/front/index/orders/index.html @@ -20,9 +20,9 @@ - Date + Date Client - Import + Import diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 049223ef2..8fc3e09d9 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -2,7 +2,7 @@ vn-id="model" params="::$ctrl.filterParams" url="SalesMonitors/salesFilter" - limit="18" + limit="20" order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id"> diff --git a/modules/monitor/front/index/tickets/style.scss b/modules/monitor/front/index/tickets/style.scss index b89ce8dbe..f3931e6ec 100644 --- a/modules/monitor/front/index/tickets/style.scss +++ b/modules/monitor/front/index/tickets/style.scss @@ -16,4 +16,8 @@ vn-monitor-sales-tickets { margin-left: 3px; margin-right: 3px; } + + vn-table.scrollable.lg { + height: 736px + } } \ No newline at end of file diff --git a/modules/monitor/front/locale/es.yml b/modules/monitor/front/locale/es.yml index da3b3f623..7d7e72f6b 100644 --- a/modules/monitor/front/locale/es.yml +++ b/modules/monitor/front/locale/es.yml @@ -1,2 +1 @@ -Monitors: Monitores Sales monitor: Monitor de ventas \ No newline at end of file diff --git a/modules/monitor/front/routes.json b/modules/monitor/front/routes.json index 2b60b3572..8fc995e4c 100644 --- a/modules/monitor/front/routes.json +++ b/modules/monitor/front/routes.json @@ -1,12 +1,12 @@ { "module": "monitor", "name": "Monitors", - "icon" : "icon-supplier", + "icon" : "grid_view", "dependencies": ["ticket", "worker", "client"], "validations" : true, "menus": { "main": [ - {"state": "monitor.index", "icon": "leaderboard"} + {"state": "monitor.index", "icon": "grid_view"} ], "card": [] },