From 6bb3ac290c228f94ea9922c202551f0a31208b64 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 24 Jun 2020 22:17:57 +0000 Subject: [PATCH] --- ayanova/src/App.vue | 14 +-- ayanova/src/api/gzmenu.js | 18 ++-- ayanova/src/api/initialize.js | 125 +++++++++++------------ ayanova/src/views/home-user-settings.vue | 6 +- 4 files changed, 78 insertions(+), 85 deletions(-) diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue index c19a9972..c2cc7874 100644 --- a/ayanova/src/App.vue +++ b/ayanova/src/App.vue @@ -32,7 +32,7 @@ > @@ -50,7 +50,7 @@ @@ -68,7 +68,7 @@ > @@ -91,7 +91,7 @@ {{ - subitem.title + $ay.t(subitem.title) }} @@ -115,7 +115,7 @@ }} - {{ item.title }} + {{ $ay.t(item.title) }} @@ -140,7 +140,7 @@ {{ appBar.icon }}  - {{ appBar.title }} + {{ $ay.t(appBar.title) }} @@ -198,7 +198,7 @@ - {{ item.title }} + {{ $ay.t(item.title) }} diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js index 2fad50d9..c4e9192d 100644 --- a/ayanova/src/api/gzmenu.js +++ b/ayanova/src/api/gzmenu.js @@ -75,14 +75,14 @@ export default { //there will be few exceptions so they will be coded in later if needed but assume anything with an id and a type if (isCoreBizObject) { // vm.appBar.menuItems.push({ - // title: window.$gz.translation.get("Attachments"), + // title: "Attachments"), // icon: "fa-paperclip", // key: "app:attachments", // data: { ayaType: formAyaType, recordId: formRecordId } // }); // vm.appBar.menuItems.push({ - // title: window.$gz.translation.get("WikiPage"), + // title: "WikiPage"), // icon: "fa-feather", // key: "app:wiki", // data: { ayaType: formAyaType, recordId: formRecordId } @@ -92,7 +92,7 @@ export default { //basically it's now a "Reminder" type of object but it's own thing with separate collection vm.appBar.menuItems.push({ - title: window.$gz.translation.get("Review"), + title: "Review", icon: "fa-calendar-check", key: "app:review", data: { ayaType: formAyaType, recordId: formRecordId } @@ -101,7 +101,7 @@ export default { //AFAIK right now any item with an id and a type can have a history //anything not would be the exception rather than the rule vm.appBar.menuItems.push({ - title: window.$gz.translation.get("History"), + title: "History", icon: "fa-history", key: "app:history", data: { ayaType: formAyaType, recordId: formRecordId } @@ -111,7 +111,7 @@ export default { //PLUGINS - for anything with a type but not necessarily an ID if (!UTILITY_TYPES.includes(formAyaType)) { vm.appBar.menuItems.push({ - title: window.$gz.translation.get("More"), + title: "More", icon: "fa-puzzle-piece", key: "app:plugin", data: formAyaType, @@ -138,7 +138,7 @@ export default { // vm.appBar.menuItems.push({ divider: true, inset: false }); //customize vm.appBar.menuItems.push({ - title: window.$gz.translation.get("Customize"), + title: "Customize", icon: "fa-sliders-h", data: ctx.formData.formCustomTemplateKey, key: "app:customize" @@ -161,7 +161,7 @@ export default { if (!ctx.hideSearch && !UTILITY_TYPES.includes(formAyaType)) { //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice vm.appBar.menuItems.push({ - title: window.$gz.translation.get("Search"), + title: "Search", icon: "fa-search", key: "app:search", data: formAyaType @@ -170,7 +170,7 @@ export default { //HELP vm.appBar.menuItems.push({ - title: window.$gz.translation.get("MenuHelp"), + title: "MenuHelp", icon: "fa-question-circle", key: "app:help", data: vm.appBar.helpUrl @@ -179,7 +179,7 @@ export default { //ABOUT if (!isCoreBizObject && !ctx.helpUrl != "form-ay-about") { vm.appBar.menuItems.push({ - title: window.$gz.translation.get("HelpAboutAyaNova"), + title: "HelpAboutAyaNova", icon: "fa-info-circle", key: "app:nav:abt", data: "ay-about" diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 520fa9bf..73eece7f 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -48,14 +48,14 @@ function initNavPanel() { licenseState == 5 ) { addNavItem( - t("HelpLicense"), + "HelpLicense", "fa-ticket-alt", "/adm-license", [], key++, "license" ); - addNavItem(t("Logout"), "fa-sign-out-alt", "/login", [], key++, "logout"); + addNavItem("Logout", "fa-sign-out-alt", "/login", [], key++, "logout"); window.$gz.store.commit("setHomePage", "/adm-license"); return; } @@ -81,7 +81,7 @@ function initNavPanel() { ) { //DASHBOARD sub.push({ - title: t("Dashboard"), + title: "Dashboard", icon: "fa-tachometer-alt", route: "/home-dashboard", key: key++ @@ -107,7 +107,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("Search"), + title: "Search", icon: "fa-search", route: "/home-search", key: key++ @@ -116,7 +116,7 @@ function initNavPanel() { //SCHEDULE (personal) sub.push({ - title: t("Schedule"), + title: "Schedule", icon: "fa-calendar-day", route: "/home-schedule", key: key++ @@ -124,7 +124,7 @@ function initNavPanel() { //MEMOS sub.push({ - title: t("MemoList"), + title: "MemoList", icon: "fa-inbox", route: "/home-memos", key: key++ @@ -132,7 +132,7 @@ function initNavPanel() { //REMINDERS (SCHEDULE MARKERS) sub.push({ - title: t("ReminderList"), + title: "ReminderList", icon: "fa-sticky-note", route: "/home-reminders", key: key++ @@ -140,7 +140,7 @@ function initNavPanel() { //USER SETTINGS sub.push({ - title: t("UserSettings"), + title: "UserSettings", icon: "fa-user-cog", route: "/home-user-settings", key: key++ @@ -149,7 +149,7 @@ function initNavPanel() { //Moved these two into user settings // //USER TRANSLATE // sub.push({ - // title: t("Translation"), + // title: "Translation", // icon: "fa-language", // route: "/home-translation", // key: key++ @@ -157,7 +157,7 @@ function initNavPanel() { // //SET LOGIN // sub.push({ - // title: t("SetLoginPassword"), + // title: "SetLoginPassword", // icon: "fa-key", // route: "/home-password", // key: key++ @@ -181,7 +181,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("NotifySubscriptionList"), + title: "NotifySubscriptionList", icon: "fa-bullhorn", route: "/home-notify-subscriptions", key: key++ @@ -189,7 +189,7 @@ function initNavPanel() { } //HOME - addNavItem(t("Home"), "fa-home", undefined, sub, key++, "home"); + addNavItem("Home", "fa-home", undefined, sub, key++, "home"); } //****************** CUSTOMERS @@ -211,7 +211,7 @@ function initNavPanel() { //CUSTOMERS subitem sub.push({ - title: t("CustomerList"), + title: "CustomerList", icon: "fa-address-card", route: "/cust-customers", key: key++ @@ -219,7 +219,7 @@ function initNavPanel() { //HEAD OFFICES subitem sub.push({ - title: t("HeadOfficeList"), + title: "HeadOfficeList", icon: "fa-sitemap", route: "/cust-headoffices", key: key++ @@ -227,7 +227,7 @@ function initNavPanel() { // ** CUSTOMER (TOP) addNavItem( - t("CustomerList"), + "CustomerList", "fa-address-book", undefined, sub, @@ -263,7 +263,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("Schedule"), + title: "Schedule", icon: "fa-calendar-alt", route: "/svc-schedule", key: key++ @@ -282,7 +282,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("WorkOrderList"), + title: "WorkOrderList", icon: "fa-tools", route: "/svc-workorders", key: key++ @@ -293,7 +293,7 @@ function initNavPanel() { //this will be an item inside the workorders NEW menu or grid or wherever but it's not top level worthy //there used to be an array for 3rd level shit but that's whack yo! ;) // subSub.push({ - // title: t("WorkOrderServiceTemplate"), + // title: "WorkOrderServiceTemplate", // icon: "fa-stamp", // route: "/svc-workorder-templates", // key: key++ @@ -303,7 +303,7 @@ function initNavPanel() { //NOTE: this is the only item in this service level area that is visible to Sales //so there is no separate role check here as the service group role check supersedes this sub.push({ - title: t("QuoteList"), + title: "QuoteList", icon: "fa-pencil-alt", route: "/svc-quotes", key: key++ @@ -321,7 +321,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("PMList"), + title: "PMList", icon: "fa-business-time", route: "/svc-pm-list", key: key++ @@ -340,7 +340,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("UnitList"), + title: "UnitList", icon: "fa-fan", route: "/svc-units", key: key++ @@ -348,7 +348,7 @@ function initNavPanel() { //UNIT MODELS subitem sub.push({ - title: t("UnitModels"), + title: "UnitModels", icon: "fa-dice-d20", route: "/svc-unit-models", key: key++ @@ -366,7 +366,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("LoanUnitList"), + title: "LoanUnitList", icon: "fa-plug", route: "/svc-loaners", key: key++ @@ -385,7 +385,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("ContractList"), + title: "ContractList", icon: "fa-file-contract", route: "/svc-contracts", key: key++ @@ -404,7 +404,7 @@ function initNavPanel() { ]) ) { sub.push({ - title: t("CustomerServiceRequestList"), + title: "CustomerServiceRequestList", icon: "fa-child", route: "/svc-csr-list", key: key++ @@ -412,7 +412,7 @@ function initNavPanel() { } //**** Service (TOP GROUP) - addNavItem(t("Service"), "fa-toolbox", undefined, sub, key++, "service"); + addNavItem("Service", "fa-toolbox", undefined, sub, key++, "service"); } //****************** INVENTORY @@ -429,7 +429,7 @@ function initNavPanel() { //PARTS (part list) sub.push({ - title: t("PartList"), + title: "PartList", icon: "fa-boxes", route: "/inv-parts", key: key++ @@ -437,7 +437,7 @@ function initNavPanel() { //INVENTORY sub.push({ - title: t("PartByWarehouseInventoryList"), + title: "PartByWarehouseInventoryList", icon: "fa-pallet", route: "/inv-part-inventory", key: key++ @@ -445,7 +445,7 @@ function initNavPanel() { //PART REQUESTS sub.push({ - title: t("WorkOrderItemPartRequestList"), + title: "WorkOrderItemPartRequestList", icon: "fa-paper-plane", route: "/inv-part-requests", key: key++ @@ -453,7 +453,7 @@ function initNavPanel() { //PURCHASE ORDERS sub.push({ - title: t("InventoryPurchaseOrders"), + title: "InventoryPurchaseOrders", icon: "fa-shipping-fast", route: "/inv-purchase-orders", key: key++ @@ -463,7 +463,7 @@ function initNavPanel() { //PURCHASE ORDER RECEIPTS sub.push({ - title: t("InventoryPurchaseOrderReceipts"), + title: "InventoryPurchaseOrderReceipts", icon: "fa-dolly-flatbed", route: "/inv-purchase-order-receipts", key: key++ @@ -475,14 +475,14 @@ function initNavPanel() { //ADJUSTMENTS sub.push({ - title: t("InventoryPartInventoryAdjustments"), + title: "InventoryPartInventoryAdjustments", icon: "fa-dolly", route: "/inv-adjustments", key: key++ }); //**** INVENTORY (TOP GROUP) - addNavItem(t("Inventory"), "fa-box", undefined, sub, key++, "inventory"); + addNavItem("Inventory", "fa-box", undefined, sub, key++, "inventory"); } //**** VENDORS (TOP GROUP) @@ -497,7 +497,7 @@ function initNavPanel() { role.InventoryLimited ]) ) { - addNavItem(t("VendorList"), "fa-store", "/vendors", [], key++, "vendor"); + addNavItem("VendorList", "fa-store", "/vendors", [], key++, "vendor"); } //****************** ACCOUNTING @@ -512,7 +512,7 @@ function initNavPanel() { //FAKE subitem as is still TBD sub.push({ - title: t("Accounting"), + title: "Accounting", icon: "fa-calculator", route: "/acc-accounting", key: key++ @@ -520,7 +520,7 @@ function initNavPanel() { // ** ACCOUNTING (TOP) addNavItem( - t("Accounting"), + "Accounting", "fa-calculator", undefined, sub, @@ -536,7 +536,7 @@ function initNavPanel() { // GLOBAL SETTINGS sub.push({ - title: t("AdministrationGlobalSettings"), + title: "AdministrationGlobalSettings", icon: "fa-cogs", route: "/adm-global-settings", key: key++ @@ -544,7 +544,7 @@ function initNavPanel() { // LICENSE sub.push({ - title: t("HelpLicense"), + title: "HelpLicense", icon: "fa-ticket-alt", route: "/adm-license", key: key++ @@ -552,7 +552,7 @@ function initNavPanel() { // USERS sub.push({ - title: t("UserList"), + title: "UserList", icon: "fa-users", route: "/adm-users", key: key++ @@ -562,7 +562,7 @@ function initNavPanel() { //TRANSLATION sub.push({ - title: t("TranslationList"), + title: "TranslationList", icon: "fa-language", route: "/adm-translations", key: key++ @@ -570,7 +570,7 @@ function initNavPanel() { //REPORT TEMPLATES sub.push({ - title: t("ReportList"), + title: "ReportList", icon: "fa-th-list", route: "/adm-report-templates", key: key++ @@ -578,7 +578,7 @@ function initNavPanel() { //FILES IN DATABASE sub.push({ - title: t("Attachments"), + title: "Attachments", icon: "fa-folder", route: "/adm-attachments", key: key++ @@ -586,7 +586,7 @@ function initNavPanel() { //EVENT LOG / HISTORY sub.push({ - title: t("History"), + title: "History", icon: "fa-history", route: "/adm-history", key: key++ @@ -594,7 +594,7 @@ function initNavPanel() { //KPI / METRICS / CHARTS AND STUFF sub.push({ - title: t("Statistics"), + title: "Statistics", icon: "fa-chart-line", route: "/adm-statistics", key: key++ @@ -602,7 +602,7 @@ function initNavPanel() { // ** ADMINISTRATION (TOP) addNavItem( - t("Administration"), + "Administration", "fa-user-tie", undefined, sub, @@ -618,7 +618,7 @@ function initNavPanel() { // ARCHIVE sub.push({ - title: t("Backup"), + title: "Backup", icon: "fa-file-archive", route: "/ops-backup", key: key++ @@ -632,7 +632,7 @@ function initNavPanel() { // SERVER STATE sub.push({ - title: t("ServerState"), + title: "ServerState", icon: "fa-door-open", route: "/ops-server-state", key: key++ @@ -640,7 +640,7 @@ function initNavPanel() { // JOBS sub.push({ - title: t("ServerJobs"), + title: "ServerJobs", icon: "fa-robot", route: "/ops-jobs", key: key++ @@ -648,7 +648,7 @@ function initNavPanel() { // LOGS sub.push({ - title: t("ServerLog"), + title: "ServerLog", icon: "fa-history", route: "/ops-log", key: key++ @@ -656,7 +656,7 @@ function initNavPanel() { //METRICS sub.push({ - title: t("ServerMetrics"), + title: "ServerMetrics", icon: "fa-file-medical-alt", route: "/ops-metrics", key: key++ @@ -664,7 +664,7 @@ function initNavPanel() { //PROFILE sub.push({ - title: t("ServerProfiler"), + title: "ServerProfiler", icon: "fa-binoculars", route: "/ops-profile", key: key++ @@ -672,21 +672,14 @@ function initNavPanel() { //NOTIFICATION CONFIG AND HISTORY sub.push({ - title: t("NotificationSettings"), + title: "NotificationSettings", icon: "fa-bullhorn", route: "/ops-notification-settings", key: key++ }); // ** OPERATIONS (TOP) - addNavItem( - t("Operations"), - "fa-server", - undefined, - sub, - key++, - "operations" - ); + addNavItem("Operations", "fa-server", undefined, sub, key++, "operations"); } //**** WIDGETS (TOP GROUP) @@ -698,7 +691,7 @@ function initNavPanel() { role.InventoryLimited ]) ) { - addNavItem(t("WidgetList"), "fa-vial", "/widgets", [], key++, "widgets"); + addNavItem("WidgetList", "fa-vial", "/widgets", [], key++, "widgets"); } //****************** CUSTOMER USER / HEAD OFFICE USER UI @@ -716,7 +709,7 @@ function initNavPanel() { //CSR LIST subitem sub.push({ - title: t("CustomerServiceRequestList"), + title: "CustomerServiceRequestList", icon: "fa-child", route: "/customer-csr-list", key: key++ @@ -724,7 +717,7 @@ function initNavPanel() { //WORKORDERS subitem sub.push({ - title: t("WorkOrderList"), + title: "WorkOrderList", icon: "fa-tools", route: "/customer-workorders", key: key++ @@ -732,13 +725,13 @@ function initNavPanel() { //** CUSTOMER LOGIN HOME (TOP) - addNavItem(t("Home"), "fa-home", undefined, sub, key++, "homecustomer"); + addNavItem("Home", "fa-home", undefined, sub, key++, "homecustomer"); } //*** EVALUATION active trial license should always go to evaluation as home page if (licenseState == 1) { addNavItem( - t("Evaluate"), + "Evaluate", "fa-rocket", "/ay-evaluate", [], @@ -750,7 +743,7 @@ function initNavPanel() { } //*** LOGOUT - all users - addNavItem(t("Logout"), "fa-sign-out-alt", "/login", [], key++, "logout"); + addNavItem("Logout", "fa-sign-out-alt", "/login", [], key++, "logout"); } async function getUserOptions() { diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index adfaddda..36484569 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -382,7 +382,7 @@ function generateMenu(vm) { let menuOptions = { isMain: true, icon: "fa-user-cog", - title: vm.$ay.t("UserSettings"), + title: "UserSettings", helpUrl: "form-home-user-settings", formData: { ayaType: window.$gz.type.UserOptions @@ -392,7 +392,7 @@ function generateMenu(vm) { if (vm.rights.change) { menuOptions.menuItems.push({ - title: vm.$ay.t("Save"), + title: "Save", icon: "fa-save", surface: true, key: FORM_KEY + ":save", @@ -402,7 +402,7 @@ function generateMenu(vm) { //change password and login menuOptions.menuItems.push({ - title: vm.$ay.t("SetLoginPassword"), + title: "SetLoginPassword", icon: "fa-key", data: "home-password", key: "app:nav"