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

HUGE REFACTOR / CLEANUP

Browse Source 
if there is a issue it's probably something in here that was changed
This commit is contained in:
John Cardinal
2021-09-28 20:19:44 +00:00
parent 51eddfede9
commit d0afdd9855
238 changed files with 3127 additions and 8614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,8 @@
<template>
<div>
<gz-report-selector ref="reportSelector"></gz-report-selector>
<!-- {{ formState }} -->
<!-- {{ obj.contractId }} -->
<div v-if="formState.ready">
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<v-form ref="form">
<v-tabs mobile-breakpoint="100" v-model="tab" @change="tabChanged">
<v-tab>{{ $ay.t("HeadOffice") }}</v-tab>
@@ -648,31 +645,19 @@
</v-overlay>
</div>
</template>
<script>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
const FORM_KEY = "head-office-edit";
const API_BASE_URL = "head-office/";
const FORM_CUSTOM_TEMPLATE_KEY = "HeadOffice"; //<-- Should always be CoreBizObject AyaType name here where possible
const FORM_CUSTOM_TEMPLATE_KEY = "HeadOffice";
export default {
async created() {
let vm = this;
const vm = this;
try {
await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.HeadOffice);
vm.formState.readOnly = !vm.rights.change;
window.$gz.eventBus.$on("menu-click", clickHandler);
let setDirty = false;
let setValid = true;
//id 0 means create or duplicate to new
if (vm.$route.params.recordid != 0) {
//is there already an obj from a prior operation?
@@ -680,7 +665,7 @@ export default {
//yes, no need to fetch it
this.obj = this.$route.params.obj;
} else {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
await vm.getDataFromApi(vm.$route.params.recordid);
}
} else {
//Might be a duplicate and contain another record
@@ -694,12 +679,11 @@ export default {
setDirty = true;
}
}
window.$gz.form.setFormState({
vm: vm,
loading: false,
dirty: setDirty,
valid: setValid
valid: true
});
generateMenu(vm);
} catch (error) {
@@ -728,42 +712,38 @@ export default {
selectLists: {
usertypes: []
},
obj:
//IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
//I.E. Serial, usertype fields
//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
{
id: 0,
concurrency: 0,
name: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
webAddress: null,
accountNumber: null,
// usesBanking: false,
contractId: null,
contractExpires: null,
phone1: null,
phone2: null,
phone3: null,
phone4: null,
phone5: null,
emailAddress: null,
postAddress: null,
postCity: null,
postRegion: null,
postCountry: null,
postCode: null,
address: null,
city: null,
region: null,
country: null,
latitude: null,
longitude: null
},
obj: {
id: 0,
concurrency: 0,
name: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
webAddress: null,
accountNumber: null,
// usesBanking: false,
contractId: null,
contractExpires: null,
phone1: null,
phone2: null,
phone3: null,
phone4: null,
phone5: null,
emailAddress: null,
postAddress: null,
postCity: null,
postRegion: null,
postCountry: null,
postCode: null,
address: null,
city: null,
region: null,
country: null,
latitude: null,
longitude: null
},
tab: 0,
formState: {
ready: false,
@@ -787,23 +767,17 @@ export default {
hour12: window.$gz.locale.getHour12()
};
},
//WATCHERS
watch: {
formState: {
handler: function(val) {
//,oldval is available here too if necessary
if (this.formState.loading) {
return;
}
//enable / disable save button
if (val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
//enable / disable duplicate / new button
if (!val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit(
"menu-enable-item",
@@ -860,7 +834,7 @@ export default {
}
},
async getDataFromApi(recordId) {
let vm = this;
const vm = this;
window.$gz.form.setFormState({
vm: vm,
loading: true
@@ -868,14 +842,10 @@ export default {
if (!recordId) {
throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
}
let url = API_BASE_URL + recordId;
try {
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.get(url);
const res = await window.$gz.api.get(API_BASE_URL + recordId);
if (res.error) {
//Not found?
if (res.error.code == "2010") {
window.$gz.form.handleObjectNotFound(vm);
}
@@ -883,9 +853,7 @@ export default {
window.$gz.form.setErrorBoxErrors(vm);
} else {
vm.obj = res.data;
//modify the menu as necessary
generateMenu(vm);
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -903,7 +871,7 @@ export default {
}
},
async submit() {
let vm = this;
const vm = this;
if (vm.canSave == false) {
return;
}
@@ -913,36 +881,26 @@ export default {
vm: vm,
loading: true
});
let url = API_BASE_URL; // + vm.$route.params.recordid;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.upsert(url, vm.obj);
const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
if (res.data.id) {
//POST - whole new object returned
//POST
vm.obj = res.data;
//Change URL to new record
//NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
this.$router.replace({
name: "head-office-edit",
params: {
recordid: res.data.id,
obj: res.data // Pass data object to new form
obj: res.data
}
});
} else {
//PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
//Handle "put" of an existing record (UPDATE)
//PUT
vm.obj.concurrency = res.data.concurrency;
}
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -959,42 +917,33 @@ export default {
}
},
async remove() {
let vm = this;
const vm = this;
try {
let dialogResult = await window.$gz.dialog.confirmDelete();
const dialogResult = await window.$gz.dialog.confirmDelete();
if (dialogResult != true) {
return;
}
//do the delete
window.$gz.form.setFormState({
vm: vm,
loading: true
});
//No need to delete a new record, just abandon it...
if (vm.$route.params.recordid == 0) {
//this should not get offered for delete but to be safe and clear just in case:
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
} else {
let url = API_BASE_URL + vm.$route.params.recordid;
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.remove(url);
const res = await window.$gz.api.remove(
API_BASE_URL + vm.$route.params.recordid
);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//workaround to prevent warning about leaving dirty record
//For some reason I couldn't just reset isdirty in formstate
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
}
}
} catch (error) {
//Update the form status
window.$gz.form.setFormState({
vm: vm,
loading: false
@@ -1003,7 +952,6 @@ export default {
}
},
duplicate() {
//Navigate to new record
this.$router.push({
name: "head-office-edit",
params: {
@@ -1020,10 +968,6 @@ export default {
await this.contactsGetDataFromApi();
}
}
// let vm = this;
// if (vm[tabIndexToRoute(vm.tab)].isnew) {
// vm.getDataFromApi();
// }
},
addContact() {
if (this.obj.id == 0) {
@@ -1042,10 +986,10 @@ export default {
});
},
rolesDisplayFromRoles(roles) {
let roleNames = [];
const roleNames = [];
if (roles != null && roles != 0) {
for (let i = 0; i < this.availableRoles.length; i++) {
let role = this.availableRoles[i];
const role = this.availableRoles[i];
if (!!(roles & role.id)) {
roleNames.push(role.name);
}
@@ -1054,16 +998,15 @@ export default {
return roleNames.join(", ");
},
async contactsGetDataFromApi() {
let vm = this;
const vm = this;
vm.formState.loading = true;
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.get(
const res = await window.$gz.api.get(
`user/head-office-contacts/${vm.obj.id}`
);
vm.hasFetchedContacts = true;
if (res.error) {
if (res.error.code == "2010") {
window.$gz.form.handleObjectNotFound(vm);
@@ -1072,14 +1015,9 @@ export default {
window.$gz.form.setErrorBoxErrors(vm);
} else {
if (res.data) {
/* Id = z.Id,
Active = z.Active,
Name = z.Name,
UserType = z.UserType,
LastLogin = z.LastLogin */
let ret = [];
const ret = [];
for (let i = 0; i < res.data.length; i++) {
let o = res.data[i];
const o = res.data[i];
ret.push({
id: o.id,
name: o.name,
@@ -1096,13 +1034,11 @@ export default {
)
});
}
vm.contactsObj = ret;
} else {
vm.rawObj = [];
vm.contactsObj = [];
}
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -1120,25 +1056,23 @@ export default {
}
},
AddressCopyToPostal() {
let vm = this;
const vm = this;
vm.obj.postAddress = vm.obj.address;
vm.obj.postCity = vm.obj.city;
vm.obj.postRegion = vm.obj.region;
vm.obj.postCountry = vm.obj.country;
//flag form dirty
this.formState.dirty = true;
},
AddressCopyToPhysical() {
let vm = this;
const vm = this;
vm.obj.address = vm.obj.postAddress;
vm.obj.city = vm.obj.postCity;
vm.obj.region = vm.obj.postRegion;
vm.obj.country = vm.obj.postCountry;
//flag form dirty
this.formState.dirty = true;
},
AddressCopyPhysicalToClipBoard() {
let vm = this;
const vm = this;
let ret = "";
if (vm.obj.name) {
ret += vm.obj.name + "\n";
@@ -1161,20 +1095,20 @@ export default {
window.$gz.util.copyToClipboard(ret);
/* todo maybe down the road if asked for?
if(mAddressType==AddressTypes.Physical)
{
if(mLatitude!=0 || mLongitude!=0)
{
sb.Append(" \r\n");
sb.Append(LongitudeToString(mLongitude));
sb.Append(" ");
sb.Append(LatitudeToString(mLatitude));
sb.Append(" \r\n");
}
} */
if(mAddressType==AddressTypes.Physical)
{
if(mLatitude!=0 || mLongitude!=0)
{
sb.Append(" \r\n");
sb.Append(LongitudeToString(mLongitude));
sb.Append(" ");
sb.Append(LatitudeToString(mLatitude));
sb.Append(" \r\n");
}
} */
},
AddressCopyPostalToClipBoard() {
let vm = this;
const vm = this;
let ret = "";
if (vm.obj.name) {
ret += vm.obj.name + "\n";
@@ -1202,10 +1136,10 @@ export default {
window.$gz.util.copyToClipboard(ret);
},
async GeoCapture() {
let vm = this;
const vm = this;
try {
window.$gz.form.deleteAllErrorBoxErrors(vm);
let loc = await window.$gz.util.getGeoLocation();
const loc = await window.$gz.util.getGeoLocation();
vm.obj.latitude = loc.latitude;
vm.fieldValueChanged("latitude");
vm.obj.longitude = loc.longitude;
@@ -1214,8 +1148,6 @@ export default {
window.$gz.errorHandler.handleFormError(ex, vm);
}
}
//end methods
}
};
@@ -1226,7 +1158,7 @@ async function clickHandler(menuItem) {
if (!menuItem) {
return;
}
let m = window.$gz.menu.parseMenuItem(menuItem);
const m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) {
case "save":
@@ -1245,7 +1177,7 @@ async function clickHandler(menuItem) {
m.vm.duplicate();
break;
case "report":
let res = await m.vm.$refs.reportSelector.open(
const res = await m.vm.$refs.reportSelector.open(
{
AType: window.$gz.type.HeadOffice,
selectedRowIds: [m.vm.obj.id]
@@ -1292,7 +1224,7 @@ async function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
let menuOptions = {
const menuOptions = {
isMain: false,
readOnly: vm.formState.readOnly,
icon: "$ayiSitemap",
@@ -1327,8 +1259,6 @@ function generateMenu(vm) {
});
}
//REPORTS
//Report not Print, print is a further option
menuOptions.menuItems.push({
title: "Report",
icon: "$ayiFileAlt",
@@ -1336,8 +1266,7 @@ function generateMenu(vm) {
vm: vm
});
//get last report selected
let lastReport = window.$gz.form.getLastReport(FORM_KEY);
const lastReport = window.$gz.form.getLastReport(FORM_KEY);
if (lastReport != null) {
menuOptions.menuItems.push({
title: lastReport.name,
@@ -1368,9 +1297,6 @@ function generateMenu(vm) {
menuOptions.menuItems.push({ divider: true, inset: false });
//---- SHOW ALL ---
//todo: this will need to show a customer list filtered by meta filter for headoffices
//so the user can then view customer or show all to view all wo, units, quotes etc
menuOptions.menuItems.push({
title: "CustomerList",
icon: "$ayiAddressCard",
@@ -1378,8 +1304,6 @@ function generateMenu(vm) {
vm: vm
});
//--- /show all ---
menuOptions.menuItems.push({
title: "GeoView",
icon: "$ayiMapMarked",
@@ -1388,7 +1312,6 @@ function generateMenu(vm) {
});
menuOptions.menuItems.push({ divider: true, inset: false });
window.$gz.eventBus.$emit("menu-change", menuOptions);
}
@@ -1400,8 +1323,6 @@ let JUST_DELETED = false;
async function initForm(vm) {
await fetchTranslatedText(vm);
await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
// await populateSelectionLists(vm);
// await cacheEnums(vm);
await createTableHeaders(vm);
}