From 46d057d94923e62ab98964ca35efe2adebaff244 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:02:12 +0530 Subject: [PATCH] susee --- .gitignore | 1 + app/controllers/creditpd.controller.js | 149 ++++++++++++++----------- 2 files changed, 84 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index df4508d..49daa90 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /storage/uploads/ !storage storage/* +**/storage/**/*.jpg !storage/uploads/ diff --git a/app/controllers/creditpd.controller.js b/app/controllers/creditpd.controller.js index 4a1ca22..c6edb5e 100644 --- a/app/controllers/creditpd.controller.js +++ b/app/controllers/creditpd.controller.js @@ -62,35 +62,41 @@ exports.PullCreditPdData = async (req, res) => // create creditGeneralInormationData resPonse.length = 0 ; // clear array datas - for (const [key, value] of Object.entries(tempData)) { - if (key == "Loan details" || key =="Borrower & Guarantor Details" || key == "Officer Details") { - for (var [keys, element] of Object.entries(value)) { - if ( Array.isArray(element) == true ) { - element.forEach(async(element , index) => { - if ( keys == 'borrower_details' && index == 0 ) { - Object.assign( obj , {name : element['borrower_name']}) - Object.assign(obj, { ref_no: req.body.pdid , product :req.body.product , case_no :req.body.caseno}); - } - }); - } - else - { - if ( key == "Borrower & Guarantor Details" && keys == 'common_remarks') { Object.assign( obj , {remarks : element}) } - if ( keys == 'loan_amount') { { Object.assign( obj , { loan_amount : element })} }; - if ( key == "Officer Details") { - if (moment(element, "DD/MM/YYYY hh:mm:ss A", true).isValid() == true) { - var mydate = moment(element, "DD/MM/YYYY hh:MM:ss A"); // convert dd/mm/yyyy to yyyy/mm/dd - var my_date = moment(mydate).format("YYYY-MM-DD HH:mm:ss A") - Object.assign( obj, { [keys] : my_date }); - } - else{ - Object.assign(obj, { [ keys ] : element }); - } - } - } - } - } - } + for (const [key, value] of Object.entries(tempData)) + { + if (key == "Loan details" || key =="Borrower & Guarantor Details" || key == "Officer Details") + { + for (var [keys, element] of Object.entries(value)) + { + if ( Array.isArray(element) == true ) + { + element.forEach(async(element , index) => { + if ( keys == 'borrower_details' && index == 0 ) + { + Object.assign( obj , {name : element['borrower_name']}) + Object.assign(obj, { ref_no: req.body.pdid , product :req.body.product , case_no :req.body.caseno}); + } + }); + } + else + { + if ( key == "Borrower & Guarantor Details" && keys == 'common_remarks') { Object.assign( obj , {remarks : element}) } + if ( keys == 'loan_amount') { { Object.assign( obj , { loan_amount : element })} }; + if ( key == "Officer Details") + { + if (moment(element, "DD/MM/YYYY hh:mm:ss A", true).isValid() == true) { + var mydate = moment(element, "DD/MM/YYYY hh:MM:ss A"); // convert dd/mm/yyyy to yyyy/mm/dd + var my_date = moment(mydate).format("YYYY-MM-DD HH:mm:ss A") + Object.assign( obj, { [keys] : my_date }); + } + else{ + Object.assign(obj, { [ keys ] : element }); + } + } + } + } + } + } // Object.assign( obj , { ref_no : req.body.pdid }); console.log(obj); pd_id = await CreditGeneralInformation.create(obj) @@ -104,10 +110,13 @@ exports.PullCreditPdData = async (req, res) => console.log(key); creditFilter_obj_key = await CreditFilterTable.findAll({ raw: true , attributes: [ 'mul_key' ], where : { section : key , is_active : 1 , is_mul : 1}}) creditFilter_table_name = await CreditFilterTable.findAll({ raw: true, attributes: [ 'table_name' ,'section' ,'ques_key'], where : { section : key , is_active : 1 } , group: ['table_name' , 'section' ,'ques_key']}) - for (let index = 0; index < creditFilter_obj_key.length; index++) + + for (let index = 0; index < creditFilter_obj_key.length; index++) { arr_ObjKey.push(creditFilter_obj_key[index].mul_key) // store nested obj keys } + + if (key == creditFilter_table_name[0].section) { temp_obj.length = 0 ; // clear array datas obj = { }; // clear obj datas @@ -116,55 +125,63 @@ exports.PullCreditPdData = async (req, res) => for (var [arr_keys, arr_of_element] of Object.entries(value)) { if ( Array.isArray(arr_of_element) == true ) { - arr_of_element.forEach(async(iter_element , index) => { - if (Object.keys(iter_element)[0] == '0') { + arr_of_element.forEach(async(iter_element , index) => + { + if (Object.keys(iter_element)[0] == '0') + { Object.assign( obj, { [arr_keys] : iter_element }); } - // assign array of objects - else { + // assign array of objects + else + { key_for_arrays = Object.keys(iter_element); Object.values(iter_element).forEach( async (element_ele , index ) => { - if ( typeof element_ele === "object" && ( element_ele !== null )) - { - delete element_ele.display_data; - delete value.display_data; - await Credit_PdHelper.CreditPd( key_for_arrays[index] , element_ele , arr_ObjKey , obj ) - } - else - { - // temp_obj.push(iter_element) ; - Object.assign( obj, { [key_for_arrays[index]] : element_ele }); - } - }); + if ( typeof element_ele === "object" && ( element_ele !== null )) + { + delete element_ele.display_data; + delete value.display_data; + await Credit_PdHelper.CreditPd( key_for_arrays[index] , element_ele , arr_ObjKey , obj ) + } + else + { + // temp_obj.push(iter_element) ; + Object.assign( obj, { [key_for_arrays[index]] : element_ele }); + } + }); } temp_obj.push(obj) obj = { }; // clear obj datas }); - } - // end of array - // assign nestedObject datas - else if( typeof arr_of_element === "object" && ( arr_of_element !== null ) ) - { + } + // end of array + // assign nestedObject datas + else if( typeof arr_of_element === "object" && ( arr_of_element !== null ) ) + { delete arr_of_element.display_data; delete value.display_data; await Credit_PdHelper.CreditPd( arr_keys , arr_of_element , arr_ObjKey , obj ) - } - // assign object data - else - { - if (moment(arr_of_element, "DD-MM-YYYY", true).isValid() == true) { - var mydate = moment(arr_of_element, "DD-MM-YYYY"); // convert dd/mm/yyyy to yyyy/mm/dd - var my_date = moment(mydate).format("YYYY-MM-DD") - Object.assign( obj, { [arr_keys] : my_date }); - } else { - Object.assign( obj, { [arr_keys] : arr_of_element }); - } - } + } + // assign object data + else + { + if (moment(arr_of_element, "DD-MM-YYYY", true).isValid() == true) + { + var mydate = moment(arr_of_element, "DD-MM-YYYY"); // convert dd/mm/yyyy to yyyy/mm/dd + var my_date = moment(mydate).format("YYYY-MM-DD") + Object.assign( obj, { [arr_keys] : my_date }); + } + else + { + Object.assign( obj, { [arr_keys] : arr_of_element }); + } + } }// end of inner forLoop - // DB insertion - // insert array of object datas - if (temp_obj.length != 0 ) + + // DB insertion + + + if (temp_obj.length != 0 ) // insert array of object datas { temp_obj.forEach( async (temp_obj_element) => {