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

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

@@ -3,7 +3,6 @@
<gz-report-selector ref="reportSelector"></gz-report-selector>
<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">
<v-tab>{{ $ay.t("Unit") }}</v-tab>
@@ -699,31 +698,19 @@
</v-overlay>
</div>
</template>
<script>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
const FORM_KEY = "unit-edit";
const API_BASE_URL = "unit/";
const FORM_CUSTOM_TEMPLATE_KEY = "Unit"; //<-- Should always be CoreBizObject AyaType name here where possible
const FORM_CUSTOM_TEMPLATE_KEY = "Unit";
export default {
async created() {
let vm = this;
const vm = this;
try {
await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.Unit);
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?
@@ -731,7 +718,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
@@ -746,17 +733,17 @@ export default {
} else {
//check for generate unit from part info on route params
//(set by workorder item part when user selects generate unit from part)
let gen = this.$route.params.genFromPart;
const gen = this.$route.params.genFromPart;
if (gen) {
//get the part then set the values accordingly
let res = await window.$gz.api.get(`part/${gen.partId}`);
const res = await window.$gz.api.get(`part/${gen.partId}`);
if (res.error) {
window.$gz.eventBus.$emit(
"notify-warning",
window.$gz.errorHandler.errorToString(res, this)
);
} else {
let p = res.data;
const p = res.data;
this.obj.boughtHere = true;
this.obj.customerId = gen.customerId;
this.obj.serial = gen.serial;
@@ -792,7 +779,7 @@ export default {
vm: vm,
loading: false,
dirty: setDirty,
valid: setValid
valid: true
});
generateMenu(vm);
@@ -819,90 +806,44 @@ export default {
data() {
return {
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
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, 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
/*
{
"data": {
"id": 90979,
"concurrency": 2880802,
"active": true,
"notes": "Autem quia quod beatae reprehenderit et voluptatem aut animi.",
"wiki": null,
"customFields": null,
"tags": [
"zone3"
],
"serial": "00008962",
"customerId": 19027,
"parentUnitId": null,
"unitModelId": 40,
"unitHasOwnAddress": true,
"boughtHere": true,
"purchasedFromVendorId": null,
"receipt": "376373",
"purchasedDate": "2012-04-09T04:26:32.454688Z",
"description": "Intelligent Metal Shirt",
"replacedByUnitId": null,
"overrideModelWarranty": false,
"warrantyLength": null,
"warrantyTerms": null,
"usesBanking": false,
"metered": false,
"lifeTimeWarranty": false,
"text1": null,
"text2": null,
"text3": null,
"text4": null,
"address": "453 Isabelle Alley",
"city": "Douglasshire",
"region": "California",
"country": "Saint Lucia",
"latitude": -22.1701,
"longitude": 167.3475
}
}
*/
{
id: 0,
concurrency: 0,
serial: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
customerId: null,
parentUnitId: null,
unitModelId: null,
unitHasOwnAddress: false,
boughtHere: false,
purchasedFromVendorId: null,
receipt: null,
purchasedDate: null,
description: null,
replacedByUnitId: null,
overrideModelWarranty: false,
warrantyLength: null,
warrantyTerms: null,
//usesBanking: false,
contractId: null,
contractExpires: null,
metered: false,
lifeTimeWarranty: false,
text1: null,
text2: null,
text3: null,
text4: null,
address: null,
city: null,
region: null,
country: null,
latitude: null,
longitude: null
},
obj: {
id: 0,
concurrency: 0,
serial: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
customerId: null,
parentUnitId: null,
unitModelId: null,
unitHasOwnAddress: false,
boughtHere: false,
purchasedFromVendorId: null,
receipt: null,
purchasedDate: null,
description: null,
replacedByUnitId: null,
overrideModelWarranty: false,
warrantyLength: null,
warrantyTerms: null,
//usesBanking: false,
contractId: null,
contractExpires: null,
metered: false,
lifeTimeWarranty: false,
text1: null,
text2: null,
text3: null,
text4: null,
address: null,
city: null,
region: null,
country: null,
latitude: null,
longitude: null
},
tab: 0,
formState: {
ready: false,
@@ -918,23 +859,19 @@ export default {
ayaType: window.$gz.type.Unit
};
},
//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",
@@ -978,14 +915,6 @@ export default {
name: "meter-readings",
params: { unitid: this.obj.id, unitname: this.obj.serial }
});
// this.$router.push({
// name: "meter-readings",
// params: {
// aType: window.$gz.type.Unit,
// objectId: this.$route.params.recordid
// }
// });
}
},
canSave: function() {
@@ -1010,7 +939,7 @@ export default {
}
},
async getDataFromApi(recordId) {
let vm = this;
const vm = this;
window.$gz.form.setFormState({
vm: vm,
loading: true
@@ -1018,14 +947,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);
}
@@ -1033,9 +958,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,
@@ -1053,46 +976,35 @@ export default {
}
},
async submit() {
let vm = this;
const vm = this;
if (vm.canSave == false) {
return;
}
try {
window.$gz.form.setFormState({
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: "unit-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,
@@ -1109,42 +1021,35 @@ 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
@@ -1153,7 +1058,6 @@ export default {
}
},
duplicate() {
//Navigate to new record
this.$router.push({
name: "unit-edit",
params: {
@@ -1164,7 +1068,7 @@ export default {
},
AddressCopyPhysicalToClipBoard() {
let vm = this;
const vm = this;
let ret = "";
if (vm.obj.name) {
ret += vm.obj.name + "\n";
@@ -1187,10 +1091,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;
@@ -1199,8 +1103,6 @@ export default {
window.$gz.errorHandler.handleFormError(ex, vm);
}
}
//end methods
}
};
@@ -1211,7 +1113,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":
@@ -1230,7 +1132,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.Unit,
selectedRowIds: [m.vm.obj.id]
@@ -1297,7 +1199,7 @@ async function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
let menuOptions = {
const menuOptions = {
isMain: false,
readOnly: vm.formState.readOnly,
icon: "$ayiFan",
@@ -1332,8 +1234,6 @@ function generateMenu(vm) {
});
}
//REPORTS
//Report not Print, print is a further option
menuOptions.menuItems.push({
title: "Report",
icon: "$ayiFileAlt",
@@ -1341,8 +1241,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,
@@ -1380,8 +1279,6 @@ function generateMenu(vm) {
key: "app:nav"
});
//---- SHOW ALL ---
menuOptions.menuItems.push({
title: "WorkOrderList", //note: technically it opens teh woitemunitlist not workorders but it's confusing in the UI otherwise and this is how people would think about it
icon: "$ayiTools",
@@ -1389,8 +1286,6 @@ function generateMenu(vm) {
vm: vm
});
//MIGRATE_OUTSTANDING show all: workorderlist, unitlist, quotelist, pmlist
menuOptions.menuItems.push({
title: "QuoteList",
icon: "$ayiPencilAlt",
@@ -1404,7 +1299,6 @@ function generateMenu(vm) {
key: FORM_KEY + ":PMList",
vm: vm
});
//--- /show all ---
menuOptions.menuItems.push({
title: "GeoView",