admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename all variants of naming that hold an AyaType value to "aType" (parameter) / "AType" (not parameter) everywhere front and back; "ayType", "objectType", "oType" all are used in various areas

Browse Source
This commit is contained in:
John Cardinal
2021-03-23 17:06:05 +00:00
parent f1777818bd
commit 01655061f3
69 changed files with 196 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/devdocs/rando-todo.txt
View File

@@ -50,7 +50,7 @@ possible implementation:
{ {
TKey = "WidgetName", TKey = "WidgetName",
FieldKey = "widgetname", FieldKey = "widgetname",
AyaObjectType = (int)AyaType.Widget, AType = (int)AyaType.Widget,
UiFieldDataType = (int)UiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "awidget.id", SqlIdColumnName = "awidget.id",
SqlValueColumnName = "awidget.name", SqlValueColumnName = "awidget.name",

9
ayanova/devdocs/todo.txt
View File

@@ -58,16 +58,13 @@ todo: v8 migrate additions
## CLIENT MISC ITEMS ## CLIENT MISC ITEMS
todo: select list templates under global is offering types that don't6 have select lists like memo etc
todo: adm-translations, adm-report templates data tables are skewed to the left due to lack of selection box column making filter icon partially gone off page
if has extension then should have selection box otherwise figure out what the dealio is
................................................................................................................................................................... ...................................................................................................................................................................
todo: rename all variants of naming that hold an AyaType value to "aType" (parameter) / "AType" (not parameter) everywhere front and back
"ayType", "objectType", "oType" all are used in various areas
Search for all references to AyaType and then work back from there
SQL Criteria as well
todo: reportClientMetaData in gzapi has DefaultLocale property in it which is just part of the language, can it be removed? todo: reportClientMetaData in gzapi has DefaultLocale property in it which is just part of the language, can it be removed?
it might be buggy if there is no dash in the language? Is that a thing? it might be buggy if there is no dash in the language? Is that a thing?
check at server how it's used check at server how it's used

18
ayanova/src/api/authorizationroles.js
View File

@@ -96,9 +96,9 @@ export default {
}; };
}, },
///////////////////////////////// /////////////////////////////////
// oType is the name of the object type as defined in ayatype.js // aType is the name of the object type as defined in ayatype.js
// //
getRights(oType) { getRights(aType) {
//from bizroles.cs: //from bizroles.cs:
//HOW THIS WORKS / WHATS EXPECTED //HOW THIS WORKS / WHATS EXPECTED
//Change = CREATE, RETRIEVE, UPDATE, DELETE - Full rights //Change = CREATE, RETRIEVE, UPDATE, DELETE - Full rights
@@ -113,13 +113,13 @@ export default {
//Get the type name from the type enum value //Get the type name from the type enum value
//de-lodash //de-lodash
// let typeName = window.$gz. _.findKey(window.$gz.type, function(o) { // let typeName = window.$gz. _.findKey(window.$gz.type, function(o) {
// return o == oType; // return o == aType;
// }); // });
//my _.findKey replacement: //my _.findKey replacement:
let typeName = undefined; let typeName = undefined;
for (const [key, value] of Object.entries(window.$gz.type)) { for (const [key, value] of Object.entries(window.$gz.type)) {
if (value == oType) { if (value == aType) {
typeName = key; typeName = key;
break; break;
} }
@@ -129,7 +129,7 @@ export default {
let objectRoleRights = this.ROLE_RIGHTS[typeName]; let objectRoleRights = this.ROLE_RIGHTS[typeName];
if (!objectRoleRights) { if (!objectRoleRights) {
throw new Error( throw new Error(
`authorizationroles::getRights type ${oType} not found in roles collection` `authorizationroles::getRights type ${aType} not found in roles collection`
); );
} }
@@ -163,8 +163,8 @@ export default {
// convenience method for forms that deal with multiple object types // convenience method for forms that deal with multiple object types
// (i.e. grids, history etc, initialization of main menu etc) // (i.e. grids, history etc, initialization of main menu etc)
// //
canOpen(oType) { canOpen(aType) {
let r = this.getRights(oType); let r = this.getRights(aType);
//convention is change might be defined but not read so canOpen is true eitehr way //convention is change might be defined but not read so canOpen is true eitehr way
return r.change == true || r.read == true; return r.change == true || r.read == true;
}, },
@@ -172,8 +172,8 @@ export default {
// convenience method for forms that deal with multiple object types // convenience method for forms that deal with multiple object types
// (i.e. grids, history etc, initialization of main menu etc) // (i.e. grids, history etc, initialization of main menu etc)
// //
canChange(oType) { canChange(aType) {
let r = this.getRights(oType); let r = this.getRights(aType);
return r.change == true; return r.change == true;
} }
}; };

6
ayanova/src/api/gzapi.js
View File

@@ -556,7 +556,7 @@ export default {
}, },
/////////////////////////////////// ///////////////////////////////////
// POST FILE ATTACHMENTS // POST FILE ATTACHMENTS
// @param {ayaId:objectid, ayaType:objectType, files:[array of files]} // @param {ayaId:objectid, ayaType:aType, files:[array of files]}
// //
async uploadAttachment(at) { async uploadAttachment(at) {
let that = this; let that = this;
@@ -567,7 +567,7 @@ export default {
data.append(files[i].name, files[i]); data.append(files[i].name, files[i]);
} }
data.append("AttachToObjectType", at.ayaType); data.append("AttachToAType", at.ayaType);
data.append("AttachToObjectId", at.ayaId); data.append("AttachToObjectId", at.ayaId);
data.append("Notes", at.notes); data.append("Notes", at.notes);
data.append("FileData", at.fileData); data.append("FileData", at.fileData);
@@ -606,7 +606,7 @@ export default {
data.append(files[i].name, files[i]); data.append(files[i].name, files[i]);
} }
if (at.ayaType) { if (at.ayaType) {
data.append("ObjectType", at.ayaType); data.append("AType", at.ayaType);
} }
if (at.ayaId) { if (at.ayaId) {
data.append("ObjectId", at.ayaId); data.append("ObjectId", at.ayaId);

4
ayanova/src/api/gzmenu.js
View File

@@ -314,12 +314,12 @@ export default {
// break; // break;
case "review": case "review":
//go to list //go to list
// path: "/home-reviews/:objectType?/:objectId?", // path: "/home-reviews/:aType?/:objectId?",
vm.$router.push({ vm.$router.push({
name: "home-reviews", name: "home-reviews",
params: { params: {
objectType: window.$gz.util.stringToIntOrNull(item.data.ayaType), aType: window.$gz.util.stringToIntOrNull(item.data.ayaType),
objectId: window.$gz.util.stringToIntOrNull(item.data.recordId), objectId: window.$gz.util.stringToIntOrNull(item.data.recordId),
name: item.data.recordName name: item.data.recordName
} }

2
ayanova/src/components/data-table.vue
View File

@@ -695,7 +695,7 @@ export default {
selectedRowIds.reverse(); selectedRowIds.reverse();
} }
return { return {
ObjectType: ayaType, AType: ayaType,
selectedRowIds: selectedRowIds, selectedRowIds: selectedRowIds,
dataListKey: vm.dataListKey, dataListKey: vm.dataListKey,
filterId: vm.activeFilterId, filterId: vm.activeFilterId,

6
ayanova/src/components/extension-delete-control.vue
View File

@@ -29,10 +29,10 @@ export default {
await fetchTranslatedText(vm); await fetchTranslatedText(vm);
//NOTE: if extension doesn't support a particular object add it here to the NoType default //NOTE: if extension doesn't support a particular object add it here to the NoType default
if ( if (
vm.dataListSelection.ObjectType != 0 && vm.dataListSelection.AType != 0 &&
vm.dataListSelection.ObjectType != window.$gz.type.PartInventoryRestock vm.dataListSelection.AType != window.$gz.type.PartInventoryRestock
) { ) {
vm.rights = window.$gz.role.getRights(vm.dataListSelection.ObjectType); vm.rights = window.$gz.role.getRights(vm.dataListSelection.AType);
} }
vm.available = vm.rights.change; vm.available = vm.rights.change;
}, },

5
ayanova/src/components/extension-export-control.vue
View File

@@ -27,9 +27,8 @@ export default {
methods: { methods: {
available() { available() {
return ( return (
this.dataListSelection.ObjectType != 0 && this.dataListSelection.AType != 0 &&
this.dataListSelection.ObjectType != this.dataListSelection.AType != window.$gz.type.PartInventoryRestock
window.$gz.type.PartInventoryRestock
); );
}, },
goHelp() { goHelp() {

6
ayanova/src/components/extension-tags-control.vue
View File

@@ -46,10 +46,10 @@ export default {
let vm = this; let vm = this;
if ( if (
vm.dataListSelection.ObjectType != 0 && vm.dataListSelection.AType != 0 &&
vm.dataListSelection.ObjectType != window.$gz.type.PartInventoryRestock vm.dataListSelection.AType != window.$gz.type.PartInventoryRestock
) { ) {
vm.rights = window.$gz.role.getRights(vm.dataListSelection.ObjectType); vm.rights = window.$gz.role.getRights(vm.dataListSelection.AType);
} }
vm.available = vm.rights.change; vm.available = vm.rights.change;
}, },

2
ayanova/src/components/extensions-control.vue
View File

@@ -58,7 +58,7 @@ export default {
resolve: null, resolve: null,
reject: null, reject: null,
dataListSelection: { dataListSelection: {
ObjectType: 0, AType: 0,
selectedRowIds: [], selectedRowIds: [],
dataListKey: null dataListKey: null
}, },

8
ayanova/src/components/report-selector-control.vue
View File

@@ -122,16 +122,14 @@ export default {
if (reportDataOptions == null) { if (reportDataOptions == null) {
throw new Error("report-selector:Open missing reportDataOptions"); throw new Error("report-selector:Open missing reportDataOptions");
} }
if (reportDataOptions.ObjectType == null) { if (reportDataOptions.AType == null) {
throw new Error( throw new Error("report-selector:Open - AType is missing or empty");
"report-selector:Open - ObjectType is missing or empty"
);
} }
this.reportDataOptions = reportDataOptions; this.reportDataOptions = reportDataOptions;
//get report list from server //get report list from server
let res = await window.$gz.api.get( let res = await window.$gz.api.get(
`report/list/${reportDataOptions.ObjectType}` `report/list/${reportDataOptions.AType}`
); );
if (res.error) { if (res.error) {
// throw new Error(res.error); // throw new Error(res.error);

7
ayanova/src/main.js
View File

@@ -28,7 +28,7 @@ import gzapi from "./api/gzapi";
import gzform from "./api/gzform"; import gzform from "./api/gzform";
import gzformcustomtemplate from "./api/form-custom-template"; import gzformcustomtemplate from "./api/form-custom-template";
import authorizationroles from "./api/authorizationroles"; import authorizationroles from "./api/authorizationroles";
import gztype from "./api/ayatype"; import ayatype from "./api/ayatype";
import gzenums from "./api/enums"; import gzenums from "./api/enums";
import "@/assets/css/main.css"; import "@/assets/css/main.css";
@@ -82,7 +82,7 @@ window.$gz = {
translation: translation, translation: translation,
locale: locale, locale: locale,
formCustomTemplate: gzformcustomtemplate, formCustomTemplate: gzformcustomtemplate,
type: gztype, type: ayatype,
role: authorizationroles, role: authorizationroles,
enums: gzenums, enums: gzenums,
eventBus: gzeventbus, eventBus: gzeventbus,
@@ -252,6 +252,9 @@ Vue.prototype.$ay = {
}, },
util: function() { util: function() {
return gzutil; return gzutil;
},
ayt: function() {
return ayatype;
} }
}; };
//disable the devtools nag //disable the devtools nag

8
ayanova/src/router.js
View File

@@ -175,13 +175,13 @@ export default new Router({
import(/* webpackChunkName: "ay-common" */ "./views/home-reminder.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-reminder.vue")
}, },
{ {
path: "/home-reviews/:objectType?/:objectId?", path: "/home-reviews/:aType?/:objectId?",
name: "home-reviews", name: "home-reviews",
component: () => component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/home-reviews.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-reviews.vue")
}, },
{ {
path: "/home-reviews/:recordid/:objectType?/:objectId?", path: "/home-reviews/:recordid/:aType?/:objectId?",
name: "review-edit", name: "review-edit",
component: () => component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/home-review.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-review.vue")
@@ -544,13 +544,13 @@ export default new Router({
import(/* webpackChunkName: "acc" */ "./views/acc-tax-code.vue") import(/* webpackChunkName: "acc" */ "./views/acc-tax-code.vue")
}, },
{ {
path: "/acc-service-banks/:objectType?/:objectId?", path: "/acc-service-banks/:aType?/:objectId?",
name: "service-banks", name: "service-banks",
component: () => component: () =>
import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue") import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue")
}, },
{ {
path: "/acc-service-banks/:recordid/:objectType?/:objectId?", path: "/acc-service-banks/:recordid/:aType?/:objectId?",
name: "service-bank-edit", name: "service-bank-edit",
component: () => component: () =>
import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue") import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue")

24
ayanova/src/views/acc-service-bank.vue
View File

@@ -4,7 +4,7 @@
<div v-if="formState.ready"> <div v-if="formState.ready">
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error> <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<v-form ref="form"> <v-form ref="form">
<div class="mb-6" v-if="obj.objectType"> <div class="mb-6" v-if="obj.aType">
<v-icon large @click="navToTarget()">{{ iconForType }}</v-icon <v-icon large @click="navToTarget()">{{ iconForType }}</v-icon
><span class="text-h5" @click="navToTarget()"> {{ name }}</span> ><span class="text-h5" @click="navToTarget()"> {{ name }}</span>
</div> </div>
@@ -131,16 +131,16 @@ export default {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
} else { } else {
//New record so there has to be a object type and objectId in route //New record so there has to be a object type and objectId in route
// path: "/home-service-banks/:recordid/:objectType?/:objectId?", // path: "/home-service-banks/:recordid/:aType?/:objectId?",
vm.obj.objectId = window.$gz.util.stringToIntOrNull( vm.obj.objectId = window.$gz.util.stringToIntOrNull(
vm.$route.params.objectId vm.$route.params.objectId
); );
vm.obj.objectType = window.$gz.util.stringToIntOrNull( vm.obj.aType = window.$gz.util.stringToIntOrNull(
vm.$route.params.objectType vm.$route.params.aType
); );
if (!vm.obj.objectId || !vm.obj.objectType) { if (!vm.obj.objectId || !vm.obj.aType) {
throw "ObjectType and ObjectId are required to create a service bank entry"; throw "AType and ObjectId are required to create a service bank entry";
} }
vm.name = vm.$route.params.name; vm.name = vm.$route.params.name;
@@ -152,7 +152,7 @@ export default {
if (!vm.name) { if (!vm.name) {
vm.name = await window.$gz.api.fetchBizObjectName( vm.name = await window.$gz.api.fetchBizObjectName(
vm.obj.objectType, vm.obj.aType,
vm.obj.objectId vm.obj.objectId
); );
} }
@@ -192,7 +192,7 @@ export default {
//I.E. Serial, usertype fields, ACTIVE //I.E. Serial, usertype fields, ACTIVE
//Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
/* /*
{"data":{"id":1,"concurrency":1387706,"name":"Prepaid for $500 labor","entryDate":"2005-11-27T19:04:00Z","lastEntryDate":null,"objectId":1,"objectType":8, {"data":{"id":1,"concurrency":1387706,"name":"Prepaid for $500 labor","entryDate":"2005-11-27T19:04:00Z","lastEntryDate":null,"objectId":1,"aType":8,
"sourceId":0,"sourceType":55,"incidents":0.0000,"incidentsBalance":0.0000,"lastIncidentsBalance":null, "sourceId":0,"sourceType":55,"incidents":0.0000,"incidentsBalance":0.0000,"lastIncidentsBalance":null,
"currency":500.0000,"currencyBalance":500.0000,"lastCurrencyBalance":null, "currency":500.0000,"currencyBalance":500.0000,"lastCurrencyBalance":null,
"hours":0.0000,"hoursBalance":0.0000,"lastHoursBalance":null}} "hours":0.0000,"hoursBalance":0.0000,"lastHoursBalance":null}}
@@ -203,7 +203,7 @@ export default {
concurrency: 0, concurrency: 0,
name: null, name: null,
objectId: null, objectId: null,
objectType: null, aType: null,
sourceId: 0, //default for manual entries sourceId: 0, //default for manual entries
sourceType: window.$gz.type.ServiceBank, sourceType: window.$gz.type.ServiceBank,
incidents: 0, incidents: 0,
@@ -260,13 +260,13 @@ export default {
}, },
computed: { computed: {
iconForType() { iconForType() {
return window.$gz.util.iconForType(this.obj.objectType); return window.$gz.util.iconForType(this.obj.aType);
} }
}, },
methods: { methods: {
navToTarget: function() { navToTarget: function() {
window.$gz.eventBus.$emit("openobject", { window.$gz.eventBus.$emit("openobject", {
type: this.obj.objectType, type: this.obj.aType,
id: this.obj.objectId id: this.obj.objectId
}); });
}, },
@@ -394,7 +394,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.ServiceBank, AType: window.$gz.type.ServiceBank,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

25
ayanova/src/views/acc-service-banks.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<!-- <div v-if="objectType && objectId" class="mb-6"> <!-- <div v-if="aType && objectId" class="mb-6">
<v-icon data-cy="clickThru" @click="navToTarget()" large>{{ <v-icon data-cy="clickThru" @click="navToTarget()" large>{{
iconForType() iconForType()
}}</v-icon }}</v-icon
@@ -8,7 +8,7 @@
</div> --> </div> -->
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="$ay.ayt.ServiceBank"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -39,19 +39,17 @@ export default {
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId); vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId);
vm.objectType = window.$gz.util.stringToIntOrNull( vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType);
vm.$route.params.objectType
);
//OPTIONAL FILTER //OPTIONAL FILTER
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.aType) {
//OBJECTID,AYATYPE //OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`; vm.clientCriteria = `${vm.objectId},${vm.aType}`;
vm.preFilterMode = { vm.preFilterMode = {
icon: vm.$route.params.icon, icon: vm.$route.params.icon,
id: vm.objectId, id: vm.objectId,
ayatype: vm.objectType, ayatype: vm.aType,
viz: vm.$route.params.viz, viz: vm.$route.params.viz,
clearable: true clearable: true
}; };
@@ -65,13 +63,12 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.ServiceBank,
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null, preFilterMode: null,
objectId: null, objectId: null,
objectType: null, aType: null,
name: null name: null
}; };
}, },
@@ -79,7 +76,7 @@ export default {
methods: { methods: {
// navToTarget: function() { // navToTarget: function() {
// window.$gz.eventBus.$emit("openobject", { // window.$gz.eventBus.$emit("openobject", {
// type: this.objectType, // type: this.aType,
// id: this.objectId // id: this.objectId
// }); // });
// }, // },
@@ -87,7 +84,7 @@ export default {
this.selectedItems = selected; this.selectedItems = selected;
}, },
// iconForType() { // iconForType() {
// return window.$gz.util.iconForType(this.objectType, 10); // return window.$gz.util.iconForType(this.aType, 10);
// }, // },
clearPreFilter() { clearPreFilter() {
this.clientCriteria = null; this.clientCriteria = null;
@@ -112,7 +109,7 @@ async function clickHandler(menuItem) {
name: "service-bank-edit", name: "service-bank-edit",
params: { params: {
recordid: 0, recordid: 0,
objectType: m.vm.objectType, aType: m.vm.aType,
objectId: m.vm.objectId, objectId: m.vm.objectId,
name: m.vm.name name: m.vm.name
} }
@@ -185,7 +182,7 @@ function generateMenu(vm) {
}; };
if (vm.rights.change) { if (vm.rights.change) {
if (vm.objectId && vm.objectType) { if (vm.objectId && vm.aType) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "New", title: "New",
icon: "$ayiPlus", icon: "$ayiPlus",

2
ayanova/src/views/acc-service-rate.vue
View File

@@ -579,7 +579,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.ServiceRate, AType: window.$gz.type.ServiceRate,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/acc-service-rates.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.ServiceRate, aType: window.$gz.type.ServiceRate,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/acc-tax-code.vue
View File

@@ -536,7 +536,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.TaxCode, AType: window.$gz.type.TaxCode,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/acc-tax-codes.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.TaxCode, aType: window.$gz.type.TaxCode,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/acc-travel-rate.vue
View File

@@ -577,7 +577,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.TravelRate, AType: window.$gz.type.TravelRate,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/acc-travel-rates.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.TravelRate, aType: window.$gz.type.TravelRate,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/adm-attachments.vue
View File

@@ -132,7 +132,7 @@ export default {
); );
} }
}, },
async moveSelected(ayType, ayId) { async moveSelected(aType, ayId) {
let vm = this; let vm = this;
try { try {
//called from move dialog, already selected //called from move dialog, already selected

2
ayanova/src/views/adm-user.vue
View File

@@ -938,7 +938,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.User, AType: window.$gz.type.User,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/adm-users.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, aType: window.$gz.type.User,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

23
ayanova/src/views/ay-history.vue
View File

@@ -25,21 +25,18 @@
> >
<v-card-text <v-card-text
><v-icon large class="mr-2">{{ ><v-icon large class="mr-2">{{
getIconForObjectType(i.objectType) getIconForAType(i.aType)
}}</v-icon }}</v-icon
>{{ getNameForType(i.objectType) }} >{{ getNameForType(i.aType) }}
<div class="mt-4" v-if="i.textra">{{ i.textra }}</div> <div class="mt-4" v-if="i.textra">{{ i.textra }}</div>
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-btn text @click="openHistoryOfItem(i)">{{ <v-btn text @click="openHistoryOfItem(i)">{{
$ay.t("History") $ay.t("History")
}}</v-btn> }}</v-btn>
<v-btn <v-btn v-if="canOpen(i.aType)" text @click="openItem(i)">{{
v-if="canOpen(i.objectType)" $ay.t("Open")
text }}</v-btn>
@click="openItem(i)"
>{{ $ay.t("Open") }}</v-btn
>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
</v-timeline-item> </v-timeline-item>
@@ -62,9 +59,9 @@
> >
<v-card-text <v-card-text
><v-icon large class="mr-2">{{ ><v-icon large class="mr-2">{{
getIconForObjectType(i.objectType) getIconForAType(i.aType)
}}</v-icon }}</v-icon
>{{ getNameForType(i.objectType) }} >{{ getNameForType(i.aType) }}
<div class="mt-4" v-if="i.textra">{{ i.textra }}</div> <div class="mt-4" v-if="i.textra">{{ i.textra }}</div>
</v-card-text> </v-card-text>
@@ -156,7 +153,7 @@ export default {
}); });
} else { } else {
window.$gz.eventBus.$emit("openobject", { window.$gz.eventBus.$emit("openobject", {
type: item.objectType, type: item.aType,
id: item.objectId id: item.objectId
}); });
} }
@@ -172,7 +169,7 @@ export default {
} else { } else {
this.$router.push({ this.$router.push({
name: "ay-history", name: "ay-history",
params: { ayatype: item.objectType, recordid: item.objectId } params: { ayatype: item.aType, recordid: item.objectId }
}); });
} }
}, },
@@ -216,7 +213,7 @@ export default {
getIconForEvent(event) { getIconForEvent(event) {
return this.eventTypes[event].icon; return this.eventTypes[event].icon;
}, },
getIconForObjectType(otype) { getIconForAType(otype) {
if (otype) { if (otype) {
//return this.ayaTypes[otype].icon; //return this.ayaTypes[otype].icon;
return window.$gz.util.iconForType(otype); return window.$gz.util.iconForType(otype);

12
ayanova/src/views/ay-report-edit.vue
View File

@@ -316,7 +316,7 @@ export default {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
} }
} else { } else {
//New record so there *MUST* be an ayType on the route params //New record so there *MUST* be an aType on the route params
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
@@ -454,7 +454,7 @@ export default {
active: true, active: true,
notes: "", notes: "",
roles: 124927, //all except customers roles: 124927, //all except customers
objectType: 0, aType: 0,
template: `<html> template: `<html>
<body> <body>
@@ -527,7 +527,7 @@ Handlebars.registerHelper('loud', function (aString) {
}; };
}, },
/*{"data":{"id":10,"concurrency":19494847,"name":"test basic","active":true,"notes":"", /*{"data":{"id":10,"concurrency":19494847,"name":"test basic","active":true,"notes":"",
"roles":124927,"objectType":2, "roles":124927,"aType":2,
"template":"<html>\n\n<body>\n\t{{#each ayReportData}}\n\t<h2>{{ Name }}</h2>\n\t<div>Notes: <span class='example'>{{ Notes }}</span></div>\n\t{{/each}}\n</body>\n\n</html>","style":".example {\n color: blue;\n}","jsPrerender":"async function ayPrepareData(reportData){ \n //this function (if present) is called with the report data \n //before the report is rendered\n //modify data as required here and return it to change the data before the report renders\n //see the help documentation for details\n return reportData;\n}","jsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n return aString.toUpperCase()\n})", "template":"<html>\n\n<body>\n\t{{#each ayReportData}}\n\t<h2>{{ Name }}</h2>\n\t<div>Notes: <span class='example'>{{ Notes }}</span></div>\n\t{{/each}}\n</body>\n\n</html>","style":".example {\n color: blue;\n}","jsPrerender":"async function ayPrepareData(reportData){ \n //this function (if present) is called with the report data \n //before the report is rendered\n //modify data as required here and return it to change the data before the report renders\n //see the help documentation for details\n return reportData;\n}","jsHelpers":"//Register custom Handlebars helpers here to use in your report script\n//https://handlebarsjs.com/guide/#custom-helpers\nHandlebars.registerHelper('loud', function (aString) {\n return aString.toUpperCase()\n})",
"renderType":0, "renderType":0,
"headerTemplate":null,"footerTemplate":null,"displayHeaderFooter":false, "headerTemplate":null,"footerTemplate":null,"displayHeaderFooter":false,
@@ -1113,12 +1113,12 @@ async function fetchReportData(vm) {
vm.reportData = null; vm.reportData = null;
return; return;
} }
if (reportDataOptions.ObjectType == null) { if (reportDataOptions.AType == null) {
throw new Error( throw new Error(
"ay-report-edit:fetchReportData - route parameter ObjectType is missing or empty, unable to init report designer" "ay-report-edit:fetchReportData - route parameter AType is missing or empty, unable to init report designer"
); );
} }
vm.obj.objectType = reportDataOptions.ObjectType; vm.obj.aType = reportDataOptions.AType;
let res = await window.$gz.api.upsert("report/data", reportDataOptions); let res = await window.$gz.api.upsert("report/data", reportDataOptions);
//We never expect there to be no data here //We never expect there to be no data here

2
ayanova/src/views/cust-customer-note.vue
View File

@@ -400,7 +400,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.CustomerNote, AType: window.$gz.type.CustomerNote,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/cust-customer-notes.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -55,7 +55,7 @@ export default {
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null, preFilterMode: null,
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.CustomerNote, aType: window.$gz.type.CustomerNote,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

4
ayanova/src/views/cust-customer.vue
View File

@@ -924,7 +924,7 @@ export default {
this.$router.push({ this.$router.push({
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.Customer, aType: window.$gz.type.Customer,
objectId: this.$route.params.recordid, objectId: this.$route.params.recordid,
viz: this.obj.name, viz: this.obj.name,
icon: "$ayiAddressCard" icon: "$ayiAddressCard"
@@ -1370,7 +1370,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Customer, AType: window.$gz.type.Customer,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/cust-customers.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -35,7 +35,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Customer, aType: window.$gz.type.Customer,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

4
ayanova/src/views/cust-head-office.vue
View File

@@ -828,7 +828,7 @@ export default {
this.$router.push({ this.$router.push({
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.HeadOffice, aType: window.$gz.type.HeadOffice,
objectId: this.$route.params.recordid, objectId: this.$route.params.recordid,
viz: this.obj.name, viz: this.obj.name,
icon: "$ayiSitemap" icon: "$ayiSitemap"
@@ -1274,7 +1274,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.HeadOffice, AType: window.$gz.type.HeadOffice,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/cust-head-offices.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.HeadOffice, aType: window.$gz.type.HeadOffice,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/cust-user.vue
View File

@@ -948,7 +948,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.User, AType: window.$gz.type.User,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/cust-users.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, aType: window.$gz.type.User,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/home-memo.vue
View File

@@ -567,7 +567,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Memo, AType: window.$gz.type.Memo,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/home-memos.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Memo, aType: window.$gz.type.Memo,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/home-reminder.vue
View File

@@ -523,7 +523,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Reminder, AType: window.$gz.type.Reminder,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/home-reminders.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Reminder, aType: window.$gz.type.Reminder,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

26
ayanova/src/views/home-review.vue
View File

@@ -4,7 +4,7 @@
<div v-if="formState.ready"> <div v-if="formState.ready">
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error> <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<v-form ref="form"> <v-form ref="form">
<div class="mb-6" v-if="obj.objectType"> <div class="mb-6" v-if="obj.aType">
<v-icon large @click="navToTarget()">{{ iconForType }}</v-icon <v-icon large @click="navToTarget()">{{ iconForType }}</v-icon
><span class="text-h5" @click="navToTarget()"> {{ name }}</span> ><span class="text-h5" @click="navToTarget()"> {{ name }}</span>
</div> </div>
@@ -207,16 +207,16 @@ export default {
} }
} else { } else {
//New record so there has to be a object type and objectId in route //New record so there has to be a object type and objectId in route
// path: "/home-reviews/:recordid/:objectType?/:objectId?", // path: "/home-reviews/:recordid/:aType?/:objectId?",
vm.obj.objectId = window.$gz.util.stringToIntOrNull( vm.obj.objectId = window.$gz.util.stringToIntOrNull(
vm.$route.params.objectId vm.$route.params.objectId
); );
vm.obj.objectType = window.$gz.util.stringToIntOrNull( vm.obj.aType = window.$gz.util.stringToIntOrNull(
vm.$route.params.objectType vm.$route.params.aType
); );
if (!vm.obj.objectId || !vm.obj.objectType) { if (!vm.obj.objectId || !vm.obj.aType) {
throw "ObjectType and ObjectId are required to create a review"; throw "AType and ObjectId are required to create a review";
} }
vm.name = vm.$route.params.name; vm.name = vm.$route.params.name;
@@ -228,7 +228,7 @@ export default {
if (!vm.name) { if (!vm.name) {
vm.name = await window.$gz.api.fetchBizObjectName( vm.name = await window.$gz.api.fetchBizObjectName(
vm.obj.objectType, vm.obj.aType,
vm.obj.objectId vm.obj.objectId
); );
} }
@@ -268,7 +268,7 @@ export default {
//I.E. Serial, usertype fields, ACTIVE //I.E. Serial, usertype fields, ACTIVE
//Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
//{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v7-import"], //{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v7-import"],
//"dueDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"objectType":31,"overDue":false}} //"dueDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"aType":31,"overDue":false}}
{ {
id: 0, id: 0,
concurrency: 0, concurrency: 0,
@@ -284,7 +284,7 @@ export default {
userId: window.$gz.store.state.userId, userId: window.$gz.store.state.userId,
assignedByUserId: window.$gz.store.state.userId, assignedByUserId: window.$gz.store.state.userId,
objectId: null, objectId: null,
objectType: null, aType: null,
overDue: false overDue: false
}, },
formState: { formState: {
@@ -349,7 +349,7 @@ export default {
}, },
iconForType() { iconForType() {
return window.$gz.util.iconForType(this.obj.objectType); return window.$gz.util.iconForType(this.obj.aType);
}, },
hasSupervisorRole: function() { hasSupervisorRole: function() {
//mirrored from ReviewBiz.cs validation rule at server //mirrored from ReviewBiz.cs validation rule at server
@@ -372,7 +372,7 @@ export default {
methods: { methods: {
navToTarget: function() { navToTarget: function() {
window.$gz.eventBus.$emit("openobject", { window.$gz.eventBus.$emit("openobject", {
type: this.obj.objectType, type: this.obj.aType,
id: this.obj.objectId id: this.obj.objectId
}); });
}, },
@@ -603,7 +603,7 @@ async function clickHandler(menuItem) {
name: "review-edit", name: "review-edit",
params: { params: {
recordid: 0, recordid: 0,
objectType: m.vm.obj.objectType, aType: m.vm.obj.aType,
objectId: m.vm.obj.objectId, objectId: m.vm.obj.objectId,
name: m.vm.name name: m.vm.name
} }
@@ -624,7 +624,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Review, AType: window.$gz.type.Review,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

27
ayanova/src/views/home-reviews.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="$ay.ayt.Review"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -32,19 +32,17 @@ export default {
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId); vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId);
vm.objectType = window.$gz.util.stringToIntOrNull( vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType);
vm.$route.params.objectType
);
//OPTIONAL FILTER //OPTIONAL FILTER
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.aType) {
//OBJECTID,AYATYPE //OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`; vm.clientCriteria = `${vm.objectId},${vm.aType}`;
vm.preFilterMode = { vm.preFilterMode = {
icon: window.$gz.util.iconForType(vm.objectType), icon: window.$gz.util.iconForType(vm.aType),
id: vm.objectId, id: vm.objectId,
ayatype: vm.objectType, ayatype: vm.aType,
viz: vm.$route.params.name, viz: vm.$route.params.name,
clearable: true clearable: true
}; };
@@ -58,25 +56,24 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Review,
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null, preFilterMode: null,
objectId: null, objectId: null,
objectType: null, aType: null,
name: null name: null
}; };
}, },
// computed: { // computed: {
// iconForType() { // iconForType() {
// return window.$gz.util.iconForType(this.objectType); // return window.$gz.util.iconForType(this.aType);
// } // }
// }, // },
methods: { methods: {
// navToTarget: function() { // navToTarget: function() {
// window.$gz.eventBus.$emit("openobject", { // window.$gz.eventBus.$emit("openobject", {
// type: this.objectType, // type: this.aType,
// id: this.objectId // id: this.objectId
// }); // });
// }, // },
@@ -89,7 +86,7 @@ export default {
this.reload = !this.reload; this.reload = !this.reload;
} }
// iconForType() { // iconForType() {
// return window.$gz.util.iconForType(this.objectType, 10); // return window.$gz.util.iconForType(this.aType, 10);
// } // }
} }
}; };
@@ -109,7 +106,7 @@ async function clickHandler(menuItem) {
name: "review-edit", name: "review-edit",
params: { params: {
recordid: 0, recordid: 0,
objectType: m.vm.objectType, aType: m.vm.aType,
objectId: m.vm.objectId, objectId: m.vm.objectId,
name: m.vm.name name: m.vm.name
} }
@@ -178,7 +175,7 @@ function generateMenu(vm) {
}; };
if (vm.rights.change) { if (vm.rights.change) {
if (vm.objectId && vm.objectType) { if (vm.objectId && vm.aType) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "New", title: "New",
icon: "$ayiPlus", icon: "$ayiPlus",

17
ayanova/src/views/home-search.vue
View File

@@ -17,7 +17,7 @@
</v-col> </v-col>
<v-col cols="12" sm="4" lg="4" xl="3"> <v-col cols="12" sm="4" lg="4" xl="3">
<v-select <v-select
v-model="searchObjectType" v-model="searchAType"
:items="selectLists.objectTypes" :items="selectLists.objectTypes"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -94,7 +94,7 @@ export default {
//save last search in session cache //save last search in session cache
window.$gz.form.setFormSettings(FORM_KEY, { window.$gz.form.setFormSettings(FORM_KEY, {
temp: { temp: {
ayaType: vm.searchObjectType, ayaType: vm.searchAType,
phrase: vm.searchPhrase, phrase: vm.searchPhrase,
items: vm.items, items: vm.items,
maxResultsReturned: vm.maxResultsReturned maxResultsReturned: vm.maxResultsReturned
@@ -113,7 +113,7 @@ export default {
generateMenu(vm); generateMenu(vm);
if (vm.$route.params.ayatype) { if (vm.$route.params.ayatype) {
vm.searchObjectType = vm.$route.params.ayatype; vm.searchAType = vm.$route.params.ayatype;
} }
//get form settings from session cache, if same type as in route then re-use teh last search stuff //get form settings from session cache, if same type as in route then re-use teh last search stuff
@@ -122,13 +122,10 @@ export default {
if (savedSettings && savedSettings.temp) { if (savedSettings && savedSettings.temp) {
savedSettings = savedSettings.temp; savedSettings = savedSettings.temp;
if ( if (vm.searchAType == null || vm.searchAType == savedSettings.ayaType) {
vm.searchObjectType == null ||
vm.searchObjectType == savedSettings.ayaType
) {
//same type or no type so go ahead and rehydrate //same type or no type so go ahead and rehydrate
vm.searchPhrase = savedSettings.phrase; vm.searchPhrase = savedSettings.phrase;
vm.searchObjectType = savedSettings.ayaType; vm.searchAType = savedSettings.ayaType;
vm.items = savedSettings.items; vm.items = savedSettings.items;
} }
} }
@@ -148,7 +145,7 @@ export default {
objectTypes: [] objectTypes: []
}, },
searchPhrase: null, searchPhrase: null,
searchObjectType: 0, searchAType: 0,
items: [], items: [],
maxResultsReturned: false, maxResultsReturned: false,
formState: { formState: {
@@ -251,7 +248,7 @@ export default {
let res = await window.$gz.api.upsert(API_BASE_URL, { let res = await window.$gz.api.upsert(API_BASE_URL, {
phrase: vm.searchPhrase, phrase: vm.searchPhrase,
nameOnly: false, nameOnly: false,
typeOnly: !!vm.searchObjectType ? vm.searchObjectType : 0, typeOnly: !!vm.searchAType ? vm.searchAType : 0,
maxResults: MAX_RESULTS maxResults: MAX_RESULTS
}); });
if (res.error) { if (res.error) {

4
ayanova/src/views/home-security.vue
View File

@@ -12,7 +12,7 @@
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error> <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<template v-if="tfaEnabled"> <template v-if="tfaEnabled">
<v-col cols="12"> <v-col cols="12">
<v-card class="mx-auto my-12" max-width="600"> <v-card data-cy="tfa" class="mx-auto my-12" max-width="600">
<v-card-title>{{ $ay.t("AuthConnectAppTitle") }}</v-card-title> <v-card-title>{{ $ay.t("AuthConnectAppTitle") }}</v-card-title>
<v-card-text> <v-card-text>
<v-btn color="accent" @click="disable()">{{ <v-btn color="accent" @click="disable()">{{
@@ -42,7 +42,7 @@
:error-messages="form().serverErrors(this, 'pin')" :error-messages="form().serverErrors(this, 'pin')"
ref="pin" ref="pin"
@input="fieldValueChanged('pin')" @input="fieldValueChanged('pin')"
data-cy="tfaPin" data-cy="tfa"
autofocus autofocus
@keyup.enter="authenticate" @keyup.enter="authenticate"
></v-text-field> ></v-text-field>

4
ayanova/src/views/inv-part-assemblies.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.PartAssembly, aType: window.$gz.type.PartAssembly,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/inv-part-assembly.vue
View File

@@ -722,7 +722,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.PartAssembly, AType: window.$gz.type.PartAssembly,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

5
ayanova/src/views/inv-part-inventory-transactions.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="$ay.ayt.PartInventory"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -64,9 +64,8 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.PartInventory,
objectId: null, objectId: null,
objectType: null, aType: null,
selectedItems: [], selectedItems: [],
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null, preFilterMode: null,

4
ayanova/src/views/inv-part-inventory.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -64,7 +64,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.PartInventory, aType: window.$gz.type.PartInventory,
selectedItems: [], selectedItems: [],
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null, preFilterMode: null,

2
ayanova/src/views/inv-part-warehouse.vue
View File

@@ -472,7 +472,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.PartWarehouse, AType: window.$gz.type.PartWarehouse,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/inv-part-warehouses.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.PartWarehouse, aType: window.$gz.type.PartWarehouse,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/inv-part.vue
View File

@@ -687,7 +687,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Part, AType: window.$gz.type.Part,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/inv-parts.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Part, aType: window.$gz.type.Part,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/inv-purchase-order.vue
View File

@@ -1643,7 +1643,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.PurchaseOrder, AType: window.$gz.type.PurchaseOrder,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/inv-purchase-orders.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.PurchaseOrder, aType: window.$gz.type.PurchaseOrder,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/svc-contract.vue
View File

@@ -1848,7 +1848,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Contract, AType: window.$gz.type.Contract,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-contracts.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Contract, aType: window.$gz.type.Contract,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/svc-csr.vue
View File

@@ -712,7 +712,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.CustomerServiceRequest, AType: window.$gz.type.CustomerServiceRequest,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-csrs.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -36,7 +36,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.CustomerServiceRequest, aType: window.$gz.type.CustomerServiceRequest,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/svc-loaner.vue
View File

@@ -702,7 +702,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.LoanUnit, AType: window.$gz.type.LoanUnit,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-loaners.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.LoanUnit, aType: window.$gz.type.LoanUnit,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/svc-project.vue
View File

@@ -552,7 +552,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Project, AType: window.$gz.type.Project,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-projects.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Project, aType: window.$gz.type.Project,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/svc-unit-model.vue
View File

@@ -663,7 +663,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.UnitModel, AType: window.$gz.type.UnitModel,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-unit-models.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.UnitModel, aType: window.$gz.type.UnitModel,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

6
ayanova/src/views/svc-unit.vue
View File

@@ -928,7 +928,7 @@ export default {
this.$router.push({ this.$router.push({
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.Unit, aType: window.$gz.type.Unit,
objectId: this.$route.params.recordid, objectId: this.$route.params.recordid,
viz: this.obj.serial, viz: this.obj.serial,
icon: "$ayiFan" icon: "$ayiFan"
@@ -944,7 +944,7 @@ export default {
this.$router.push({ this.$router.push({
name: "meter-readings", name: "meter-readings",
params: { params: {
objectType: window.$gz.type.Unit, aType: window.$gz.type.Unit,
objectId: this.$route.params.recordid objectId: this.$route.params.recordid
} }
}); });
@@ -1270,7 +1270,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Unit, AType: window.$gz.type.Unit,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/svc-units.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Unit, aType: window.$gz.type.Unit,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/vendor.vue
View File

@@ -1054,7 +1054,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Vendor, AType: window.$gz.type.Vendor,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/vendors.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Vendor, aType: window.$gz.type.Vendor,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

2
ayanova/src/views/widget.vue
View File

@@ -618,7 +618,7 @@ async function clickHandler(menuItem) {
//general report selector chosen //general report selector chosen
let res = await m.vm.$refs.reportSelector.open({ let res = await m.vm.$refs.reportSelector.open({
ObjectType: window.$gz.type.Widget, AType: window.$gz.type.Widget,
selectedRowIds: [m.vm.obj.id] selectedRowIds: [m.vm.obj.id]
}); });

4
ayanova/src/views/widgets.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="aType"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
@@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Widget, aType: window.$gz.type.Widget,
selectedItems: [], selectedItems: [],
reload: false reload: false
}; };

32
ayanova/tests/e2e/specs/smoke.js
View File

@@ -13,30 +13,6 @@ describe("SMOKE", () => {
.clear() .clear()
.type(`${Cypress.env("adminpassword")}{enter}`); .type(`${Cypress.env("adminpassword")}{enter}`);
/*
TODO:
x ay-open path: "/open/:ayatype/:recordid",
x home-memos/id edit form
x home-remidners/id
x home-reviews/objecttype/objectid
x home-reset
x cust-customer-notes/customerid
x cust-customer-note/recordid
XXXXx cust-users/recordid NOT WORKING, NEEDS MORE
x inv-part-serials/id
x inv-part-stock-levels/id
x inv-part-adjustment (is transaction edit form)
x acc-service-banks/recordid/objecttype/objectid
x adm-users/id
x adm-import
/viewreport viewreport?oid=[objectid]&rid=[reportid]
ay-evaluate !
*/
//################# HOME //################# HOME
cy.visit("/home-dashboard"); cy.visit("/home-dashboard");
cy.url().should("include", "/home-dashboard"); cy.url().should("include", "/home-dashboard");
@@ -81,6 +57,10 @@ ay-evaluate !
cy.url().should("include", "/home-password"); cy.url().should("include", "/home-password");
cy.get("[data-cy=loginName]"); cy.get("[data-cy=loginName]");
cy.visit("/home-security");
cy.url().should("include", "/home-security");
cy.get("[data-cy=tfa]");
//can't do this without reset code etc, just logs out //can't do this without reset code etc, just logs out
// cy.visit("/home-reset"); // cy.visit("/home-reset");
// cy.url().should("include", "/home-reset"); // cy.url().should("include", "/home-reset");
@@ -324,6 +304,10 @@ ay-evaluate !
cy.url().should("include", "/adm-global-logo"); cy.url().should("include", "/adm-global-logo");
cy.get("[data-cy=uploadSmall]"); cy.get("[data-cy=uploadSmall]");
cy.visit("/adm-global-seeds");
cy.url().should("include", "/adm-global-seeds");
cy.get("[data-cy=purchaseOrderNextSerial]");
cy.visit("/adm-license"); cy.visit("/adm-license");
cy.url().should("include", "/adm-license"); cy.url().should("include", "/adm-license");
cy.get("[data-cy=licenseForm]"); cy.get("[data-cy=licenseForm]");