From 99d65804e8ff9717d7813736864510d65fe54fe9 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 2 Oct 2023 13:29:39 +0200
Subject: [PATCH 1/3] refs #6278 fixFilter

---
 .../234201/00-alterTableTicketRequest.sql     |  1 +
 modules/item/front/request/index.html         |  8 ++++++
 .../back/methods/ticket-request/filter.js     | 25 +++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 db/changes/234201/00-alterTableTicketRequest.sql

diff --git a/db/changes/234201/00-alterTableTicketRequest.sql b/db/changes/234201/00-alterTableTicketRequest.sql
new file mode 100644
index 000000000..2a08137b9
--- /dev/null
+++ b/db/changes/234201/00-alterTableTicketRequest.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`ticketRequest` MODIFY COLUMN `itemFk` double DEFAULT NULL NOT NULL;
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index c505b3a09..571ad49af 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -26,6 +26,7 @@
                 <vn-th field="ticketFk" number>Ticket ID</vn-th>
                 <vn-th field="shipped" expand>Shipped</vn-th>
                 <vn-th field="description" filter-enabled="false" expand>Description</vn-th>
+                <vn-th field="requesterFk" expand>Requester</vn-th>
                 <vn-th field="quantity" number editable>Requested</vn-th>
                 <vn-th field="price" number>Price</vn-th>
                 <vn-th field="attenderName">Atender</vn-th>
@@ -51,6 +52,13 @@
                     </span>
                 </vn-td>
                 <vn-td title="{{::request.description}}" expand>{{::request.description}}</vn-td>
+                <vn-td number>
+                    <span
+                    class="link"
+                    ng-click="workerDescriptor.show($event, request.requesterFk)">
+                    {{::request.requesterName}}
+                    </span>
+                </vn-td>
                 <vn-td number>{{::request.quantity}}</vn-td>
                 <vn-td number>{{::request.price | currency: 'EUR':2}}</vn-td>
                 <vn-td>
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index f27ea5018..47e571988 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -99,6 +99,8 @@ module.exports = Self => {
                 switch (value) {
                 case 'pending':
                     return {'tr.isOk': null};
+                case 'accepted':
+                    return {'tr.isOk': 1};
                 default:
                     return {'tr.isOk': value};
                 }
@@ -122,8 +124,7 @@ module.exports = Self => {
         filter = mergeFilters(filter, {where});
 
         const stmt = new ParameterizedSQL(
-            `SELECT
-                tr.id,
+            `SELECT tr.id,
                 tr.ticketFk,
                 tr.quantity,
                 tr.price,
@@ -133,18 +134,19 @@ module.exports = Self => {
                 tr.saleFk,
                 tr.requesterFk,
                 tr.isOk,
-                s.quantity AS saleQuantity,
+                s.quantity saleQuantity,
                 s.itemFk,
-                i.name AS itemDescription,
+                i.name itemDescription,
                 t.shipped,
-                DATE(t.shipped) AS shippedDate,
+                DATE(t.shipped) shippedDate,
                 t.nickname,
                 t.warehouseFk,
                 t.clientFk,
-                w.name AS warehouse,
-                u.nickname AS salesPersonNickname,
-                ua.name AS attenderName,
-                c.salesPersonFk
+                w.name warehouse,
+                u.nickname salesPersonNickname,
+                ua.name attenderName,
+                c.salesPersonFk,
+                ua2.name requesterName
             FROM ticketRequest tr
                 LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk
                 LEFT JOIN ticket t ON t.id = tr.ticketFk
@@ -155,9 +157,12 @@ module.exports = Self => {
                 LEFT JOIN worker wk ON wk.id = c.salesPersonFk
                 LEFT JOIN account.user u ON u.id = wk.id
                 LEFT JOIN worker wka ON wka.id = tr.attenderFk
-                LEFT JOIN account.user ua ON ua.id = wka.id`);
+                LEFT JOIN account.user ua ON ua.id = wka.id
+                LEFT JOIN account.user ua2 ON ua2.id = tr.requesterFk`);
         stmt.merge(conn.makeSuffix(filter));
 
+        console.log(stmt);
+
         return conn.executeStmt(stmt, myOptions);
     };
 };

From 2bb4300e1b26d3a344e58b3ab39d1e8dabb8bc54 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 18 Oct 2023 12:35:45 +0200
Subject: [PATCH 2/3] remove: se quita el console log refs #6278

---
 db/changes/234201/00-alterTableTicketRequest.sql     | 1 -
 modules/ticket/back/methods/ticket-request/filter.js | 2 --
 2 files changed, 3 deletions(-)
 delete mode 100644 db/changes/234201/00-alterTableTicketRequest.sql

diff --git a/db/changes/234201/00-alterTableTicketRequest.sql b/db/changes/234201/00-alterTableTicketRequest.sql
deleted file mode 100644
index 2a08137b9..000000000
--- a/db/changes/234201/00-alterTableTicketRequest.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `vn`.`ticketRequest` MODIFY COLUMN `itemFk` double DEFAULT NULL NOT NULL;
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 47e571988..10aaf02e5 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -161,8 +161,6 @@ module.exports = Self => {
                 LEFT JOIN account.user ua2 ON ua2.id = tr.requesterFk`);
         stmt.merge(conn.makeSuffix(filter));
 
-        console.log(stmt);
-
         return conn.executeStmt(stmt, myOptions);
     };
 };

From 243a32dff553fa4422b26391d04f9c569fc6b01f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 20 Oct 2023 11:36:11 +0200
Subject: [PATCH 3/3] remove(expand): quito expand de la columna requester refs
 #6278

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

diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index 571ad49af..200ce3902 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -26,7 +26,7 @@
                 <vn-th field="ticketFk" number>Ticket ID</vn-th>
                 <vn-th field="shipped" expand>Shipped</vn-th>
                 <vn-th field="description" filter-enabled="false" expand>Description</vn-th>
-                <vn-th field="requesterFk" expand>Requester</vn-th>
+                <vn-th field="requesterFk" >Requester</vn-th>
                 <vn-th field="quantity" number editable>Requested</vn-th>
                 <vn-th field="price" number>Price</vn-th>
                 <vn-th field="attenderName">Atender</vn-th>