From cf0d881c25fb001a01580f454f8de909d1766662 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sat, 6 Feb 2021 16:34:55 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 6 ++++ ayanova/src/views/acc-service-banks.vue | 43 ++++++++++++----------- ayanova/src/views/adm-users.vue | 3 -- ayanova/src/views/cust-users.vue | 16 --------- ayanova/src/views/home-reviews.vue | 46 ++++++++++++++----------- 5 files changed, 54 insertions(+), 60 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 4a2106d1..69e2fdbc 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -15,8 +15,14 @@ LISTVIEW REPLACE CURRENT <----HERE not THERE ---v TODO (now) + BOTH + Switch to ClientCriteria from metaView for + acc-service-banks + home-reviews + CLIENT + DataLIstKey: this property is static and unchanging so why put it on the vue vm, just specify it in the markup alone Mobile view why does it not switch when switch widths and have to reset? custom fields dont' show unless defined?? diff --git a/ayanova/src/views/acc-service-banks.vue b/ayanova/src/views/acc-service-banks.vue index b3dcb3f7..39741f74 100644 --- a/ayanova/src/views/acc-service-banks.vue +++ b/ayanova/src/views/acc-service-banks.vue @@ -17,6 +17,7 @@ :dataListKey="dataListKey" :dataListFilter="dataListFilter" :dataListSort="dataListSort" + :clientCriteria="clientCriteria" :showSelect="rights.read" :reload="reload" :ridColumnOpenable="false" @@ -41,25 +42,27 @@ export default { ); if (vm.objectId && vm.objectId != 0 && vm.objectType) { - //DYNAMIC FILTER - vm.metaView = JSON.stringify([ - { - fld: "metaservicebankobjectid", - filter: { - items: [{ op: "=", value: vm.objectId }] - } - }, - { - fld: "AyaType", - filter: { - items: [{ op: "=", value: vm.objectType }] - } - } - ]); - vm.name = await window.$gz.api.fetchBizObjectName( - vm.objectType, - vm.objectId - ); + // //DYNAMIC FILTER + // vm.mxetaView = JSON.stringify([ + // { + // fld: "metaservicebankobjectid", + // filter: { + // items: [{ op: "=", value: vm.objectId }] + // } + // }, + // { + // fld: "AyaType", + // filter: { + // items: [{ op: "=", value: vm.objectType }] + // } + // } + // ]); + // vm.name = await window.$gz.api.fetchBizObjectName( + // vm.objectType, + // vm.objectId + // ); + //OBJECTID,AYATYPE + vm.clientCriteria = `${vm.objectId},${vm.objectType}`; } generateMenu(vm); @@ -77,9 +80,9 @@ export default { ayType: window.$gz.type.ServiceBank, selectedItems: [], reload: false, + clientCriteria: undefined, objectId: null, objectType: null, - metaView: undefined, name: null }; }, diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue index 7a0dacbd..05d1b10d 100644 --- a/ayanova/src/views/adm-users.vue +++ b/ayanova/src/views/adm-users.vue @@ -26,8 +26,6 @@ const FORM_KEY = "adm-users"; export default { created() { - - this.rights = window.$gz.role.getRights(window.$gz.type.User); window.$gz.eventBus.$on("menu-click", clickHandler); generateMenu(this); @@ -41,7 +39,6 @@ export default { dataListKey: "InsideUserDataList", dataListFilter: "", dataListSort: "", - rights: window.$gz.role.defaultRightsObject(), ayType: window.$gz.type.User, selectedItems: [], diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue index b674bfa1..4fc304ed 100644 --- a/ayanova/src/views/cust-users.vue +++ b/ayanova/src/views/cust-users.vue @@ -15,7 +15,6 @@ :dataListSort="dataListSort" :showSelect="rights.read" :reload="reload" - :metaView="metaView" v-on:selection-change="handleSelected" data-cy="custUsersTable" > @@ -27,20 +26,6 @@ const FORM_KEY = "cust-users"; export default { created() { - //outside users only - this.metaView = JSON.stringify([ - { - fld: "usertype", - filter: { - items: [ - { op: "=", value: 3 }, - { op: "=", value: 4 } - ], - any: true - } - } - ]); - this.rights = window.$gz.role.getRights(window.$gz.type.User); window.$gz.eventBus.$on("menu-click", clickHandler); generateMenu(this); @@ -54,7 +39,6 @@ export default { dataListKey: "OutsideUserDataList", dataListFilter: "", dataListSort: "", - metaView: undefined, rights: window.$gz.role.defaultRightsObject(), ayType: window.$gz.type.User, selectedItems: [], diff --git a/ayanova/src/views/home-reviews.vue b/ayanova/src/views/home-reviews.vue index 09c67d40..13dbbccb 100644 --- a/ayanova/src/views/home-reviews.vue +++ b/ayanova/src/views/home-reviews.vue @@ -17,8 +17,9 @@ :dataListKey="dataListKey" :dataListFilter="dataListFilter" :dataListSort="dataListSort" + :clientCriteria="clientCriteria" :showSelect="rights.read" - :reload="reload" + :reload="reload" v-on:selection-change="handleSelected" data-cy="reviewsTable" > @@ -40,25 +41,28 @@ export default { ); if (vm.objectId && vm.objectId != 0 && vm.objectType) { - //pre-filter - vm.metaView = JSON.stringify([ - { - fld: "metareviewobjectid", - filter: { - items: [{ op: "=", value: vm.objectId }] - } - }, - { - fld: "AyaType", - filter: { - items: [{ op: "=", value: vm.objectType }] - } - } - ]); - vm.name = await window.$gz.api.fetchBizObjectName( - vm.objectType, - vm.objectId - ); + //REMOVE COMMENT BLOCK AFTER TESTING + // //pre-filter + // vm.mxetaView = JSON.stringify([ + // { + // fld: "metareviewobjectid", + // filter: { + // items: [{ op: "=", value: vm.objectId }] + // } + // }, + // { + // fld: "AyaType", + // filter: { + // items: [{ op: "=", value: vm.objectType }] + // } + // } + // ]); + // vm.name = await window.$gz.api.fetchBizObjectName( + // vm.objectType, + // vm.objectId + // ); + //OBJECTID,AYATYPE + vm.clientCriteria = `${vm.objectId},${vm.objectType}`; } generateMenu(vm); @@ -76,9 +80,9 @@ export default { ayType: window.$gz.type.Review, selectedItems: [], reload: false, + clientCriteria: undefined, objectId: null, objectType: null, - metaView: undefined, name: null }; },