diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 8b012ca..5b0d388 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -69,13 +69,14 @@ exports.MenuList = (req, res) => { .then(EntitiesData => { let data = []; EntitiesData.forEach((value, key)=>{ - var camunda_status; + instancesid = value.dataValues.process_instance_id; taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - taskid.then(function(result){ - formVariable = camundaHelper.financialsFormVariables(result); + taskid.then(function(result){ + formVariable = camundaHelper.financialsFormVariables(result); formVariable.then(function(form_result){ - camunda_status = JSON.parse(form_result); + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } obj_data = { ...value.dataValues ,status:camunda_status , statementsmasterrData:MasterData } data.push(obj_data); }); @@ -731,25 +732,36 @@ promise.then(() => { exports.camunda = async (req, res) => { - const losid = req.query.losid; + const losid = "MW112233"; try { - const losid = "fb37c1e4-271e-11ec-a4f4-42010a800002"; - const cin = "test"; - const user = "test"; + Entities.findAll({where : { losid } , attributes: [ 'id', 'losid' , 'pan' , 'cin' , 'bizname' , 'entity_type' , 'activity_group' , 'biz_act_desc' , 'process_instance_id' ] }) + .then(EntitiesData => { + console.log("Start"); + EntitiesData.forEach((value, key)=>{ + + console.log(value.dataValues.process_instance_id); + + + }).then(()=>{console.log("End");}); + + }) + // const losid = "fb37c1e4-271e-11ec-a4f4-42010a800002"; + // const cin = "test"; + // const user = "test"; - var camunda_status; - instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; - const taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - taskid.then(function(result){ - const formVariable = camundaHelper.financialsFormVariables(result); - formVariable.then(function(form_result){ camunda_status = form_result }); - }); - setTimeout(function(){ - console.log(camunda_status); - res.send(camunda_status); + // var camunda_status; + // instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + // const taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + // taskid.then(function(result){ + // const formVariable = camundaHelper.financialsFormVariables(result); + // formVariable.then(function(form_result){ camunda_status = form_result }); + // }); + // setTimeout(function(){ + // console.log(camunda_status); + // res.send(camunda_status); - },5000); + // },5000); //console.log(camunda_status); // function one(){ // console.log("one")