From ecc931dfc0854e20d53c84d7d432351ee4e60b4a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 31 Jul 2020 21:27:28 +0000 Subject: [PATCH] --- ayanova/src/api/initialize.js | 8 + ayanova/src/router.js | 15 +- ayanova/src/views/adm-user.vue | 9 +- ayanova/src/views/adm-users.vue | 6 +- ayanova/src/views/cust-user.vue | 773 +++++++++++++++++++++++++++++++ ayanova/src/views/cust-users.vue | 290 ++++++++++++ 6 files changed, 1092 insertions(+), 9 deletions(-) create mode 100644 ayanova/src/views/cust-user.vue create mode 100644 ayanova/src/views/cust-users.vue diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 74a862ed..e100bf38 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -226,6 +226,14 @@ function initNavPanel() { key: key++ }); + //Customer / Headoffice Users subitem + sub.push({ + title: "UserList", + icon: "fa-users", + route: "/cust-users", + key: key++ + }); + // ** CUSTOMER (TOP) addNavItem( "CustomerList", diff --git a/ayanova/src/router.js b/ayanova/src/router.js index a38725b4..ab0c1dad 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -157,7 +157,6 @@ export default new Router({ /* webpackChunkName: "ay-common" */ "./views/home-notify-subscription.vue" ) }, - { path: "/cust-customers", name: "cust-customers", @@ -170,6 +169,18 @@ export default new Router({ component: () => import(/* webpackChunkName: "cust" */ "./views/cust-headoffices.vue") }, + { + path: "/cust-users", + name: "cust-users", + component: () => + import(/* webpackChunkName: "cust" */ "./views/cust-users.vue") + }, + { + path: "/cust-users/:recordid", + name: "cust-user", + component: () => + import(/* webpackChunkName: "cust" */ "./views/cust-user.vue") + }, { path: "/svc-schedule", name: "svc-schedule", @@ -321,7 +332,6 @@ export default new Router({ component: () => import(/* webpackChunkName: "adm" */ "./views/adm-license.vue") }, - { path: "/adm-users", name: "adm-users", @@ -440,6 +450,7 @@ export default new Router({ /* webpackChunkName: "customer" */ "./views/customer-csr-list.vue" ) }, + //**********************************GENERAL */ { path: "/open/:ayatype/:recordid", diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue index 192d2aa8..9a6847f1 100644 --- a/ayanova/src/views/adm-user.vue +++ b/ayanova/src/views/adm-user.vue @@ -2,8 +2,7 @@

- todo: revisit after add customer, ho, vendor to support usertypes - customer,headoffice,contractor + todo: revisit after add vendor to support usertype contractor

@@ -765,7 +764,9 @@ async function fetchTranslatedText(vm) { // async function populateSelectionLists(vm) { //ensure the pick lists required are pre-fetched - await window.$gz.enums.fetchEnumList("usertype"); - vm.selectLists.usertypes = window.$gz.enums.getSelectionList("usertype"); + await window.$gz.enums.fetchEnumList("insideusertype"); + vm.selectLists.usertypes = window.$gz.enums.getSelectionList( + "insideusertype" + ); } diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue index cbd3e4e8..9b9d97d0 100644 --- a/ayanova/src/views/adm-users.vue +++ b/ayanova/src/views/adm-users.vue @@ -167,9 +167,9 @@ async function clickHandler(menuItem) { params: { recordid: 0 } }); break; - case "extensions": - let res = await m.vm.$refs.extensions.open(); - break; + // case "extensions": + // let res = await m.vm.$refs.extensions.open(); + // break; case "directnotify": //nav to direct notify with list of users appended to route if (m.vm.selected.length == 0) { diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue new file mode 100644 index 00000000..711f8d31 --- /dev/null +++ b/ayanova/src/views/cust-user.vue @@ -0,0 +1,773 @@ + + + diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue new file mode 100644 index 00000000..02e95d74 --- /dev/null +++ b/ayanova/src/views/cust-users.vue @@ -0,0 +1,290 @@ + + +