From 0b4c53a6550ffc767e1de8e9c0c364c4fd4c9cd4 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Mon, 14 Sep 2020 13:11:53 +0200
Subject: [PATCH 1/4] added invoiceOut descriptor

---
 modules/ticket/back/methods/ticket/filter.js |  2 ++
 modules/ticket/front/index/index.html        | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 878b4278e..60b57064f 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -197,6 +197,7 @@ module.exports = Self => {
                         t.routeFk,
                         t.warehouseFk,
                         t.clientFk,
+                        io.id AS invoiceOutId,
                         a.provinceFk,
                         p.name AS province,
                         w.name AS warehouse,
@@ -216,6 +217,7 @@ module.exports = Self => {
                         z.id AS zoneFk,
                         CAST(z.hour AS CHAR) AS hour
                     FROM ticket t
+                        LEFT JOIN invoiceOut io ON t.refFk = io.ref
                         LEFT JOIN zone z ON z.id = t.zoneFk
                         LEFT JOIN address a ON a.id = t.addressFk
                         LEFT JOIN province p ON p.id = a.provinceFk
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 2c598ca03..6a724e9cc 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -103,7 +103,14 @@
                     </span>
                 </vn-td>
                 <vn-td>{{::ticket.warehouse}}</vn-td>
-                <vn-td class="expendable">{{::ticket.refFk | dashIfEmpty}}</vn-td>
+                <vn-td class="expendable">
+                    <span
+                        title="{{::ticket.refFk}}"
+                        vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
+                        class="link">
+                        {{::ticket.refFk | dashIfEmpty}}
+                    </span>
+                </vn-td>
                 <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
                 <vn-td number>
                     <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
@@ -169,6 +176,9 @@
 <vn-client-balance-create
     vn-id="balanceCreateDialog">
 </vn-client-balance-create>
+<vn-invoice-out-descriptor-popover 
+    vn-id="invoiceOutDescriptor">
+</vn-invoice-out-descriptor-popover>
 <vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model"
     expr-builder="$ctrl.exprBuilder(param, value)">
     <slot-menu>
-- 
2.40.1


From 13a5c4c4c92838d21b0d5ee81e9451aec492facb Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Mon, 14 Sep 2020 13:58:42 +0200
Subject: [PATCH 2/4] test enhanced

---
 .../ticket/back/methods/ticket/specs/filter.spec.js    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index c03a41975..524354646 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -67,14 +67,12 @@ describe('ticket filter()', () => {
         const ctx = {req: {accessToken: {userId: 9}}, args: {pending: true}};
         const filter = {};
         const result = await app.models.Ticket.filter(ctx, filter);
-        const firstRow = result[0];
-        const secondRow = result[1];
-        const thirdRow = result[2];
+
+        const length = result.length;
+        const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
 
         expect(result.length).toEqual(7);
-        expect(firstRow.state).toEqual('Libre');
-        expect(secondRow.state).toEqual('Libre');
-        expect(thirdRow.state).toEqual('Libre');
+        expect(anyResult.state).toMatch(/(Libre|Arreglar)/);
     });
 
     it('should return the tickets that are not pending', async() => {
-- 
2.40.1


From 1eb088521c593a2cb7c10784ca4eea84a57d7d0a Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Mon, 14 Sep 2020 16:08:37 +0200
Subject: [PATCH 3/4] ticket.index ref and state columns merged

---
 modules/ticket/front/index/index.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 6a724e9cc..cf4375fc8 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -23,7 +23,6 @@
                 <vn-th field="stateFk" >State</vn-th>
                 <vn-th field="zoneFk">Zone</vn-th>
                 <vn-th field="warehouseFk">Warehouse</vn-th>
-                <vn-th field="refFk" class="expendable">Invoice</vn-th>
                 <vn-th field="hour" shrink>Closure</vn-th>
                 <vn-th number>Total</vn-th>
                 <vn-th></vn-th>
@@ -89,8 +88,17 @@
                     </span>
                 </vn-td>
                 <vn-td class="expendable">{{::ticket.province}}</vn-td>
-                <vn-td>
-                    <span class="chip {{$ctrl.stateColor(ticket)}}">
+                <vn-td class="expendable">
+                    <span
+                        ng-show="ticket.refFk"
+                        title="{{::ticket.refFk}}"
+                        vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
+                        class="link">
+                        {{::ticket.refFk | dashIfEmpty}}
+                    </span>
+                    <span 
+                        ng-show="!ticket.refFk"
+                        class="chip {{$ctrl.stateColor(ticket)}}">
                         {{ticket.state}}
                     </span>
                 </vn-td>
@@ -103,14 +111,6 @@
                     </span>
                 </vn-td>
                 <vn-td>{{::ticket.warehouse}}</vn-td>
-                <vn-td class="expendable">
-                    <span
-                        title="{{::ticket.refFk}}"
-                        vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
-                        class="link">
-                        {{::ticket.refFk | dashIfEmpty}}
-                    </span>
-                </vn-td>
                 <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
                 <vn-td number>
                     <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
-- 
2.40.1


From 031e40df51c6995d53a317654ea88a4441197fc9 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Mon, 14 Sep 2020 16:34:11 +0200
Subject: [PATCH 4/4] removed unused dash if empty

---
 modules/ticket/front/index/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index cf4375fc8..3e9809952 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -94,7 +94,7 @@
                         title="{{::ticket.refFk}}"
                         vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
                         class="link">
-                        {{::ticket.refFk | dashIfEmpty}}
+                        {{::ticket.refFk}}
                     </span>
                     <span 
                         ng-show="!ticket.refFk"
-- 
2.40.1