diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 5b0d388..18fba8a 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -130,8 +130,9 @@ exports.FinantialsSummary = async (req, res) => { taskid.then(function(result){ formVariable = camundaHelper.financialsFormVariables(result); formVariable.then(function(form_result){ - camunda_status = JSON.parse(form_result); - res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag,status:camunda_status, "summary" : summary } }); + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } + res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag , status:camunda_status, "summary" : summary } }); }); }); //res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag, "summary" : result } }); @@ -149,8 +150,9 @@ exports.FinantialsSummary = async (req, res) => { taskid.then(function(result){ formVariable = camundaHelper.financialsFormVariables(result); formVariable.then(function(form_result){ - camunda_status = JSON.parse(form_result); - res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag,status:camunda_status, "summary" : summary } }); + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } + res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag , status:camunda_status, "summary" : summary } }); }); }); //res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag, "summary" : result } }); @@ -322,7 +324,7 @@ Pro42Data.forEach((Pro42Datavalue, key)=>{ { Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby}) .then(Entitydata => { - + console.log(Entitydata.dataValues.id) //create Entityfinyears data const Y1 = new Date().getFullYear(); const Y2 = Y1-1; @@ -643,7 +645,7 @@ const Pro42Data = [ { Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby}) .then(Entitydata => { - + //create Entityfinyears data const Y1 = new Date().getFullYear(); const Y2 = Y1-1; @@ -803,3 +805,4 @@ exports.camunda = async (req, res) => { message: err.message || "Some error occurred while inserting statements." ,'data': "No data" }); } }; + diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 7c3cdb5..dc8242e 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -541,44 +541,12 @@ exports.ReInitiate = async (req, res) => { }; -// exports.Reassign = async (req, res) => { -// try -// { -// const id = req.query.entityid; -// console.log(id) -// Entities.findOne({where : { id : id },attributes: ['process_instance_id'] }) -// .then(data => { -// console.log(data) -// const processInstanceId = data.dataValues.process_instance_id; -// task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); - -// task_id.then(function(task_id){ -// console.log(task_id) - -// if(task_id != false) -// { -// value = false; -// camundaHelper.financialsTaskComplete(task_id,value) -// } -// }); -// }); -// setTimeout(()=>{ -// res.send({'status':200,'message':"success",'data':"No data"}); -// },1000) -// logMsg.info("Cheker Completed Success"); -// } -// catch(err) { -// res.status(500).send({'status':404, -// message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" -// }); -// } - -// }; exports.Reassign = async (req, res) => { try { - const id = req.query.id; + const id = req.query.entityid; + console.log(id); Entities.findOne({where : { id : id },attributes: ['process_instance_id'] }) .then(data => { diff --git a/app/routes/routes.js b/app/routes/routes.js index 4009f7d..d80f3b5 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -9,6 +9,7 @@ module.exports = app => { router.get("/camunda", financials.camunda); + /** * @swagger * /api/ConsolidatedSummary: @@ -876,6 +877,7 @@ module.exports = app => { */ router.get("/TaskComplete", master.TaskComplete); + /** * @swagger * /api/ReInitiate: @@ -911,10 +913,29 @@ module.exports = app => { router.get("/ReInitiate", master.ReInitiate); + /** +* @swagger +* /api/Reassign: +* get: +* summary: Reassign +* description: Reassign +* parameters: +* - in: query +* name: id +* schema: +* type: integer +* required: true +* description: primary id +* example: 6 +* responses: +* 200: +* description: success +*/ router.get("/Reassign", master.Reassign); + //router.post("/doWorkPromise", master.doWorkPromise); //router.get("/test", master.test); diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js index e652586..9f2d45a 100644 --- a/app/services/camunda.helper.js +++ b/app/services/camunda.helper.js @@ -49,15 +49,15 @@ const URL = process.env.CAMUNDA_URL body: myJSONObject }, function (error, response, body){ let data = body; - + if(data.length) { task_id = data[0].id; resolve(task_id); } - else - { - resolve(false); + else + { + resolve(false); } }); @@ -75,15 +75,17 @@ const URL = process.env.CAMUNDA_URL { try { - + const task_complete_url = URL+"task/"+taskid+"/complete"; const myJSONObject = {"variables":{"review_status":{"value":value}}}; + request({ url: task_complete_url, method: "POST", json: true, body: myJSONObject }, function (error, response, body){ + return body; });