From 5c18c5c94ccefdd3c9867bc6c6613fd550feff89 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Fri, 21 May 2021 15:31:28 +0200
Subject: [PATCH] ticket module descriptor now takes warehouseFk from the
 ticket

---
 modules/ticket/front/component/index.html     |  6 +++---
 modules/ticket/front/expedition/index.html    |  8 ++++----
 modules/ticket/front/picture/index.html       | 13 ++++++++++---
 modules/ticket/front/request/index/index.html | 13 ++++++++++---
 modules/ticket/front/sale-checked/index.html  |  4 ++--
 modules/ticket/front/sale-checked/index.js    |  4 ++--
 modules/ticket/front/sale-tracking/index.html |  4 ++--
 modules/ticket/front/sale/index.html          |  4 ++--
 modules/ticket/front/summary/index.html       |  8 ++++----
 modules/ticket/front/volume/index.html        |  4 ++--
 10 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index ac109c334..3843529c3 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -24,7 +24,7 @@
                 <tr class="initial">
                     <td rowspan="{{::sale.components.length + 1}}" number>
                         <span 
-                            ng-click="descriptor.show($event, sale.itemFk, sale.id)"
+                            ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
                             class="link">
                             {{sale.itemFk | zeroFill:6}}
                         </span>
@@ -103,11 +103,11 @@
     </div>
 </vn-side-menu>
 <vn-item-descriptor-popover
-    vn-id="descriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-zone-descriptor-popover 
-    vn-id="zoneDescriptor">
+    vn-id="zone-descriptor">
 </vn-zone-descriptor-popover>
 
 
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 26d9ef640..e4d42d62e 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -57,15 +57,15 @@
     </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor"
-    warehouse-fk="this.ticket.warehouseFk",
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.ticket.warehouseFk",
     ticket-fk="$ctrl.ticket.id">
 </vn-item-descriptor-popover>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
 <vn-confirm
-    vn-id="deleteExpedition"
+    vn-id="delete-expedition"
     on-accept="$ctrl.onDialogAccept($data)"
     question="Delete expedition"
     message="Are you sure you want to delete this expedition?">
diff --git a/modules/ticket/front/picture/index.html b/modules/ticket/front/picture/index.html
index c95e604dd..b4ea6ae0d 100644
--- a/modules/ticket/front/picture/index.html
+++ b/modules/ticket/front/picture/index.html
@@ -7,6 +7,12 @@
     data="sales"
     auto-load="true">
 </vn-crud-model>
+<vn-crud-model
+    url="tickets"
+    link="{id: $ctrl.$params.id}"
+    data="tickets"
+    auto-load="true">
+</vn-crud-model>
 <vn-vertical>
     <vn-card
         ng-if="!model.data || model.data.length == 0"
@@ -25,7 +31,7 @@
             </div>
             <div class="description">
                 <h3>
-                    <span class="link" ng-click="descriptor.show($event, sale.item.id)">
+                    <span class="link" ng-click="itemDescriptor.show($event, sale.item.id)">
                         {{::sale.item.name}}
                     </span>
                 </h3>
@@ -63,5 +69,6 @@
     <vn-pagination model="model"></vn-pagination>
 </vn-vertical>
 <vn-item-descriptor-popover
-    vn-id="descriptor">
-</vn-item-descriptor-popover>
+    vn-id="item-descriptor"
+    warehouse-fk="tickets[0].warehouseFk">
+</vn-item-descriptor-popover>
\ No newline at end of file
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index dadc96325..767f1dccf 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -8,6 +8,12 @@
     data="purchaseRequests"
     auto-load="true">
 </vn-crud-model>
+<vn-crud-model 
+    url="tickets" 
+    link="{id: $ctrl.$params.id}"
+    data="tickets"
+    auto-load="true">
+</vn-crud-model>
 <vn-watcher
     vn-id="watcher"
     data="purchaseRequests">
@@ -24,7 +30,7 @@
                 <vn-th>Atender</vn-th>
                 <vn-th number>Quantity</vn-th>
                 <vn-th number>Price</vn-th>
-                <vn-th number>Sale id</vn-th>
+                <vn-th number>Item id</vn-th>
                 <vn-th number>Ok</vn-th>
             </vn-tr>
         </vn-thead>
@@ -101,10 +107,11 @@
     </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="tickets[0].warehouseFk">
 </vn-item-descriptor-popover>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
 <a ui-sref="ticket.card.request.create"
     vn-tooltip="New request"
diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html
index 8c65c1a0a..e84d583a3 100644
--- a/modules/ticket/front/sale-checked/index.html
+++ b/modules/ticket/front/sale-checked/index.html
@@ -29,7 +29,7 @@
                 </vn-td>
                 <vn-td number>
                     <span
-                        ng-click="$ctrl.showDescriptor($event, sale)"
+                        ng-click="$ctrl.showItemDescriptor($event, sale)"
                         class="link">
                         {{::sale.itemFk | zeroFill:6}}
                     </span>
@@ -52,7 +52,7 @@
     </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="descriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk"
     ticket-fk="$ctrl.ticket.id">
 </vn-item-descriptor-popover>
diff --git a/modules/ticket/front/sale-checked/index.js b/modules/ticket/front/sale-checked/index.js
index cfc3985ba..857ac49e3 100644
--- a/modules/ticket/front/sale-checked/index.js
+++ b/modules/ticket/front/sale-checked/index.js
@@ -17,7 +17,7 @@ class Controller extends Section {
             ]
         };
     }
-    showDescriptor(event, sale) {
+    showItemDescriptor(event, sale) {
         this.quicklinks = {
             btnThree: {
                 icon: 'icon-transaction',
@@ -29,7 +29,7 @@ class Controller extends Section {
                 tooltip: 'Item diary'
             }
         };
-        this.$.descriptor.show(event.target, sale.itemFk);
+        this.$.itemDescriptor.show(event.target, sale.itemFk);
     }
 }
 
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index 4e80b3565..54a0eca66 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -67,9 +67,9 @@
     </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 5bba457ca..5156206bb 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -100,7 +100,7 @@
                     </vn-td>
                     <vn-td shrink>
                         <span class="link" ng-if="sale.id"
-                            ng-click="descriptor.show($event, sale.itemFk, sale.id)">
+                            ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)">
                             {{sale.itemFk}}
                         </span>
                         <vn-autocomplete ng-if="!sale.id" class="dense"
@@ -190,7 +190,7 @@
     fixed-bottom-right>
 </vn-float-button>
 <vn-item-descriptor-popover
-    vn-id="descriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk",
     ticket-fk="$ctrl.ticket.id">
 </vn-item-descriptor-popover>
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index 6c25f2665..170cbd0cf 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -147,7 +147,7 @@
                         </vn-td>
                         <vn-td number shrink>
                             <span 
-                                ng-click="descriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)"
+                                ng-click="itemDescriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)"
                                 class="link">
                                 {{sale.itemFk | zeroFill:6}}
                             </span>
@@ -259,7 +259,7 @@
                         <vn-td number>
                             <span 
                                 ng-show="::request.saleFk"
-                                ng-click="descriptor.show($event, request.sale.itemFk, request.sale.id)"
+                                ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
                                 class="link">
                                 {{request.sale.itemFk | zeroFill:6}}
                             </span>
@@ -279,10 +279,10 @@
     </vn-horizontal>
 </vn-card>
 <vn-route-descriptor-popover
-    vn-id="routeDescriptor">
+    vn-id="route-descriptor">
 </vn-route-descriptor-popover>
 <vn-item-descriptor-popover
-    vn-id="descriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk",
     ticket-fk="$ctrl.ticket.id">
 </vn-item-descriptor-popover>
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index eb2a07d26..8e2bc4bb6 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -37,7 +37,7 @@
                     <vn-tr ng-repeat="sale in $ctrl.sales">
                         <vn-td number>
                             <span
-                                ng-click="descriptor.show($event, sale.itemFk, sale.id)"
+                                ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
                                 class="link">
                                 {{sale.itemFk | zeroFill:6}}
                             </span>
@@ -63,7 +63,7 @@
     </vn-card>
 </vn-vertical>
 <vn-item-descriptor-popover
-    vn-id="descriptor"
+    vn-id="item-descriptor"
     warehouse-fk="$ctrl.ticket.warehouseFk">
 </vn-item-descriptor-popover>