This commit is contained in:
@@ -417,7 +417,7 @@ export default {
|
|||||||
//then save all items downwards from top of graph
|
//then save all items downwards from top of graph
|
||||||
//mostly via workorderitem
|
//mostly via workorderitem
|
||||||
//########################################################
|
//########################################################
|
||||||
let fail = false;
|
let noProblem = true;
|
||||||
let isNew = this.obj.concurrency == 0;
|
let isNew = this.obj.concurrency == 0;
|
||||||
|
|
||||||
//### STATE first if unlocking only
|
//### STATE first if unlocking only
|
||||||
@@ -425,43 +425,43 @@ export default {
|
|||||||
//and user can unlock first to finish updating
|
//and user can unlock first to finish updating
|
||||||
let stateSaved = false;
|
let stateSaved = false;
|
||||||
if (this.obj.isLockedAtServer) {
|
if (this.obj.isLockedAtServer) {
|
||||||
fail = await saveState(vm);
|
noProblem = await saveState(vm);
|
||||||
stateSaved = true;
|
stateSaved = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//############# DELETE GRAPH ###############
|
//############# DELETE GRAPH ###############
|
||||||
//SCHEDULED USERS
|
//SCHEDULED USERS
|
||||||
if (!fail) {
|
if (noProblem) {
|
||||||
fail = await deleteScheduledUsers(vm);
|
noProblem = await deleteScheduledUsers(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
//todo: other children
|
//todo: other children
|
||||||
|
|
||||||
//WOITEMS
|
//WOITEMS
|
||||||
if (!fail) {
|
if (noProblem) {
|
||||||
fail = await deleteItems(vm);
|
noProblem = await deleteItems(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
//############ SAVE GRAPH ###############
|
//############ SAVE GRAPH ###############
|
||||||
//HEADER
|
//HEADER
|
||||||
if (!fail) {
|
if (noProblem) {
|
||||||
fail = await saveHeader(vm);
|
noProblem = await saveHeader(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
//WOITEMS
|
//WOITEMS
|
||||||
if (!fail) {
|
if (noProblem) {
|
||||||
//This saves all bottom level collections as well
|
//This saves all bottom level collections as well
|
||||||
fail = await saveItems(vm);
|
noProblem = await saveItems(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
//### STATE last normally
|
//### STATE last normally
|
||||||
//in case it locks or is completed
|
//in case it locks or is completed
|
||||||
if (!stateSaved && !fail) {
|
if (!stateSaved && noProblem) {
|
||||||
fail = await saveState(vm);
|
noProblem = await saveState(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
//## ALL PARTIAL UPDATES SUCCEEDED
|
//## ALL PARTIAL UPDATES SUCCEEDED
|
||||||
if (fail) {
|
if (!noProblem) {
|
||||||
//this assumes error is already displayed from save op
|
//this assumes error is already displayed from save op
|
||||||
window.$gz.form.setFormState({
|
window.$gz.form.setFormState({
|
||||||
vm: vm,
|
vm: vm,
|
||||||
@@ -639,6 +639,7 @@ async function deleteItems(vm) {
|
|||||||
vm.deletedGraphItems.items.splice(0, 1);
|
vm.deletedGraphItems.items.splice(0, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
async function saveItems(vm) {
|
async function saveItems(vm) {
|
||||||
let totalItems = vm.obj.items.length;
|
let totalItems = vm.obj.items.length;
|
||||||
@@ -697,6 +698,7 @@ async function deleteScheduledUsers(vm) {
|
|||||||
vm.deletedGraphItems.scheduledUsers.splice(0, 1);
|
vm.deletedGraphItems.scheduledUsers.splice(0, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function saveScheduledUsers(vm, woitemindex) {
|
async function saveScheduledUsers(vm, woitemindex) {
|
||||||
@@ -727,7 +729,6 @@ async function saveScheduledUsers(vm, woitemindex) {
|
|||||||
o.workOrderItemId = res.data.workOrderItemId;
|
o.workOrderItemId = res.data.workOrderItemId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true; //made it
|
return true; //made it
|
||||||
@@ -757,6 +758,7 @@ async function saveState(vm) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////////////
|
/////////////////////////////
|
||||||
|
|||||||
Reference in New Issue
Block a user