claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig

2021-05-21 15:31:05 +02:00 · 2021-05-21 15:31:05 +02:00 · 1bfe537186
parent bc887bce8e
commit 1bfe537186
17 changed files with 52 additions and 33 deletions
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@ -71,7 +71,7 @@
                    vn-repeat-last on-last="$ctrl.focusLastInput()">
                    <vn-td number>
                            <span 
-                                ng-click="descriptor.show($event, saleClaimed.sale.itemFk)"
+                                ng-click="itemDescriptor.show($event, saleClaimed.sale.itemFk)"
                                class="link">
                                {{::saleClaimed.sale.itemFk | zeroFill:6}}
                            </span>
@ -154,10 +154,11 @@
    </div>
 </vn-popover>
 <vn-item-descriptor-popover
-    vn-id="descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-ticket-descriptor-popover 
-    vn-id="ticketDescriptor">
+    vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
 <vn-confirm 
    vn-id="update-greuge" 
--- a/modules/claim/front/detail/index.html
+++ b/modules/claim/front/detail/index.html
@ -129,7 +129,8 @@
    </tpl-body>
 </vn-dialog>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-popover 
    class="edit"
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@ -220,11 +220,12 @@
    </vn-horizontal>
 </vn-card>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
 <vn-ticket-descriptor-popover 
-    vn-id="ticketDescriptor">
+    vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
--- a/modules/client/front/consumption/index.html
+++ b/modules/client/front/consumption/index.html
@ -82,7 +82,8 @@
    </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover 
-    vn-id="item-descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-ticket-descriptor-popover 
    vn-id="ticket-descriptor">
--- a/modules/entry/front/buy/index/index.html
+++ b/modules/entry/front/buy/index/index.html
@ -202,7 +202,8 @@
    </vn-vertical>
 </div>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>

 <vn-confirm
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@ -195,8 +195,9 @@
    </tpl-buttons>
 </vn-dialog>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-entry-descriptor-popover
-    vn-id="entryDescriptor">
+    vn-id="entry-descriptor">
 </vn-entry-descriptor-popover>
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@ -160,9 +160,10 @@
    </vn-horizontal>
 </vn-card>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-travel-descriptor-popover
-    vn-id="travelDescriptor">
+    vn-id="travel-descriptor">
 </vn-travel-descriptor-popover>

--- a/modules/item/front/card/index.html
+++ b/modules/item/front/card/index.html
@ -1,5 +1,8 @@
 <vn-portal slot="menu">
-    <vn-item-descriptor item="$ctrl.item" card-reload="$ctrl.reload()"></vn-item-descriptor>
+    <vn-item-descriptor 
+        warehouse-fk="$ctrl.vnConfig.warehouseFk"
+        item="$ctrl.item"
+        card-reload="$ctrl.reload()"></vn-item-descriptor>
    <vn-left-menu source="card"></vn-left-menu>
 </vn-portal>
 <ui-view></ui-view>
--- a/modules/item/front/descriptor/index.js
+++ b/modules/item/front/descriptor/index.js
@ -35,7 +35,7 @@ class Controller extends Descriptor {
        if (!this.item) return;

        const params = {
-            warehouseFk: this.item.itemType.warehouseFk,
+            warehouseFk: this.warehouseFk,
            dated: this.dated
        };

@ -90,6 +90,7 @@ ngModule.vnComponent('vnItemDescriptor', {
    bindings: {
        item: '<',
        dated: '<',
-        cardReload: '&'
+        cardReload: '&',
+        warehouseFk: '<?'
    }
 });
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@ -155,5 +155,6 @@
    </vn-card>
 </div>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@ -112,10 +112,11 @@
    <vn-float-button icon="add"></vn-float-button>
 </a>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
 <vn-confirm 
    vn-id="clone"
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@ -107,13 +107,14 @@
    </vn-card>
 </vn-data-viewer>
 <vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
 <vn-ticket-descriptor-popover 
-    vn-id="ticketDescriptor">
+    vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
 <vn-item-descriptor-popover 
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-dialog
    vn-id="denyDialog"
--- a/modules/item/front/waste/detail/index.html
+++ b/modules/item/front/waste/detail/index.html
@ -23,7 +23,7 @@
                    <vn-tr ng-repeat="waste in detail.lines">
                        <vn-td shrink>
                            <span 
-                                ng-click="descriptor.show($event, waste.itemFk)"
+                                ng-click="itemDescriptor.show($event, waste.itemFk)"
                                class="link">
                                {{::waste.itemFk}}
                            </span>
@ -38,5 +38,6 @@
    </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@ -63,9 +63,10 @@
    </vn-horizontal>
 </vn-data-viewer>
 <vn-order-prices-popover
-    vn-id="pricesPopover"
+    vn-id="prices-popover"
    order="$ctrl.order">
 </vn-order-prices-popover>
 <vn-item-descriptor-popover
-    vn-id="itemDescriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@ -37,7 +37,7 @@
                            on-error-src/>
                    </vn-td>
                    <vn-td number>
-                        <span ng-click="descriptor.show($event, row.itemFk)"
+                        <span ng-click="itemDescriptor.show($event, row.itemFk)"
                            class="link">
                            {{::row.itemFk | zeroFill:6}}
                        </span>
@ -83,7 +83,8 @@
    fixed-bottom-right>
 </vn-float-button>
 <vn-item-descriptor-popover 
-    vn-id="descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-confirm
    vn-id="delete-row"
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@ -93,7 +93,7 @@
                        </vn-td>
                        <vn-td shrink>
                            <span 
-                                ng-click="descriptor.show($event, row.itemFk)"
+                                ng-click="itemDescriptor.show($event, row.itemFk)"
                                class="link">
                                {{::row.itemFk | zeroFill:6}}
                            </span>
@ -119,8 +119,9 @@
    </vn-horizontal>
 </vn-card>
 <vn-item-descriptor-popover
-    vn-id="descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
 <vn-client-descriptor-popover
-    vn-id="clientDescriptor">
+    vn-id="client-descriptor">
 </vn-client-descriptor-popover>
--- a/modules/order/front/volume/index.html
+++ b/modules/order/front/volume/index.html
@ -34,7 +34,7 @@
                <vn-tr ng-repeat="row in rows">
                    <vn-td shrink number>
                        <span
-                            ng-click="descriptor.show($event, row.itemFk)"
+                            ng-click="itemDescriptor.show($event, row.itemFk)"
                            class="link">
                            {{::row.itemFk}}
                        </span>
@ -58,6 +58,7 @@
    </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
-    vn-id="descriptor">
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>