From 786589f214439496395fe10cbc2a98e08e4a531e Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 17 Sep 2021 08:50:22 +0200
Subject: [PATCH 1/3] fix(tickets): fixed ticket duplications on ticket summary
 and ticket index caused by pagination Refs: 3093

---
 modules/client/front/summary/index.html | 15 ++++++++++++++-
 modules/ticket/front/main/index.html    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 8a71599e1..5d113139b 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -6,7 +6,7 @@
     filter="::$ctrl.ticketFilter"
     limit="5"
     data="tickets"
-    order="shipped DESC">
+    order="shipped DESC, id">
 </vn-crud-model>
 <vn-card class="summary">
     <h5>
@@ -293,6 +293,8 @@
                     <vn-tr>
                         <vn-th field="id" number>Id</vn-th>
                         <vn-th field="nickname" expand>Nickname</vn-th>
+                        <vn-th field="agencyModeFk" expand>Agency</vn-th>
+                        <vn-th field="routeFk" shrink>Route</vn-th>
                         <vn-th field="packages" shrink>Packages</vn-th>
                         <vn-th field="shipped" shrink-date>Date</vn-th>
                         <vn-th>State</vn-th>
@@ -313,6 +315,17 @@
                                 {{::ticket.nickname}}
                             </span>
                         </vn-td>
+                        <vn-td expand>
+                            {{::ticket.agencyMode.name}}
+                        </vn-td>
+                        <vn-td shrink>
+                            <span
+                                title="{{::ticket.route}}"
+                                vn-click-stop="routeDescriptor.show($event, ticket.routeFk)"
+                                class="link">
+                                {{::ticket.routeFk}}
+                            </span>
+                        </vn-td>
                         <vn-td shrink>
                             {{::ticket.packages}}
                         </vn-td>
diff --git a/modules/ticket/front/main/index.html b/modules/ticket/front/main/index.html
index 8e9af1e12..590d33887 100644
--- a/modules/ticket/front/main/index.html
+++ b/modules/ticket/front/main/index.html
@@ -2,7 +2,7 @@
     vn-id="model"
     url="Tickets/filter"
     limit="20"
-    order="shippedDate DESC, shippedHour ASC, zoneLanding ASC">
+    order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar

From 95b4d2359940a9ee0bd164c9b60ec808bb6e631f Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Mon, 19 Jul 2021 15:59:39 +0200
Subject: [PATCH 2/3] added agency and route columns to client.summary tickets

---
 modules/client/front/summary/index.html | 16 +++++++++++++++-
 modules/client/front/summary/index.js   |  8 +++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 5d113139b..c252cf1b3 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -294,7 +294,7 @@
                         <vn-th field="id" number>Id</vn-th>
                         <vn-th field="nickname" expand>Nickname</vn-th>
                         <vn-th field="agencyModeFk" expand>Agency</vn-th>
-                        <vn-th field="routeFk" shrink>Route</vn-th>
+                        <vn-th field="routeFk" expand>Route</vn-th>
                         <vn-th field="packages" shrink>Packages</vn-th>
                         <vn-th field="shipped" shrink-date>Date</vn-th>
                         <vn-th>State</vn-th>
@@ -326,6 +326,17 @@
                                 {{::ticket.routeFk}}
                             </span>
                         </vn-td>
+                        <vn-td shrink>
+                            {{::ticket.agencyMode.name}}
+                        </vn-td>
+                        <vn-td shrink>
+                            <span
+                                title="{{::ticket.route}}"
+                                vn-click-stop="routeDescriptor.show($event, ticket.routeFk)"
+                                class="link">
+                                {{::ticket.routeFk}}
+                            </span>
+                        </vn-td>
                         <vn-td shrink>
                             {{::ticket.packages}}
                         </vn-td>
@@ -384,6 +395,9 @@
 <vn-client-descriptor-popover
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
+<vn-route-descriptor-popover
+    vn-id="routeDescriptor">
+</vn-route-descriptor-popover>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js
index 0f6c7e834..b1f0faf13 100644
--- a/modules/client/front/summary/index.js
+++ b/modules/client/front/summary/index.js
@@ -22,7 +22,13 @@ class Controller extends Summary {
                     scope: {
                         fields: ['id']
                     }
-                }
+                },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['name']
+                    }
+                },
             ]
         };
     }

From 689662f9bb9830aaef0ac323ec1a0c8c9c615242 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Tue, 21 Sep 2021 12:48:51 +0200
Subject: [PATCH 3/3] fix code duplication

---
 modules/client/front/summary/index.html | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index c252cf1b3..6ff742c36 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -326,17 +326,6 @@
                                 {{::ticket.routeFk}}
                             </span>
                         </vn-td>
-                        <vn-td shrink>
-                            {{::ticket.agencyMode.name}}
-                        </vn-td>
-                        <vn-td shrink>
-                            <span
-                                title="{{::ticket.route}}"
-                                vn-click-stop="routeDescriptor.show($event, ticket.routeFk)"
-                                class="link">
-                                {{::ticket.routeFk}}
-                            </span>
-                        </vn-td>
                         <vn-td shrink>
                             {{::ticket.packages}}
                         </vn-td>