From 3d86e5989054473dde883c9f769464549acceaf8 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Tue, 27 Oct 2020 12:02:49 +0100
Subject: [PATCH] #2540 - Added entry descriptor popover to referenced places

---
 modules/item/front/diary/index.html        |  8 ++++++--
 modules/item/front/diary/index.js          |  8 +++++---
 modules/item/front/routes.json             |  2 +-
 modules/travel/front/routes.json           |  2 +-
 modules/travel/front/summary/index.html    | 16 ++++++++++++----
 modules/travel/front/summary/locale/es.yml |  2 +-
 modules/zone/front/events/index.html       |  4 ++--
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html
index 080cc0f36..b8572dcff 100644
--- a/modules/item/front/diary/index.html
+++ b/modules/item/front/diary/index.html
@@ -55,8 +55,8 @@
                         </span>
                     </vn-td>
                     <vn-td number>
-                        <span ng-class="::{link: sale.isTicket}"
-                            ng-click="$ctrl.showTicketDescriptor($event, sale)"
+                        <span class="link"
+                            ng-click="$ctrl.showDescriptor($event, sale)"
                             name="origin">
                             {{::sale.origin | dashIfEmpty}}
                         </span>
@@ -94,3 +94,7 @@
 <vn-client-descriptor-popover 
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
+<vn-entry-descriptor-popover 
+    vn-id="entryDescriptor">
+</vn-entry-descriptor-popover>
+
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index 953d203e8..bf04fabe9 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -58,10 +58,12 @@ class Controller extends Section {
         this.$anchorScroll();
     }
 
-    showTicketDescriptor(event, sale) {
-        if (!sale.isTicket) return;
+    showDescriptor(event, sale) {
+        let descriptor = 'entryDescriptor';
+        if (sale.isTicket)
+            descriptor = 'ticketDescriptor';
 
-        this.$.ticketDescriptor.show(event.target, sale.origin);
+        this.$[descriptor].show(event.target, sale.origin);
     }
 }
 
diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json
index 2aab4301e..d3bde0205 100644
--- a/modules/item/front/routes.json
+++ b/modules/item/front/routes.json
@@ -3,7 +3,7 @@
     "name": "Items",
     "icon": "icon-item",
     "validations" : true,
-    "dependencies": ["worker", "client", "ticket"],
+    "dependencies": ["worker", "client", "ticket", "entry"],
     "menus": {
         "main": [
             {"state": "item.index", "icon": "icon-item"},
diff --git a/modules/travel/front/routes.json b/modules/travel/front/routes.json
index b802aaa4a..5fa43fd1d 100644
--- a/modules/travel/front/routes.json
+++ b/modules/travel/front/routes.json
@@ -3,7 +3,7 @@
     "name": "Travels",
     "icon": "local_airport",
     "validations": true,
-    "dependencies": ["worker"],
+    "dependencies": ["worker", "entry"],
     "menus": {
         "main": [
             {"state": "travel.index", "icon": "local_airport"}
diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html
index 12dbded4e..7e055a0f1 100644
--- a/modules/travel/front/summary/index.html
+++ b/modules/travel/front/summary/index.html
@@ -41,7 +41,7 @@
                 value="{{$ctrl.travelData.ref}}">
             </vn-label-value>
             <vn-label-value
-                label="m3"
+                label="m³"
                 value="{{$ctrl.travelData.m3}}">
             </vn-label-value>
             <vn-label-value
@@ -63,7 +63,7 @@
                         <vn-th shrink>Package</vn-th>
                         <vn-th shrink>CC</vn-th>
                         <vn-th shrink>Pallet</vn-th>
-                        <vn-th shrink>m3</vn-th>
+                        <vn-th shrink>m³</vn-th>
                         <vn-th shrink></vn-th>
                     </vn-tr>
                 </vn-thead>
@@ -75,7 +75,12 @@
                                 disabled="true">
                             </vn-check>
                         </vn-td>
-                        <vn-td shrink>{{entry.id}} </vn-td>
+                        <vn-td shrink>
+                            <span class="link"
+                                vn-click-stop="entryDescriptor.show($event, entry.id)">
+                                {{entry.id}}
+                            </span>
+                        </vn-td>
                         <vn-td expand>{{entry.supplierName}}</vn-td>
                         <vn-td shrink>{{entry.ref}}</vn-td>
                         <vn-td shrink>{{entry.hb}}</vn-td>
@@ -141,4 +146,7 @@
             </vn-table>
         </vn-auto>
     </vn-horizontal>
-</vn-card>
\ No newline at end of file
+</vn-card>
+<vn-entry-descriptor-popover 
+    vn-id="entryDescriptor">
+</vn-entry-descriptor-popover>
\ No newline at end of file
diff --git a/modules/travel/front/summary/locale/es.yml b/modules/travel/front/summary/locale/es.yml
index c82508dfc..8d2e7e78c 100644
--- a/modules/travel/front/summary/locale/es.yml
+++ b/modules/travel/front/summary/locale/es.yml
@@ -9,7 +9,7 @@ Received: Recibida
 Agency: Agencia
 Entries: Entradas
 Confirmed: Confirmada
-Entry Id: Entrada Id
+Entry Id: Id entrada
 Supplier: Proveedor
 Pallet: Pallet
 Freight: Porte
diff --git a/modules/zone/front/events/index.html b/modules/zone/front/events/index.html
index eea24a132..d48b5f0d8 100644
--- a/modules/zone/front/events/index.html
+++ b/modules/zone/front/events/index.html
@@ -73,7 +73,7 @@
                     value="{{::row.bonus | currency:'EUR':2}}">
                 </vn-label-value>
                 <vn-label-value
-                    label="Max m3" 
+                    label="Max m³" 
                     value="{{::row.m3Max}}">
                 </vn-label-value>
             </vn-item-section>
@@ -166,7 +166,7 @@
                 </vn-input-number>
             </vn-horizontal>
             <vn-input-number
-                label="Max m3"
+                label="Max m³"
                 ng-model="$ctrl.selected.m3Max"
                 min="0"
                 step="0.01">