|
@@ -42,7 +42,7 @@ var dbController = {
|
|
|
else {
|
|
|
let updateNode = controller.tree.roots[controller.tree.roots.length - 1];
|
|
|
let updateId = updateNode.getID();
|
|
|
- //let newNodeId = controller.tree.newNodeID();
|
|
|
+ //let newNodeId = controllers.tree.newNodeID();
|
|
|
let newNodeId = uuid.v1();
|
|
|
let updatePreData = {ID: updateId, NextSiblingID: newNodeId};
|
|
|
let sectionInfo = tools.getSectionInfo(node);
|
|
@@ -1856,12 +1856,12 @@ var jobsController = {
|
|
|
totalJobs.jobsArr.forEach(function(job){
|
|
|
if(field === 'content'&& newData === job.data.content){
|
|
|
let serialNo = tools.getSerialNo(controller.tree.selected.jobs);//update--
|
|
|
- //billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'jobs', job.data.id);//update--
|
|
|
+ //billsAjax.updateBills(billsLibId, controllers.tree.selected.getID(), 'jobs', job.data.id);//update--
|
|
|
billsAjax.updateBills(userAccount, billsLibId, controller.tree.selected.getID(), 'jobs', {id: job.data.id, serialNo: serialNo});//update--
|
|
|
job.count++;
|
|
|
- // controller.tree.selected.jobs.push(job);//update--
|
|
|
+ // controllers.tree.selected.jobs.push(job);//update--
|
|
|
controller.tree.selected.jobs.push({job: job, serialNo: serialNo});//update--
|
|
|
- //tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);//update--
|
|
|
+ //tools.reshowData(sheet, controllers.tree.selected.jobs, setting, true);//update--
|
|
|
tools.orderReshowData(sheet,controller.tree.selected.jobs, setting, 'job', true);
|
|
|
}
|
|
|
else if(field == 'code' && newData == job.data.code){
|
|
@@ -1869,7 +1869,7 @@ var jobsController = {
|
|
|
billsAjax.updateBills(userAccount, billsLibId, controller.tree.selected.getID(), 'jobs', {id: job.data.id, serialNo: serialNo});//update--
|
|
|
job.count++;
|
|
|
controller.tree.selected.jobs.push({job: job, serialNo: serialNo});//update--
|
|
|
- // tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);//update--
|
|
|
+ // tools.reshowData(sheet, controllers.tree.selected.jobs, setting, true);//update--
|
|
|
tools.orderReshowData(sheet, controller.tree.selected.jobs, setting, 'job', true);
|
|
|
}
|
|
|
});
|
|
@@ -1893,7 +1893,7 @@ var jobsController = {
|
|
|
controller.tree.selected.jobs.splice(index, 1);
|
|
|
controller.tree.selected.jobs.splice(index, 0, {job: job, serialNo: serialNo});//update--
|
|
|
billsAjax.updateBillsArr(userAccount, billsLibId, controller.tree.selected.getID(), id, job.data.id, 'update', 'jobs');
|
|
|
- // tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);//update--
|
|
|
+ // tools.reshowData(sheet, controllers.tree.selected.jobs, setting, true);//update--
|
|
|
tools.orderReshowData(sheet,controller.tree.selected.jobs, setting, 'job', true);
|
|
|
}
|
|
|
});
|
|
@@ -1901,7 +1901,7 @@ var jobsController = {
|
|
|
else{
|
|
|
if(field === 'content'){
|
|
|
maxJobsNumber++;
|
|
|
- //let serialNo = tools.getSerialNo(controller.tree.selected.jobs);//update--
|
|
|
+ //let serialNo = tools.getSerialNo(controllers.tree.selected.jobs);//update--
|
|
|
let serialNo = tools.getObj(controller.tree.selected.jobs, id, 'job').serialNo;
|
|
|
jobsAjax.edUpdateJob(userAccount, billsLibId, controller.tree.selected.getID(), newData, maxJobsNumber, id, function(newJobId){//update--
|
|
|
var newJobData, newJob;
|
|
@@ -1913,7 +1913,7 @@ var jobsController = {
|
|
|
var index = tools.getIndex(controller.tree.selected.jobs, id, 'job');
|
|
|
controller.tree.selected.jobs.splice(index, 1);
|
|
|
controller.tree.selected.jobs.splice(index, 0, {job: newJob, serialNo: serialNo});//update--
|
|
|
- //tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);//update--
|
|
|
+ //tools.reshowData(sheet, controllers.tree.selected.jobs, setting, true);//update--
|
|
|
tools.orderReshowData(sheet, controller.tree.selected.jobs, setting, 'job', true);//update--
|
|
|
});
|
|
|
}
|
|
@@ -2056,7 +2056,7 @@ var itemsController = {
|
|
|
totalItems.items[totalItems.prefix + newItemId] = newItem;
|
|
|
totalItems.itemsArr.push(newItem);
|
|
|
controller.tree.selected.items.push({item: newItem, serialNo: serialNo});
|
|
|
- //tools.reshowData(sheet, controller.tree.selected.items, setting, true);
|
|
|
+ //tools.reshowData(sheet, controllers.tree.selected.items, setting, true);
|
|
|
tools.orderReshowData(sheet, controller.tree.selected.items, setting, 'item', true);
|
|
|
});
|
|
|
}
|