From 6459f2590b9edbeeffabf2a0f36c78c3250f16de Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 28 Jan 2021 18:24:27 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-customize.vue            |  2 +-
 .../views/inv-part-inventory-transactions.vue | 63 ++++++++++++-------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 2601c885..8aadd5a4 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -374,7 +374,7 @@ function ensureTemplateIsInStore(vm) {
 async function initDataObject(vm) {
   //Get all the fields *available* to this form (all the fields for the object defined in AyaFormFieldDefinitions.cs as SERVER)
   //Note: this is not the actual customization data, just the list of fields that could be customized (or not if required mandatory)
-  let url = "form-field-definition/" + vm.$route.params.formCustomTemplateKey;
+  let url = "form-field-reference/" + vm.$route.params.formCustomTemplateKey;
   let res = await window.$gz.api.get(url);
   if (res.error) {
     //throw new Error(res.error);
diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue
index 9b8e7b3f..30be7dec 100644
--- a/ayanova/src/views/inv-part-inventory-transactions.vue
+++ b/ayanova/src/views/inv-part-inventory-transactions.vue
@@ -13,7 +13,7 @@
       :dataListKey="dataListKey"
       :showSelect="rights.read"
       :reload="reload"
-      :metaView="metaView"
+      :clientCriteria="clientCriteria"
       v-on:selection-change="handleSelected"
       data-cy="partInventoryTransactionsTable"
     >
@@ -28,31 +28,46 @@ export default {
     let vm = this;
     vm.rights = window.$gz.role.getRights(window.$gz.type.PartInventory);
     window.$gz.eventBus.$on("menu-click", clickHandler);
-    if (vm.$route.params.filter) {
-      let metaFilter = [];
-      //pre-filter by PartNumber or warehouse name or both
-      if (vm.$route.params.filter.PartPartNumber != null) {
-        metaFilter.push({
-          fld: "PartPartNumber",
-          filter: {
-            items: [{ op: "=", value: vm.$route.params.filter.PartPartNumber }]
-          }
-        });
-      }
 
-      if (vm.$route.params.filter.PartWarehouseName != null) {
-        metaFilter.push({
-          fld: "PartWarehouseName",
-          filter: {
-            items: [
-              { op: "=", value: vm.$route.params.filter.PartWarehouseName }
-            ]
-          }
-        });
-      }
-      vm.metaView = JSON.stringify(metaFilter);
+  //Generate client criteria to send if filtered by part, whs or both
+    //ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
+    if (vm.$route.params.filter) {
+      vm.clientCriteria = `${
+        vm.$route.params.filter.PartPartNumber
+          ? vm.$route.params.filter.PartPartNumber
+          : "0"
+      },${
+        vm.$route.params.filter.PartWarehouseName
+          ? vm.$route.params.filter.PartWarehouseName
+          : "0"
+      }`;
     }
 
+    // if (vm.$route.params.filter) {
+    //   let metaFilter = [];
+    //   //pre-filter by PartNumber or warehouse name or both
+    //   if (vm.$route.params.filter.PartPartNumber != null) {
+    //     metaFilter.push({
+    //       fld: "PartPartNumber",
+    //       filter: {
+    //         items: [{ op: "=", value: vm.$route.params.filter.PartPartNumber }]
+    //       }
+    //     });
+    //   }
+
+    //   if (vm.$route.params.filter.PartWarehouseName != null) {
+    //     metaFilter.push({
+    //       fld: "PartWarehouseName",
+    //       filter: {
+    //         items: [
+    //           { op: "=", value: vm.$route.params.filter.PartWarehouseName }
+    //         ]
+    //       }
+    //     });
+    //   }
+    //   vm.metaView = JSON.stringify(metaFilter);
+    // }
+
     generateMenu(vm);
   },
   beforeDestroy() {
@@ -67,7 +82,7 @@ export default {
       rights: window.$gz.role.defaultRightsObject(),
       ayType: window.$gz.type.PartInventory,
       selectedItems: [],
-      metaView: undefined,
+      clientCriteria: undefined,
       reload: false,
       resetListView: false
     };