From df866b985c0be8fabbbb8733c2555c76a52c14de Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Fri, 8 Oct 2021 16:42:08 +0530
Subject: [PATCH] GWM

---
 app/controllers/financial.controller.js | 25 ++++++++++++++++---------
 app/services/camunda.helper.js          |  7 ++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js
index 594e57d..14209d5 100644
--- a/app/controllers/financial.controller.js
+++ b/app/controllers/financial.controller.js
@@ -69,21 +69,29 @@ exports.MenuList =  (req, res) => {
     .then(EntitiesData => {
     let data = [];
     EntitiesData.forEach((value, key)=>{ 
-      // instancesid = value.dataValues.process_instance_id;
-      // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); console.log(taskid)
-      // camunda_status = camundaHelper.financialsFormVariables(taskid);
+      var camunda_status;
+      instancesid = value.dataValues.process_instance_id;
+      // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); 
+      // taskid.then(function(result){
+      // formVariable = camundaHelper.financialsFormVariables(result);
+      // formVariable.then(function(form_result){  
+      //   camunda_status = JSON.parse(form_result);
+      //   obj_data = { ...value.dataValues ,status:camunda_status , statementsmasterrData:MasterData }
+      //   data.push(obj_data);
+      //  }); 
+      // });
       obj_data = { ...value.dataValues , statementsmasterrData:MasterData }
-    
       data.push(obj_data);
+      
     }); // end of EntitiesData foreach
 
+    setTimeout(()=>{
     // below code for overall sum object push process 
     sum_data = { ...{'losid':losid,'bizname':"Consolidated Financials Summary",'is_consolidated_api_call':1} , statementsmasterrData:MasterData }; 
     data.push(sum_data);
-
     // send respose to FE
     res.send({'status':200,'message':"success",'data':data});
-    
+    },5000)
     });  // end of findall EntitiesData 
     }); // end of findall masters datas
     }  // end of starter function if condition
@@ -714,9 +722,8 @@ exports.camunda = async (req, res) => {
     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 });
+    const formVariable = camundaHelper.financialsFormVariables(result);
+    formVariable.then(function(form_result){  camunda_status = form_result });
     });
      setTimeout(function(){ 
       console.log(camunda_status);
diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js
index 01e7e83..5755b0e 100644
--- a/app/services/camunda.helper.js
+++ b/app/services/camunda.helper.js
@@ -50,7 +50,12 @@ const URL =  process.env.CAMUNDA_URL
         }, function (error, response, body){ 
             let data = body;
             task_id = data[0].id; 
-            resolve(task_id); 
+            if(task_id)
+            {  
+                resolve(task_id); 
+            } 
+            else{ resolve(false); }
+            
         });
         
       });