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

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

@@ -1306,31 +1306,19 @@
</template>
</div>
</template>
<script>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
const FORM_KEY = "contract-edit";
const API_BASE_URL = "contract/";
const FORM_CUSTOM_TEMPLATE_KEY = "Contract"; //<-- Should always be CoreBizObject AyaType name here where possible
const FORM_CUSTOM_TEMPLATE_KEY = "Contract";
export default {
async created() {
let vm = this;
const vm = this;
try {
await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.Contract);
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?
@@ -1338,7 +1326,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
@@ -1354,18 +1342,15 @@ export default {
this.obj.contractPartOverrideItems.forEach(z => (z.id = 0));
this.obj.contractServiceRateOverrideItems.forEach(z => (z.id = 0));
this.obj.contractTravelRateOverrideItems.forEach(z => (z.id = 0));
setDirty = true;
}
}
window.$gz.form.setFormState({
vm: vm,
loading: false,
dirty: setDirty,
valid: setValid
valid: true
});
generateMenu(vm);
} catch (error) {
window.$gz.errorHandler.handleFormError(error, vm);
@@ -1390,35 +1375,31 @@ 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
{
id: 0,
concurrency: 0,
name: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
responseTime: "00:00:00",
contractServiceRatesOnly: false,
contractTravelRatesOnly: false,
partsOverridePct: 0,
partsOverrideType: 1,
serviceRatesOverridePct: 0,
serviceRatesOverrideType: 1,
travelRatesOverridePct: 0,
travelRatesOverrideType: 1,
alertNotes: null,
serviceRateItems: [],
travelRateItems: [],
contractPartOverrideItems: [],
contractTravelRateOverrideItems: [],
contractServiceRateOverrideItems: []
},
obj: {
id: 0,
concurrency: 0,
name: null,
active: true,
notes: null,
wiki: null,
customFields: "{}",
tags: [],
responseTime: "00:00:00",
contractServiceRatesOnly: false,
contractTravelRatesOnly: false,
partsOverridePct: 0,
partsOverrideType: 1,
serviceRatesOverridePct: 0,
serviceRatesOverrideType: 1,
travelRatesOverridePct: 0,
travelRatesOverrideType: 1,
alertNotes: null,
serviceRateItems: [],
travelRateItems: [],
contractPartOverrideItems: [],
contractTravelRateOverrideItems: [],
contractServiceRateOverrideItems: []
},
formState: {
ready: false,
dirty: false,
@@ -1446,23 +1427,17 @@ export default {
editTravelRateItemIndex: 0
};
},
//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",
@@ -1612,7 +1587,6 @@ export default {
this.editTravelRateItemIndex = -1;
this.formState.dirty = true;
},
canSave: function() {
return this.formState.valid && this.formState.dirty;
},
@@ -1638,7 +1612,7 @@ export default {
}
},
async getDataFromApi(recordId) {
let vm = this;
const vm = this;
window.$gz.form.setFormState({
vm: vm,
loading: true
@@ -1646,14 +1620,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);
}
@@ -1661,9 +1631,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,
@@ -1681,47 +1649,39 @@ 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);
vm.editTravelRateItemIndex = -1;
vm.editServiceRateItemIndex = -1;
vm.editContractPartOverrideItemIndex = -1;
vm.editContractTravelRateOverrideItemIndex = -1;
vm.editContractServiceRateOverrideItemIndex = -1;
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 {
//POST or PUT - whole new object returned which is a little different than other objects
//POST or PUT which is a little different than other objects
//so if it's new then need to navigate to it to update url with id
if (vm.$route.params.recordid != 0) {
//update of existing record
vm.obj = res.data;
} else {
this.$router.replace({
name: "contract-edit",
params: {
recordid: res.data.id,
obj: res.data // Pass data object to new form will prevent fetch
obj: res.data
}
});
}
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -1738,42 +1698,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
@@ -1783,7 +1736,6 @@ export default {
},
duplicate() {
//Navigate to new record
this.$router.push({
name: "contract-edit",
params: {
@@ -1792,8 +1744,6 @@ export default {
}
});
}
//end methods
}
};
@@ -1804,7 +1754,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":
@@ -1823,7 +1773,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.Contract,
selectedRowIds: [m.vm.obj.id]
@@ -1849,7 +1799,7 @@ async function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
let menuOptions = {
const menuOptions = {
isMain: false,
readOnly: vm.formState.readOnly,
icon: "$ayiFileContract",
@@ -1884,8 +1834,6 @@ function generateMenu(vm) {
});
}
//REPORTS
//Report not Print, print is a further option
menuOptions.menuItems.push({
title: "Report",
icon: "$ayiFileAlt",
@@ -1893,8 +1841,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,
@@ -1927,7 +1874,6 @@ function generateMenu(vm) {
window.$gz.eventBus.$emit("menu-change", menuOptions);
}
let JUST_DELETED = false;
/////////////////////////////////
@@ -1985,7 +1931,6 @@ async function fetchTranslatedText(vm) {
//
//
async function populateSelectionLists(vm) {
//ensure the pick lists required are pre-fetched
await window.$gz.enums.fetchEnumList("contractoverridetype");
vm.selectLists.overrideTypes = window.$gz.enums.getSelectionList(
"contractoverridetype"