diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 207cd74..594e57d 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -710,26 +710,53 @@ exports.camunda = async (req, res) => { const cin = "test"; const user = "test"; - //let promise = Promise.resolve(); - promiseA = new Promise((resolve, reject) => { - instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; - taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - return taskid; - }); + var camunda_status; + instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + const taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + taskid.then(function(result){ - setTimeout(function(){ - promiseB = promiseA.then(function(taskid){ - console.log(taskid); - camunda_status = camundaHelper.financialsFormVariables(taskid); - return camunda_status; - }) - },2000); + 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); + //console.log(camunda_status); + // function one(){ + // console.log("one") + // instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + // return taskid; + // console.log(taskid); + // } + + // one().then(function(taskid){ console.log(taskid); }); + + + //let promise = Promise.resolve(); + // promiseA = new Promise((resolve, reject) => { + // instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + // taskid.then(function(taskid){ + // console.log(taskid); + // }) + // }); + + // setTimeout(function(){ + // promiseB = promiseA.then(function(taskid){ + // console.log(taskid); + // camunda_status = camundaHelper.financialsFormVariables(taskid); + // return camunda_status; + // }) + // },2000); - setTimeout(function(){ - promiseB.then(function(camunda_status){ - Promise.resolve(res.send({'status':200,'camunda': camunda_status })) - }) - },2000); + // setTimeout(function(){ + // promiseB.then(function(camunda_status){ + // Promise.resolve(res.send({'status':200,'camunda': camunda_status })) + // }) + // },2000); } catch(err) { diff --git a/app/routes/routes.js b/app/routes/routes.js index f4e0f6b..964392d 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -8,7 +8,7 @@ module.exports = app => { var router = require("express").Router(); - //router.get("/camunda", financials.camunda); + router.get("/camunda", financials.camunda); /** * @swagger * /api/ConsolidatedSummary: