From 510cba54569c62c149c53c5c739d4ea2afbc3a50 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 20 Nov 2020 23:18:46 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 10 +++------- ayanova/src/views/adm-translation.vue | 3 +++ ayanova/src/views/adm-user.vue | 3 +++ ayanova/src/views/ay-customize.vue | 4 ++-- ayanova/src/views/ay-report-edit.vue | 3 +++ ayanova/src/views/cust-user.vue | 4 ++-- ayanova/src/views/home-notify-subscription.vue | 2 +- ayanova/src/views/home-user-settings.vue | 4 ++-- ayanova/src/views/widget.vue | 2 ++ ayanova/tests/e2e/specs/smoke.js | 6 +++++- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 4c111335..dcc2bdeb 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -63,15 +63,11 @@ todo: input type email url phone number etc supported on device to activate? CURRENTLY WORKING ON: Customer OUTSTANDING - Show all - workorders - quotes - pm's - docs - import smoke test bizrules - customer notes + customer notes + docs + import todo: TESTING After customer form is made Test with devices diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue index 0c34d464..d4ddfcfb 100644 --- a/ayanova/src/views/adm-translation.vue +++ b/ayanova/src/views/adm-translation.vue @@ -634,6 +634,7 @@ function generateMenu(vm) { vm: vm }); } + menuOptions.menuItems.push({ divider: true, inset: false }); if (vm.rights.change && vm.obj.stock != true) { menuOptions.menuItems.push({ @@ -660,6 +661,8 @@ function generateMenu(vm) { }); } + menuOptions.menuItems.push({ divider: true, inset: false }); + window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue index e089eb93..497b4f02 100644 --- a/ayanova/src/views/adm-user.vue +++ b/ayanova/src/views/adm-user.vue @@ -1026,6 +1026,7 @@ function generateMenu(vm) { vm: vm }); } + menuOptions.menuItems.push({ divider: true, inset: false }); if (vm.$route.params.recordid != 0) { menuOptions.menuItems.push({ title: "DirectNotification", @@ -1044,6 +1045,8 @@ function generateMenu(vm) { } } + menuOptions.menuItems.push({ divider: true, inset: false }); + window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue index a43a5d6a..8c63d2a2 100644 --- a/ayanova/src/views/ay-customize.vue +++ b/ayanova/src/views/ay-customize.vue @@ -295,7 +295,7 @@ function generateMenu(vm) { vm: vm }); } - + menuOptions.menuItems.push({ divider: true, inset: false }); //Extra link to it here so people can stumble their way onto it //plus it's related to this form and people think Customize for the whole shebang menuOptions.menuItems.push({ @@ -304,7 +304,7 @@ function generateMenu(vm) { data: "adm-translations", key: "app:nav" }); - + menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index 372a5fb1..6d41c6ae 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -1103,6 +1103,8 @@ function generateMenu(vm) { }); } + menuOptions.menuItems.push({ divider: true, inset: false }); + //EXPORT if (vm.$route.params.recordid != 0) { let href = window.$gz.api.genericDownloadUrl( @@ -1118,6 +1120,7 @@ function generateMenu(vm) { vm: vm }); } + menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue index 60686bf8..7e090e7f 100644 --- a/ayanova/src/views/cust-user.vue +++ b/ayanova/src/views/cust-user.vue @@ -1029,7 +1029,7 @@ function generateMenu(vm) { vm: vm }); } - + menuOptions.menuItems.push({ divider: true, inset: false }); if (vm.$route.params.recordid != 0) { menuOptions.menuItems.push({ title: "DirectNotification", @@ -1047,7 +1047,7 @@ function generateMenu(vm) { }); } } - + menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue index db3dea4d..f2189436 100644 --- a/ayanova/src/views/home-notify-subscription.vue +++ b/ayanova/src/views/home-notify-subscription.vue @@ -702,7 +702,7 @@ function generateMenu(vm) { vm: vm }); } - + menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index ad5bd109..5b4b8cfb 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -476,7 +476,7 @@ function generateMenu(vm) { vm: vm }); } - + menuOptions.menuItems.push({ divider: true, inset: false }); menuOptions.menuItems.push({ title: "DarkMode", icon: vm.darkMode ? "$ayiSun" : "$ayiMoon", @@ -492,7 +492,7 @@ function generateMenu(vm) { data: "home-password", key: "app:nav" }); - + menuOptions.menuItems.push({ divider: true, inset: false }); window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index 7ea5e41b..21350eb4 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -733,6 +733,8 @@ function generateMenu(vm) { }); } + menuOptions.menuItems.push({ divider: true, inset: false }); + window.$gz.eventBus.$emit("menu-change", menuOptions); } diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js index 8a905062..96528fc3 100644 --- a/ayanova/tests/e2e/specs/smoke.js +++ b/ayanova/tests/e2e/specs/smoke.js @@ -61,7 +61,11 @@ describe("SMOKE", () => { cy.visit("/cust-customers"); cy.url().should("include", "/cust-customers"); - cy.get("[data-cy=underconstruction]"); + cy.get("[data-cy=customersTable]"); + + cy.visit("/cust-customers/1"); + cy.url().should("include", "/cust-customers/1"); + cy.get("[data-cy=name]"); cy.visit("/cust-headoffices"); cy.url().should("include", "/cust-headoffices");