This commit is contained in:
2021-02-06 16:34:55 +00:00
parent 2327c81a5c
commit cf0d881c25
5 changed files with 54 additions and 60 deletions

View File

@@ -15,8 +15,14 @@ LISTVIEW REPLACE CURRENT <----HERE not THERE ---v
TODO (now) TODO (now)
BOTH
Switch to ClientCriteria from metaView for
acc-service-banks
home-reviews
CLIENT 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 Mobile view
why does it not switch when switch widths and have to reset? why does it not switch when switch widths and have to reset?
custom fields dont' show unless defined?? custom fields dont' show unless defined??

View File

@@ -17,6 +17,7 @@
:dataListKey="dataListKey" :dataListKey="dataListKey"
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:clientCriteria="clientCriteria"
:showSelect="rights.read" :showSelect="rights.read"
:reload="reload" :reload="reload"
:ridColumnOpenable="false" :ridColumnOpenable="false"
@@ -41,25 +42,27 @@ export default {
); );
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//DYNAMIC FILTER // //DYNAMIC FILTER
vm.metaView = JSON.stringify([ // vm.mxetaView = JSON.stringify([
{ // {
fld: "metaservicebankobjectid", // fld: "metaservicebankobjectid",
filter: { // filter: {
items: [{ op: "=", value: vm.objectId }] // items: [{ op: "=", value: vm.objectId }]
} // }
}, // },
{ // {
fld: "AyaType", // fld: "AyaType",
filter: { // filter: {
items: [{ op: "=", value: vm.objectType }] // items: [{ op: "=", value: vm.objectType }]
} // }
} // }
]); // ]);
vm.name = await window.$gz.api.fetchBizObjectName( // vm.name = await window.$gz.api.fetchBizObjectName(
vm.objectType, // vm.objectType,
vm.objectId // vm.objectId
); // );
//OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
} }
generateMenu(vm); generateMenu(vm);
@@ -77,9 +80,9 @@ export default {
ayType: window.$gz.type.ServiceBank, ayType: window.$gz.type.ServiceBank,
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined,
objectId: null, objectId: null,
objectType: null, objectType: null,
metaView: undefined,
name: null name: null
}; };
}, },

View File

@@ -26,8 +26,6 @@
const FORM_KEY = "adm-users"; const FORM_KEY = "adm-users";
export default { export default {
created() { created() {
this.rights = window.$gz.role.getRights(window.$gz.type.User); this.rights = window.$gz.role.getRights(window.$gz.type.User);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(this); generateMenu(this);
@@ -41,7 +39,6 @@ export default {
dataListKey: "InsideUserDataList", dataListKey: "InsideUserDataList",
dataListFilter: "", dataListFilter: "",
dataListSort: "", dataListSort: "",
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, ayType: window.$gz.type.User,
selectedItems: [], selectedItems: [],

View File

@@ -15,7 +15,6 @@
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.read" :showSelect="rights.read"
:reload="reload" :reload="reload"
:metaView="metaView"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="custUsersTable" data-cy="custUsersTable"
> >
@@ -27,20 +26,6 @@
const FORM_KEY = "cust-users"; const FORM_KEY = "cust-users";
export default { export default {
created() { 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); this.rights = window.$gz.role.getRights(window.$gz.type.User);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(this); generateMenu(this);
@@ -54,7 +39,6 @@ export default {
dataListKey: "OutsideUserDataList", dataListKey: "OutsideUserDataList",
dataListFilter: "", dataListFilter: "",
dataListSort: "", dataListSort: "",
metaView: undefined,
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, ayType: window.$gz.type.User,
selectedItems: [], selectedItems: [],

View File

@@ -17,6 +17,7 @@
:dataListKey="dataListKey" :dataListKey="dataListKey"
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:clientCriteria="clientCriteria"
:showSelect="rights.read" :showSelect="rights.read"
:reload="reload" :reload="reload"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
@@ -40,25 +41,28 @@ export default {
); );
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//pre-filter //REMOVE COMMENT BLOCK AFTER TESTING
vm.metaView = JSON.stringify([ // //pre-filter
{ // vm.mxetaView = JSON.stringify([
fld: "metareviewobjectid", // {
filter: { // fld: "metareviewobjectid",
items: [{ op: "=", value: vm.objectId }] // filter: {
} // items: [{ op: "=", value: vm.objectId }]
}, // }
{ // },
fld: "AyaType", // {
filter: { // fld: "AyaType",
items: [{ op: "=", value: vm.objectType }] // filter: {
} // items: [{ op: "=", value: vm.objectType }]
} // }
]); // }
vm.name = await window.$gz.api.fetchBizObjectName( // ]);
vm.objectType, // vm.name = await window.$gz.api.fetchBizObjectName(
vm.objectId // vm.objectType,
); // vm.objectId
// );
//OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
} }
generateMenu(vm); generateMenu(vm);
@@ -76,9 +80,9 @@ export default {
ayType: window.$gz.type.Review, ayType: window.$gz.type.Review,
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined,
objectId: null, objectId: null,
objectType: null, objectType: null,
metaView: undefined,
name: null name: null
}; };
}, },