From 4016df08bbfa4a753458206728e1ccb50e704f88 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 27 Dec 2019 20:19:04 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 5 +- ayanova/src/api/initialize.js | 108 +++++++++--------- ayanova/src/router.js | 2 +- ayanova/src/views/ay-customize.vue | 2 +- .../src/views/test-inventory-widget-edit.vue | 18 +-- 5 files changed, 61 insertions(+), 74 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index b9a0884a..90a8c7cc 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -49,8 +49,7 @@ SHELL / NAV / MENUS / LAYOUT TODO: After testing on phone found following issues: - - Customize form showing form field data types with ?? as not localized - - FormFieldDataTypesDateTime + - Service menu: - Realized Workorders quotes etc are pushed down into a sub menu only because of the templates yet they will be super commonly accessed - Maybe put all templates in their own submenu and keep the workorders quotes etc as top level under Service @@ -208,6 +207,8 @@ TODO: Trial route ui support in client TODO: TIME ZONE MISMATCH MESSAGE - Time zone mismatch message sb localized and far shorter with an actionable link to that area of the client +TODO: Workorder/quote/pm templates + - Put the link to access them into their own type, i.e. Workorder templates are accessed from either the grid listing workorders or inside an individual or perhaps BEST IDEA in the NEW menu where you pick a template !!!!! TODO: Hover / hint text on copy log and log buttons (and possibly others?) diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 7b4e3b98..b29ea08b 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -150,87 +150,87 @@ export default function initialize() { key: key++ }); - //WORKORDERS GROUP SUBITEMS + //WORKORDERS LIST (was service workorders) - subSub.push({ + sub.push({ title: window.$gz.locale.get("WorkorderServiceList"), icon: "tools", route: "/svc-workorders", key: key++ }); - //WORKORDER TEMPLATES LIST - subSub.push({ - title: window.$gz.locale.get("WorkorderServiceTemplate"), - icon: "stamp", - route: "/svc-workorder-templates", - key: key++ - }); + // //WORKORDER TEMPLATES LIST + //this will be an item inside the workorders NEW menu or grid or wherever but it's not top level worthy + // subSub.push({ + // title: window.$gz.locale.get("WorkorderServiceTemplate"), + // icon: "stamp", + // route: "/svc-workorder-templates", + // key: key++ + // }); - //WORKORDERS GROUP - sub.push({ - title: window.$gz.locale.get("WorkorderServiceList"), - icon: "tools", - route: undefined, - navItems: subSub, - key: key++ - }); + // //WORKORDERS GROUP + // sub.push({ + // title: window.$gz.locale.get("WorkorderServiceList"), + // icon: "tools", + // route: undefined, + // navItems: subSub, + // key: key++ + // }); - //QUOTE GROUP SUBITEMS - subSub = []; + //QUOTE LIST - subSub.push({ + sub.push({ title: window.$gz.locale.get("WorkorderQuoteList"), icon: "edit", route: "/svc-quotes", key: key++ }); - //QUOTE TEMPLATES LIST - subSub.push({ - title: window.$gz.locale.get("WorkorderQuoteTemplate"), - icon: "stamp", - route: "/svc-quote-templates", - key: key++ - }); + // //QUOTE TEMPLATES LIST + // subSub.push({ + // title: window.$gz.locale.get("WorkorderQuoteTemplate"), + // icon: "stamp", + // route: "/svc-quote-templates", + // key: key++ + // }); - //QUOTE GROUP - sub.push({ - title: window.$gz.locale.get("WorkorderQuoteList"), - icon: "edit", - route: undefined, - navItems: subSub, - key: key++ - }); + // //QUOTE GROUP + // sub.push({ + // title: window.$gz.locale.get("WorkorderQuoteList"), + // icon: "edit", + // route: undefined, + // navItems: subSub, + // key: key++ + // }); //PM GROUP SUBITEMS - subSub = []; + //subSub = []; //PM LIST - subSub.push({ + sub.push({ title: window.$gz.locale.get("WorkorderPreventiveMaintenanceList"), icon: "business-time", route: "/svc-pm-list", key: key++ }); - //PM TEMPLATES LIST - subSub.push({ - title: window.$gz.locale.get( - "WorkorderPreventiveMaintenanceTemplate" - ), - icon: "stamp", - route: "/svc-pm-templates", - key: key++ - }); + // //PM TEMPLATES LIST + // subSub.push({ + // title: window.$gz.locale.get( + // "WorkorderPreventiveMaintenanceTemplate" + // ), + // icon: "stamp", + // route: "/svc-pm-templates", + // key: key++ + // }); - //PM GROUP - sub.push({ - title: window.$gz.locale.get("WorkorderPreventiveMaintenanceList"), - icon: "business-time", - route: undefined, - navItems: subSub, - key: key++ - }); + // //PM GROUP + // sub.push({ + // title: window.$gz.locale.get("WorkorderPreventiveMaintenanceList"), + // icon: "business-time", + // route: undefined, + // navItems: subSub, + // key: key++ + // }); //UNITS subitem sub.push({ diff --git a/ayanova/src/router.js b/ayanova/src/router.js index 3051917b..59d174d9 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -76,7 +76,7 @@ export default new Router({ component: () => import(/* webpackChunkName: "home" */ "./views/home-dashboard.vue") }, - { path: "/", redirect: "/login" }, + { path: "/", redirect: "/login" }, //If someone goes blindly to the root of the app, then it should go to login { path: "/home-schedule", name: "home-schedule", diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue index d5a66b67..42f72919 100644 --- a/ayanova/src/views/ay-customize.vue +++ b/ayanova/src/views/ay-customize.vue @@ -105,7 +105,7 @@ export default { "FormFieldDataTypesTrueFalse" ]; - window.$gz.locale.fetch(ltKeysRequired).then(next()); + window.$gz.locale.fetch(ltKeysRequired).then(next); }, beforeCreate() { var vm = this; diff --git a/ayanova/src/views/test-inventory-widget-edit.vue b/ayanova/src/views/test-inventory-widget-edit.vue index baef06ff..a8d81f1c 100644 --- a/ayanova/src/views/test-inventory-widget-edit.vue +++ b/ayanova/src/views/test-inventory-widget-edit.vue @@ -258,15 +258,8 @@ export default { window.$gz.locale.fetch(ltKeysRequired).then( //ensure cached any form customizations for this particular form - window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY).then(next()) + window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY).then(next) ); - - // //very important as this in conjunction with the menu options means - // //navigation guards work properly by just sending people here - // next(() => { - // auth.logout(); - // next(); - // }); }, beforeCreate() { var vm = this; @@ -707,14 +700,7 @@ var JUST_DELETED = false; ////////////////////// // // -// function initForm(vm) { -// return fetchLocaleText(vm).then( -// populatePickLists(vm).then( -// window.$gz.formcustomtemplate.get(FORM_CUSTOM_TEMPLATE_KEY) -// ) -// ); -// } - +// function initForm(vm) { return populatePickLists(vm); }