From e62e57bcdef205fcb994e74af72f53039ab675e1 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 15 Nov 2021 08:45:21 +0100
Subject: [PATCH] Monitor smart-table ammends

---
 front/core/components/smart-table/index.html  |  2 +-
 modules/entry/front/latest-buys/index.html    |  2 +-
 modules/monitor/front/index/locale/es.yml     |  1 +
 .../monitor/front/index/tickets/index.html    | 31 ++++----
 modules/monitor/front/index/tickets/index.js  | 71 ++++++++++---------
 5 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/front/core/components/smart-table/index.html b/front/core/components/smart-table/index.html
index 993774ed0..010cff235 100644
--- a/front/core/components/smart-table/index.html
+++ b/front/core/components/smart-table/index.html
@@ -7,7 +7,7 @@
                 ng-click="smartTableColumns.show($event)"
                 vn-tooltip="Shown columns">
             </vn-button>
-            <div ng-transclude="actions"></div> <!-- transcluded actions -->
+            <div ng-transclude="actions"></div>
         </div>
         <div class="actions-right">
             <div class="totalRows" ng-if="$ctrl.model.data"> 
diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html
index 25bff0d56..a01d6f303 100644
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@@ -33,7 +33,7 @@
                                 check-field="$checked"> <!-- Change $checked as default prop -->
                             </vn-multi-check>
                         </th>
-                        <th>Picture</th>
+                        <th translate>Picture</th>
                         <th field="id">
                             <span translate>Identifier</span>
                         </th>
diff --git a/modules/monitor/front/index/locale/es.yml b/modules/monitor/front/index/locale/es.yml
index b17861e9f..3a115797d 100644
--- a/modules/monitor/front/index/locale/es.yml
+++ b/modules/monitor/front/index/locale/es.yml
@@ -9,5 +9,6 @@ Minimize/Maximize: Minimizar/Maximizar
 Problems: Problemas
 Theoretical: Teórica
 Practical: Práctica
+Preparation: Preparación
 Auto-refresh: Auto-refresco
 Toggle auto-refresh every 2 minutes: Conmuta el refresco automático cada 2 minutos
\ No newline at end of file
diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html
index 87fdd407a..34f2841fd 100644
--- a/modules/monitor/front/index/tickets/index.html
+++ b/modules/monitor/front/index/tickets/index.html
@@ -20,18 +20,6 @@
     <vn-one translate>
         Tickets monitor
     </vn-one> 
-    <vn-none>
-        <vn-check
-            label="Auto-refresh"
-            vn-tooltip="Toggle auto-refresh every 2 minutes"
-            on-change="$ctrl.autoRefresh(value)">
-        </vn-check>
-        <vn-icon
-            icon="refresh"
-            vn-tooltip="Refresh"
-            ng-click="model.refresh()">
-        </vn-icon>
-    </vn-none>
 </vn-horizontal>
 <vn-card>
     <smart-table 
@@ -39,6 +27,11 @@
         view-config-id="ticketsMonitor" 
         options="$ctrl.smartTableOptions" 
         expr-builder="$ctrl.exprBuilder(param, value)">
+        <slot-actions><vn-check
+            label="Auto-refresh"
+            vn-tooltip="Toggle auto-refresh every 2 minutes"
+            on-change="$ctrl.autoRefresh(value)">
+        </vn-check></slot-actions>
         <slot-table>
             <table>
                 <thead>
@@ -58,15 +51,15 @@
                         <th field="shipped" shrink-date>
                             <span translate>Date</span>
                         </th>
-                        <th field="preparationHour" filter-enabled="false">
-                            <span translate>Preparation</span>
-                        </th>
                         <th field="theoreticalHour">
                             <span translate>Theoretical</span>
                         </th>
                         <th field="practicalHour">
                             <span translate>Practical</span>
                         </th>
+                        <th field="preparationHour" filter-enabled="false">
+                            <span translate>Preparation</span>
+                        </th>
                         <th field="provinceFk">
                             <span translate>Province</span>
                         </th>
@@ -156,9 +149,9 @@
                                 {{::ticket.shipped | date: 'dd/MM/yyyy'}}
                             </span>
                         </td>
-                        <td centered>{{::ticket.shipped | date: 'HH:mm'}}</td>
-                        <td centered>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>
-                        <td centered>{{::ticket.practicalHour | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.practicalHour | date: 'HH:mm'}}</td>
+                        <td>{{::ticket.shipped | date: 'HH:mm'}}</td>
                         <td>{{::ticket.province}}</td>
                         <td>
                             <span
@@ -224,7 +217,7 @@
         model="model">
     </vn-ticket-summary>
 </vn-popup>
-<vn-contextmenu vn-id="contextmenu" targets="['vn-monitor-sales-tickets smart-tablea']" model="model"
+<vn-contextmenu vn-id="contextmenu" targets="['vn-monitor-sales-tickets smart-table']" model="model"
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
         <vn-item translate
diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js
index 483e96669..54f996694 100644
--- a/modules/monitor/front/index/tickets/index.js
+++ b/modules/monitor/front/index/tickets/index.js
@@ -14,52 +14,55 @@ export default class Controller extends Section {
             },
             columns: [
                 {
-                    field: 'category',
-                    autocomplete: {
-                        url: 'ItemCategories',
-                        valueField: 'name',
-                    }
+                    field: 'totalProblems',
+                    searchable: false
                 },
                 {
-                    field: 'origin',
+                    field: 'salesPersonFk',
                     autocomplete: {
-                        url: 'Origins',
-                        showField: 'code',
-                        valueField: 'code'
-                    }
-                },
-                {
-                    field: 'typeFk',
-                    autocomplete: {
-                        url: 'ItemTypes',
-                    }
-                },
-                {
-                    field: 'intrastat',
-                    autocomplete: {
-                        url: 'Intrastats',
-                        showField: 'description',
-                        valueField: 'description'
-                    }
-                },
-                {
-                    field: 'buyerFk',
-                    autocomplete: {
-                        url: 'Workers/activeWithRole',
-                        where: `{role: {inq: ['logistic', 'buyer']}}`,
+                        url: 'Workers/activeWithInheritedRole',
+                        where: `{role: 'salesPerson'}`,
                         searchFunction: '{firstName: $search}',
                         showField: 'nickname',
                         valueField: 'id',
                     }
                 },
                 {
-                    field: 'active',
+                    field: 'provinceFk',
+                    autocomplete: {
+                        url: 'Provinces',
+                    }
+                },
+                {
+                    field: 'stateFk',
+                    autocomplete: {
+                        url: 'States',
+                    }
+                },
+                {
+                    field: 'zoneFk',
+                    autocomplete: {
+                        url: 'Zones',
+                    }
+                },
+                {
+                    field: 'warehouseFk',
+                    autocomplete: {
+                        url: 'Warehouses',
+                    }
+                },
+                {
+                    field: 'shipped',
                     searchable: false
                 },
                 {
-                    field: 'landed',
+                    field: 'theoreticalHour',
                     searchable: false
                 },
+                {
+                    field: 'preparationHour',
+                    searchable: false
+                }
             ]
         };
     }
@@ -148,8 +151,10 @@ export default class Controller extends Section {
             return {'t.shipped': {
                 between: this.dateRange(value)}
             };
-        case 'zoneFk':
         case 'nickname':
+            return {[`t.nickname`]: {like: `%${value}%`}};
+        case 'zoneFk':
+        case 'totalWithVat':
             return {[`t.${param}`]: value};
         }
     }