From 97601c032cd01d40af152689176fb5bce1547f0d Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 12 Oct 2018 14:54:44 +0530 Subject: [PATCH 01/26] PD --- api/application/controllers/PD_Controller.php | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index d77ac725..97c587bd 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -177,12 +177,7 @@ class PD_Controller extends REST_Controller { /********For Save New PD while Trigger****/ - /* - sample data - { - "pd_details":{ "fk_lender_id": "1", "lender_applicant_id":"12458","fk_product_id":"2","fk_subproduct_id":"1","fk_pd_type":"2", "pd_status":"2","pd_specific_clarification":"nothing","createdon":"2017","fk_createdby":"2","fk_pd_allocation_type":"3","fk_pd_allocated_to":"1","fk_pd_template_id":"2","fk_customer_segment":"1","pd_officier_final_judgement":"54561","pd_agency_id":"1","loan_amount":"1589655","addressline1":"1", "addressline2":"2", "addressline3":"3", "fk_city":"1", "fk_state":"2", "pincode":"966852"} - } - */ + public function triggerNewPD_post() { @@ -197,7 +192,8 @@ class PD_Controller extends REST_Controller { $count = 0; /***********************CHOOSE PD TEMPALATE*********************/ - + if($pd_details['pd_status'] == TRIGGERED;) + { $fields = array('fk_template_id'); $where_condition_array = array('fk_lender_id'=>1 ,'fk_product_id'=> 1,'fk_customer_segment'=> 1,'isactive' => 1); @@ -210,7 +206,7 @@ class PD_Controller extends REST_Controller { { $pd_details['fk_pd_template_id'] = $choosed_template_id[0]['fk_template_id']; } - + } /***********************PD ALLOCATION TYPE PROCESS **********/ @@ -276,10 +272,10 @@ class PD_Controller extends REST_Controller { /***********************END OF PD ALLOCATION TYPE AND PROCESS***********/ $pd_details['pd_date_of_initiation'] = date("Y-m-d H:i:s"); - if($pd_details['pd_status'] == "" || $pd_details['pd_status'] == null) - { - $pd_details['pd_status'] = DRAFT; - } + // if($pd_details['pd_status'] == "" || $pd_details['pd_status'] == null) + // { + // $pd_details['pd_status'] = DRAFT; + // } $pd_id = $this->PD_Model->saveRecords($pd_details,PDTRIGGER); @@ -365,6 +361,7 @@ class PD_Controller extends REST_Controller { if($pd_id_modified != null || $pd_id_modified != '' && $count != 0) { + PDALERTS::pdnotification($pd_id); $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = true; From 1661411850ab7e2863a9494323fc05a7d6a726f2 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 12 Oct 2018 17:56:07 +0530 Subject: [PATCH 02/26] CATEGORY CHNAGED --- api/application/config/constants.php | 6 +- api/application/controllers/PD_Controller.php | 26 +++---- .../Template_Management_Controller.php | 8 +-- .../models/Template_Management_Model.php | 67 ++++++++++--------- 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 27333c05..2f28e171 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfLenders'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateCategories'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -228,8 +228,8 @@ defined('TEMPLATEID') OR define('TEMPLATEID','template_id'); defined('LENDERTEMPLATE') OR define('LENDERTEMPLATE','m_template_lender_map'); defined('LENDERTEMPLATEID') OR define('LENDERTEMPLATEID','template_lender_map_id'); -defined('TEMPLATECATAGORYWEIGHTAGE') OR define('TEMPLATECATAGORYWEIGHTAGE','m_template_catagory_weightage'); -defined('TEMPLATECATAGORYWEIGHTAGEID') OR define('TEMPLATECATAGORYWEIGHTAGEID','template_catagory_weightage_id'); +defined('TEMPLATECATEGORYWEIGHTAGE') OR define('TEMPLATECATEGORYWEIGHTAGE','m_template_category_weightage'); +defined('TEMPLATECATEGORYWEIGHTAGEID') OR define('TEMPLATECATEGORYWEIGHTAGEID','template_category_weightage_id'); defined('TEMPLATEQUESTION') OR define('TEMPLATEQUESTION','m_template_question'); defined('TEMPLATEQUESTIONID') OR define('TEMPLATEQUESTIONID','template_question_id'); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 97c587bd..fc845ac8 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -192,20 +192,20 @@ class PD_Controller extends REST_Controller { $count = 0; /***********************CHOOSE PD TEMPALATE*********************/ - if($pd_details['pd_status'] == TRIGGERED;) + if($pd_details['pd_status'] == TRIGGERED) { - $fields = array('fk_template_id'); - - $where_condition_array = array('fk_lender_id'=>1 ,'fk_product_id'=> 1,'fk_customer_segment'=> 1,'isactive' => 1); - - $table = LENDERTEMPLATE; - - $choosed_template_id = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,$table); - - if(count($choosed_template_id)) - { - $pd_details['fk_pd_template_id'] = $choosed_template_id[0]['fk_template_id']; - } + $fields = array('fk_template_id'); + + $where_condition_array = array('fk_lender_id'=>1 ,'fk_product_id'=> 1,'fk_customer_segment'=> 1,'isactive' => 1); + + $table = LENDERTEMPLATE; + + $choosed_template_id = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,$table); + + if(count($choosed_template_id)) + { + $pd_details['fk_pd_template_id'] = $choosed_template_id[0]['fk_template_id']; + } } /***********************PD ALLOCATION TYPE PROCESS **********/ diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 2419dc5e..411022c0 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -137,16 +137,16 @@ class Template_Management_Controller extends REST_Controller { //print_r($template_category_details);die(); foreach($template_category_details as $template_category_detail) { - if($template_category_detail['template_catagory_weightage_id'] != null || $template_category_detail['template_catagory_weightage_id'] != "") + if($template_category_detail['template_category_weightage_id'] != null || $template_category_detail['template_category_weightage_id'] != "") { - $where_condition_array = array('template_catagory_weightage_id'=>$template_category_detail['template_catagory_weightage_id']); - $modified = $this->Template_Management_Model->updateRecords($template_category_detail,TEMPLATECATAGORYWEIGHTAGE,$where_condition_array); + $where_condition_array = array('template_category_weightage_id'=>$template_category_detail['template_category_weightage_id']); + $modified = $this->Template_Management_Model->updateRecords($template_category_detail,TEMPLATECATEGORYWEIGHTAGE,$where_condition_array); if($modified != "" || $modified != null){ $count++; } } else { - $id = $this->Template_Management_Model->saveRecords($template_category_detail,TEMPLATECATAGORYWEIGHTAGE); + $id = $this->Template_Management_Model->saveRecords($template_category_detail,TEMPLATECATEGORYWEIGHTAGE); if($id != "" || $id != null){ $count++; } } } diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index cb5a8c50..ed1e01b3 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -79,39 +79,42 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateCategories($template_id) { - $this->db->SELECT('TEMPLATECATAGORYWEIGHTAGE.template_catagory_weightage_id, TEMPLATECATAGORYWEIGHTAGE.fk_question_catagory_id, TEMPLATECATAGORYWEIGHTAGE.fk_template_id, TEMPLATECATAGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATAGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATAGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATAGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATAGORYWEIGHTAGE.isactive, TEMPLATECATAGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); - $this->db->FROM(TEMPLATECATAGORYWEIGHTAGE.' as TEMPLATECATAGORYWEIGHTAGE'); - $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATAGORYWEIGHTAGE.template_catagory_weightage_id = QUESTIONCATEGORY.question_categroy_id'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATAGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATAGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); - $this->db->WHERE('TEMPLATECATAGORYWEIGHTAGE.fk_template_id',$template_id); + $this->db->SELECT('QUESTIONCATEGORY.question_categroy_id,QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + // $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); $data = $this->db->GET()->result_array(); return $data; } - // public function getTemplateQuestionAnswers($template_id) - // { + public function getTemplateQuestionAnswers($template_id) + { - // $this->db->SELECT('TEMPLATECATAGORYWEIGHTAGE.template_catagory_weightage_id, TEMPLATECATAGORYWEIGHTAGE.fk_question_catagory_id, TEMPLATECATAGORYWEIGHTAGE.fk_template_id, TEMPLATECATAGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATAGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATAGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATAGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATAGORYWEIGHTAGE.isactive, TEMPLATECATAGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); - // $this->db->FROM(TEMPLATECATAGORYWEIGHTAGE.' as TEMPLATECATAGORYWEIGHTAGE'); - // $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATAGORYWEIGHTAGE.template_catagory_weightage_id = QUESTIONCATEGORY.question_categroy_id'); - // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATAGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid'); - // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATAGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); - // $this->db->WHERE('TEMPLATECATAGORYWEIGHTAGE.fk_template_id',$template_id); - // $categories = $this->db->GET()->result_array(); - - // if(count($categories)) - // { - - // foreach($categories as $key => $category) - // { - // $this->db->SELECT('TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by, DATE_FORMAT(TEMPLATEQUESTION.createdon,"%d/%m/%Y") as createdon, TEMPLATEQUESTION.fk_createdby, DATE_FORMAT(TEMPLATEQUESTION.updatedon,"%d/%m/%Y") as updatedon, TEMPLATEQUESTION.fk_updatedby, TEMPLATEQUESTION.isactive,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); - // $this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); - // $this->db->JOIN(QUESTIONS.' as QUESTIONS','TEMPLATEQUESTION.fk_question_id = QUESTIONS.question_id'); - // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid'); - // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); - // $this->db->WHERE('TEMPLATEQUESTION.fk_template_id',$template_id); - // $questions = $this->db->GET()->result_array(); + $this->db->SELECT('QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE'); + $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); + $categories = $this->db->GET()->result_array(); + //print_r($categories); + if(count($categories)) + { + + foreach($categories as $category_key => $category) + { + + $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, DATE_FORMAT(TEMPLATEQUESTION.createdon,"%d/%m/%Y") as createdon, TEMPLATEQUESTION.fk_createdby, DATE_FORMAT(TEMPLATEQUESTION.updatedon,"%d/%m/%Y") as updatedon, TEMPLATEQUESTION.fk_updatedby, TEMPLATEQUESTION.isactive,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->FROM(QUESTIONS.' as QUESTIONS'); + $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.template_question_id','LEFT'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('QUESTIONS.fk_question_category',$category['fk_question_category_id']); + $questions = $this->db->GET()->result_array(); + $categories[$category_key]['questions'] = $questions; // if(count($questions)) // { @@ -120,9 +123,11 @@ class Template_Management_Model extends SPARQ_Model { // } // } - // } + } - // } - // } + } + +return $categories; + } } \ No newline at end of file From 33fe8070a9557c33464ab0cc7b53d34c9f1ce1f7 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 13 Oct 2018 11:35:46 +0530 Subject: [PATCH 03/26] TEMPLAET QUESTION --- api/application/config/constants.php | 2 +- .../models/Question_Management_Model.php | 6 +- .../models/Template_Management_Model.php | 55 ++++++++++++------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 2f28e171..6a7bd3db 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateCategories'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateQuestionAnswers'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/models/Question_Management_Model.php b/api/application/models/Question_Management_Model.php index 8603fa8b..7045858e 100644 --- a/api/application/models/Question_Management_Model.php +++ b/api/application/models/Question_Management_Model.php @@ -14,15 +14,15 @@ class Question_Management_Model extends SPARQ_Model { { - $this->db->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_catagory,QUESTIONCATEGORY.categroy_name, QUESTIONS.fk_question_answertype,QUESTIONANSWERTYPE.answer_type_name,QUESTIONS.isactive, QUESTIONS.createdon, QUESTIONS.fk_createdby, QUESTIONS.updatedon, QUESTIONS.fk_updatedby,concat(USERPROFILE.first_name," " ,USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_category,QUESTIONCATEGORY.categroy_name, QUESTIONS.fk_question_answertype,QUESTIONANSWERTYPE.answer_type_name,QUESTIONS.isactive, QUESTIONS.createdon, QUESTIONS.fk_createdby, QUESTIONS.updatedon, QUESTIONS.fk_updatedby,concat(USERPROFILE.first_name," " ,USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); $this->db->FROM(QUESTIONS.' as QUESTIONS'); $this->db->JOIN(QUESTIONANSWERTYPE.' as QUESTIONANSWERTYPE','QUESTIONS.fk_question_answertype = QUESTIONANSWERTYPE.question_answer_type_id'); - $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','QUESTIONS.fk_question_catagory = QUESTIONCATEGORY.question_categroy_id'); + $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','QUESTIONS.fk_question_category = QUESTIONCATEGORY.question_categroy_id'); $this->db->JOIN(USERPROFILE.' as USERPROFILE','QUESTIONS.fk_createdby = USERPROFILE.userid'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','QUESTIONS.fk_updatedby = USERPROFILE1.userid','LEFT'); if($category_id != null || $category_id != '') { - $this->db->WHERE('QUESTIONS.fk_question_catagory',$category_id); + $this->db->WHERE('QUESTIONS.fk_question_category',$category_id); } $this->db->ORDER_BY('QUESTIONS.question_id',$sort); $this->db->LIMIT($page,$limit); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index ed1e01b3..b7f2bd9d 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -89,40 +89,53 @@ class Template_Management_Model extends SPARQ_Model { return $data; } + + /* + DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon,TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby + + */ public function getTemplateQuestionAnswers($template_id) { - $this->db->SELECT('QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); - $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE'); - $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); - $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); - $categories = $this->db->GET()->result_array(); - //print_r($categories); - if(count($categories)) - { - + $this->db->SELECT('QUESTIONCATEGORY.question_categroy_id,QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, TEMPLATECATEGORYWEIGHTAGE.isactive'); + $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + $categories = $this->db->GET()->result_array(); + + if(count($categories)) + { + /* + DATE_FORMAT(TEMPLATEQUESTION.createdon,"%d/%m/%Y") as createdon, TEMPLATEQUESTION.fk_createdby, DATE_FORMAT(TEMPLATEQUESTION.updatedon,"%d/%m/%Y") as updatedon, TEMPLATEQUESTION.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby + */ foreach($categories as $category_key => $category) { - $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, DATE_FORMAT(TEMPLATEQUESTION.createdon,"%d/%m/%Y") as createdon, TEMPLATEQUESTION.fk_createdby, DATE_FORMAT(TEMPLATEQUESTION.updatedon,"%d/%m/%Y") as updatedon, TEMPLATEQUESTION.fk_updatedby, TEMPLATEQUESTION.isactive,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); $this->db->FROM(QUESTIONS.' as QUESTIONS'); $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.template_question_id','LEFT'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->WHERE('QUESTIONS.fk_question_category',$category['fk_question_category_id']); $questions = $this->db->GET()->result_array(); - $categories[$category_key]['questions'] = $questions; + - // if(count($questions)) - // { - // foreach($questions as $key => $question) - // { + if(count($questions)) + { - // } - // } + foreach($questions as $answer_key => $question) + { + $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage, TEMPLATEANSWERWEIGHTAGE.isactive'); + $this->db->FROM(QUESTIONANSWERS.' as QUESTIONANSWERS'); + $this->db->JOIN(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id AND QUESTIONANSWERS.question_answer_id = TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id','LEFT'); + $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); + $answers = $this->db->GET()->result_array(); + $questions[$answer_key]['answers'] = $answers; + } + } + $categories[$category_key]['questions'] = $questions; } } From 01ba037b6500b303ca0d801ab5e238d536ded066 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 13 Oct 2018 17:30:30 +0530 Subject: [PATCH 04/26] PD ALLOCATION --- api/application/config/constants.php | 7 ++-- api/application/config/customconfig_one.php | 14 ++++---- api/application/controllers/PD_Controller.php | 33 +++++++++-------- api/application/helpers/pdalerts_helper.php | 2 +- api/application/models/PD_Model.php | 35 ++++++++++++++++++- .../models/Template_Management_Model.php | 2 +- 6 files changed, 67 insertions(+), 26 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 6a7bd3db..76d2ef2b 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -85,9 +85,9 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code // define login route name for token verification -//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateQuestionAnswers'); // no errors +//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListPDOfficers'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -117,6 +117,9 @@ defined('DRAFT') OR define('DRAFT','17'); /*******************End Of Constants PD status**************************/ +/*******************Define Constants for Table Names and Primarykeys**************************/ +defined('PDTEAM_CTY_PRODUCT_CS_COMBINATIONS') OR define('PDTEAM_CTY_PRODUCT_CS_COMBINATIONS','PDTEAM_CTY_PRODUCT_CS_COMBINATIONS'); + /*******************Define Constants for Table Names and Primarykeys**************************/ defined('INDUSTRYCLASSIFICATION') OR define('INDUSTRYCLASSIFICATION','m_industry_classification'); diff --git a/api/application/config/customconfig_one.php b/api/application/config/customconfig_one.php index 55ac134e..79b4f0fd 100644 --- a/api/application/config/customconfig_one.php +++ b/api/application/config/customconfig_one.php @@ -17,13 +17,13 @@ RwIDAQAB /* public key for encrypt AWS JWT LENDER_USER_POOL_ID_TOKEN */ $config['jwt_public_key_lender_dev'] = '-----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqTsyy4r3nrjumED4To7w -r1rfjMEzL+hcF8OwGm89aHoEzKLZqr12uQw3eK7tVV97QV8aYOi0zUinHlOVx1PM -Dgik5jW8aCBvGM5S6PAZXn3fj59HYtKL0HIQ1cxaoIUVXjRHD/QkcCEZuG5dIxij -8NOCnE+Ip2nVm9WXbKSb/KXuF+p69Osm8VpVz7hpa/Hcf50iOe3R82dpCytUKBX4 -eq0HukzvikhFNglSw5GV0pK0syZxvu/ERMg3ja4r9an8fMayVS2YpybtRl6CCCVP -7LKZG/M5n9UutA8GWMFeDw0qcI3kLdo6ijbdpGDUqjs+OY6MBH+uKLrzsqVNTamC -RwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvWF8GBAVs77bKzpOtnu +mBGQ9kC11Pqw64avOsTE8T0mEbPWCSedqP8ShZtoFRUnZbfCVYcYPkvl+Gx5nxrY +OvrlKxtVVbrcifuKJJ/qjSSUZucQVX1aeWjYofteevcPjJxa5JEQWCjRSeblbbit +KFtoiCHH5lOFOJ9Up25AbSzOfvKT8Q3IuJau+iDyaK7PAJk4zPMtIKwk4Xw0LXVa +VmOght1/MKQnkF1YhV58HUoUirrU00ZNf+aNGQ/RW0Egjdhd+pm0R6fXXDa287fE +Yq6J1S/I5ZhFdb5kxPcuoj3K8ZQ1iIAw4euy0fn0bver8KOQCWCBxlnMUVDzyy0x +DwIDAQAB -----END PUBLIC KEY-----'; /* public key for encrypt AWS JWT VENDOR_USER_POOL_ID_TOKEN diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index fc845ac8..738a92c1 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -590,11 +590,10 @@ class PD_Controller extends REST_Controller { $records = $this->post('records'); if($records['schedule_time'] != "" || $records['schedule_time'] != null) { - $id = $this->PD_Model->saveRecords($records,PDSCHEDULE); - if($id != '' || $id != null) - { + //$id = $this->PD_Model->saveRecords($records,PDSCHEDULE); + $where_condition_array = array('pd_id' => $records['fk_pd_id']); - $temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>$records['createdon']); + $temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>$records['createdon'],'scheduled_on'=>$records['schedule_time']); $pd_id_modified = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); if($pd_id_modified != "" || $pd_id_modified != null) @@ -612,7 +611,7 @@ class PD_Controller extends REST_Controller { $data['msg'] = 'Not Updated! Try Later'; $this->response($data,REST_Controller::HTTP_OK); } - } + } @@ -631,12 +630,13 @@ class PD_Controller extends REST_Controller { $where_condition_array = array('pd_id'=>$pdid); $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER); - //2.Get Team Map Details based on step 1 + //2.Get Team ID based on Lender ID if(count($res_array)) { - $where_condition_array = array('fk_city_id' => $res_array[0]['fk_city'],'fk_lender_id' => $res_array[0]['fk_lender_id']); - $temp_city_id = $this->PD_Model->selectRecords(PDTEAMMAP,$where_condition_array,$limit=0,$offset=0); - + //$where_condition_array = array('lender_id' => $res_array[0]['fk_lender_id'],'city_id' =>$res_array[0]['fk_city'] ,'cs_id' =>$res_array[0]['fk_customer_segment'] ,'product_id' =>$res_array[0]['fk_product_id']); + $where_condition_array = array('lender_id' => 2,'city_id' => 17 ,'cs_id' => 1 ,'product_id' => 1); + $temp_city_id = $this->PD_Model->selectRecords(PDTEAM_CTY_PRODUCT_CS_COMBINATIONS,$where_condition_array,$limit=0,$offset=0); + //print_r($temp_city_id);die(); if(count($temp_city_id)) { if(isset($temp_city_id[0]['team_type'])) @@ -651,9 +651,9 @@ class PD_Controller extends REST_Controller { { //select list of pd officers based on pd type, product, customer segment, and team from table (t_pd_officiers_details) and choose minimun allocated one and assign pd Officer and change status form TRIGGERED to ALLOCATED - $fields = array('fk_user_id','allocated','scheduled','inprogress'); + $fields = array('fk_user_id','fk_pd_type_id','allocated','scheduled','inprogress'); - $where_condition_array = array('fk_pd_type_id' => $res_array[0]['fk_pd_type'],'fk_team_id' => $temp_city_id[0]['fk_team_id'],'fk_customer_segment' => $res_array[0]['fk_customer_segment'],'fk_product_id' => $res_array[0]['fk_product_id'],'isactive' => 1); + $where_condition_array = array('fk_team_id' => $temp_city_id[0]['pdteam_id'],'isactive' => 1); $list_of_pd_officers = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDOFFICIERSDETAILS); @@ -665,9 +665,10 @@ class PD_Controller extends REST_Controller { $this->db->FROM(USERPROFILE.' as USERPROFILE'); $this->db->WHERE('USERPROFILE.userid',$pdofficer['fk_user_id']); $names = $this->db->GET()->result_array(); + if(count($names)){ $list_of_pd_officers[$key]['first_name'] = $names[0]['first_name']; $list_of_pd_officers[$key]['last_name'] = $names[0]['last_name']; - + } } $data['dataStatus'] = true; @@ -717,12 +718,16 @@ class PD_Controller extends REST_Controller { */ public function listLessPDDetails_get() { - $page = 0;$limit = 50;$sort = 'DESC'; + $page = 0;$limit = 50;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate =""; if($this->get('page')) { $page = $this->get('page'); } if($this->get('limit')){ $limit = $this->get('limit'); } if($this->get('sort')) { $sort = $this->get('sort'); } + if($this->get('pdofficerid')) { $pdofficerid = $this->get('pdofficerid'); } + if($this->get('datetype')) { $datetype = $this->get('datetype'); } + if($this->get('fdate')) { $fdate = $this->get('fdate'); } + if($this->get('tdate')) { $tdate = $this->get('tdate'); } - $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort); + $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate); if($result_data['data_status'] == true) { diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index e0d64a57..1cecea72 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -107,7 +107,7 @@ class PDALERTS } } - $msg = "PD for Lender Applicant ID -:". $core_details[0]['lender_applicant_id'] ." has been ". $core_details[0]['pd_status_name']; // status base configurable + $msg = "PD for Lender Applicant ID -:". $core_details[0]['lender_applicant_id'] ." has been ". $core_details[0]['pd_status_name']; // status base configurable //print_r($mobile_nos_to_send_notification); foreach($mobile_nos_to_send_notification as $no) { diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 0b6d1659..8d861ede 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -11,7 +11,7 @@ class PD_Model extends SPARQ_Model { } - public function listLessPDDetails($page,$limit,$sort)// $page represents mysql offset + public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate)// $page represents mysql offset { $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); @@ -29,9 +29,42 @@ class PD_Model extends SPARQ_Model { $this->db->JOIN(ENTITY.' as AGENCY','PDTRIGGER.pd_agency_id = AGENCY.entity_id','LEFT'); $this->db->JOIN(STATE.' as STATE','PDTRIGGER.fk_state = STATE.state_id ','LEFT'); $this->db->JOIN(CITY.' as CITY','PDTRIGGER.fk_city = CITY.city_id','LEFT'); + + if($pdofficerid != "" || $pdofficerid != null) + { + $this->db->WHERE('PDTRIGGER.fk_pd_allocated_to',$pdofficerid); + } + + if($datetype != "" || $datetype != null) + { + if($datetype == 1) + { + if($fdate != "" || $fdate != null) + { + $this->db->WHERE('PDTRIGGER.pd_date_of_initiation >=',$fdate); + } + if($tdate != "" || $tdate != null) + { + $this->db->WHERE('PDTRIGGER.pd_date_of_initiation <=',$tdate); + } + } + else if($datetype == 2) + { + if($fdate != "" || $fdate != null) + { + $this->db->WHERE('PDTRIGGER.scheduled_on >=',$fdate); + } + if($tdate != "" || $tdate != null) + { + $this->db->WHERE('PDTRIGGER.scheduled_on <=',$tdate); + } + } + + } $this->db->ORDER_BY('PDTRIGGER.pd_id',$sort); $this->db->LIMIT($limit,$page); $result_array = $this->db->GET()->result_array(); + print_r($this->db->last_query()); if(count($result_array) != 0) { foreach($result_array as $key => $result) diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index b7f2bd9d..29830105 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -140,7 +140,7 @@ class Template_Management_Model extends SPARQ_Model { } -return $categories; + return $categories; } } \ No newline at end of file From 01d62602a0bf771024febc083827d8438bee0c9b Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 13 Oct 2018 18:01:09 +0530 Subject: [PATCH 05/26] PD --- api/application/controllers/Template_Management_Controller.php | 1 + api/application/models/PD_Model.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 411022c0..bada6412 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -105,6 +105,7 @@ class Template_Management_Controller extends REST_Controller { else { + $id = $this->Template_Management_Model->saveRecords($template_lender_detail,LENDERTEMPLATE); if($id != "" || $id != null){ $count++; } } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 8d861ede..86900672 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -64,7 +64,7 @@ class PD_Model extends SPARQ_Model { $this->db->ORDER_BY('PDTRIGGER.pd_id',$sort); $this->db->LIMIT($limit,$page); $result_array = $this->db->GET()->result_array(); - print_r($this->db->last_query()); + //print_r($this->db->last_query()); if(count($result_array) != 0) { foreach($result_array as $key => $result) From c4a7c1d47330b9e7e670286111a0da298535caf5 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 13 Oct 2018 19:28:10 +0530 Subject: [PATCH 06/26] PD --- api/application/controllers/PD_Controller.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 738a92c1..9129d1fd 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -359,6 +359,11 @@ class PD_Controller extends REST_Controller { $where_condition_array = array('pd_id' => $pd_details['pd_id']); $pd_id_modified = $this->PD_Model->updateRecords($pd_details,PDTRIGGER,$where_condition_array); + if($records['pd_status'] == TRIGGERED) + { + // Create entries on `t_pd_category_weightage` table from Template Category weightage + } + if($pd_id_modified != null || $pd_id_modified != '' && $count != 0) { PDALERTS::pdnotification($pd_id); @@ -804,7 +809,16 @@ class PD_Controller extends REST_Controller { } - + /* for Load Whole PD Template for PD Conduct Screen*/ + // public function loadFullTemplate_get() + // { + // $template_id = ""; + // if($this->get('template_id')) { $template_id = $this->get('template_id'); } + // if($template_id != "" || $template_id != null) + // { + + // } + // } From 89741dc55325c3398fb41501440caa23e4485e49 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 15 Oct 2018 09:54:11 +0530 Subject: [PATCH 07/26] common master change for PD Team : ps --- api/application/config/routes.php | 4 +- .../controllers/Common_Masters_Controller.php | 309 +++++++++++++++--- .../models/Common_Masters_Model.php | 14 + 3 files changed, 286 insertions(+), 41 deletions(-) diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 6c2cac2b..9948ee97 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -70,8 +70,8 @@ $route['getPDNotificationsList'] = 'Common_Masters_Controller/getPDNotifications $route['getListOfPDTeam'] = 'Common_Masters_Controller/getListOfPDTeam'; $route['getPdManage'] = 'Common_Masters_Controller/getPdManage'; $route['savePdTeamManage'] = 'Common_Masters_Controller/savePdTeamManage'; - -$route['getListOfPDTeamMap'] = 'Common_Masters_Controller/getListOfPDTeamMap'; +$route['getListOfPDTeamCityMapping'] = 'Common_Masters_Controller/getListOfPDTeamCityMapping'; +//$route['getListOfPDTeamMap'] = 'Common_Masters_Controller/getListOfPDTeamMap'; $route['getListOfMaster'] = 'Common_Masters_Controller/getListOfMaster'; $route['saveMaster'] = 'Common_Masters_Controller/saveMaster'; $route['saveBranch'] = 'Common_Masters_Controller/saveBranch'; diff --git a/api/application/controllers/Common_Masters_Controller.php b/api/application/controllers/Common_Masters_Controller.php index 8f42596d..e5e34bb7 100644 --- a/api/application/controllers/Common_Masters_Controller.php +++ b/api/application/controllers/Common_Masters_Controller.php @@ -456,24 +456,66 @@ class Common_Masters_Controller extends REST_Controller { $where_condition_array = array(PDTEAMID => $records[PDTEAMID]); - $pdTeamMaster = array('team_name'=>$records['team_name'],'updatedon'=>$records['updatedon'],'fk_updatedby'=>$records['fk_updatedby']); + //$pdTeamMaster = array('team_name'=>$records['team_name'],'updatedon'=>$records['updatedon'],'fk_updatedby'=>$records['fk_updatedby']); //pdteam_id, team_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive + $pdTeamMaster = array('team_name'=>$records['team_name'], + 'updatedon'=>$records['updatedon'], + 'fk_updatedby'=>$records['fk_updatedby'], + 'fk_lender_id'=>$records['fk_lender']); + $result = $this->Common_Masters_Model->updateRecords($pdTeamMaster,PDTEAM,$where_condition_array); //print_r($pdTeamMaster); if($result == true){ - $root_array = $records['temp_array']; - if(!empty($root_array)){ - foreach($root_array as $key => $value){ - - $pdTeamChild = array( - 'fk_city_id'=>$value['cityid']['city_id'], - 'fk_team_id'=>$records['pdteam_id'], - 'team_type' => 1, - 'fk_lender_id' =>$value['lenderid']['entity_id']); + //$root_array = $records['temp_array']; + $root_array_city = $records['fk_city']; + $root_array_product = $records['fk_product']; + $root_array_customersegment = $records['fk_customer_segment']; - $this->Common_Masters_Model->saveRecords($pdTeamChild,PDTEAMMAP); - }} + if(!empty($root_array_city)){ + foreach($root_array_city as $key => $value){ + + $pdTeamForCity= array( + 'fk_city_id'=>$value, + 'fk_pdteam_id'=>$result); + $this->Common_Masters_Model->saveRecords($pdTeamForCity,PDTEAMCITY); + + } + } + + if(!empty($root_array_product)){ + foreach($root_array_product as $key => $value){ + + $pdTeamForProduct = array( + 'fk_product_id'=>$value, + 'fk_pdteam_id'=>$result); + + $this->Common_Masters_Model->saveRecords($pdTeamForProduct,PDTEAMPRODUCT); + } + } + + if(!empty($root_array_customersegment)){ + foreach($root_array_customersegment as $key => $value){ + + $pdTeamForCS = array( + 'fk_cs_id'=>$value, + 'fk_pdteam_id'=>$result); + + $this->Common_Masters_Model->saveRecords($pdTeamForCS,PDTEAMCUSTOMERSEGMENT); + } + } + + // if(!empty($root_array)){ + // foreach($root_array as $key => $value){ + + // $pdTeamChild = array( + // 'fk_city_id'=>$value['cityid']['city_id'], + // 'fk_team_id'=>$records['pdteam_id'], + // 'team_type' => 1, + // 'fk_lender_id' =>$value['lenderid']['entity_id']); + + // $this->Common_Masters_Model->saveRecords($pdTeamChild,PDTEAMMAP); + // }} } @@ -496,23 +538,59 @@ class Common_Masters_Controller extends REST_Controller { else // Insert Record { - $pdTeamMaster = array('team_name'=>$records['team_name'],'fk_createdby'=>$records['fk_createdby'],'createdon'=>$records['createdon']); + //$pdTeamMaster = array('team_name'=>$records['team_name'],'fk_createdby'=>$records['fk_createdby'],'createdon'=>$records['createdon']); + $pdTeamMaster = array('team_name'=>$records['team_name'], + 'fk_createdby'=>$records['fk_createdby'], + 'createdon'=>$records['createdon'], + 'fk_lender_id'=>$records['fk_lender'], + 'team_type' => 1 + ); $result = $this->Common_Masters_Model->saveRecords($pdTeamMaster,PDTEAM); if(!empty($result)){ - $root_array = $records['temp_array']; + //$root_array = $records['temp_array']; + $root_array_city = $records['fk_city']; + $root_array_product = $records['fk_product']; + $root_array_customersegment = $records['fk_customer_segment']; - foreach($root_array as $key => $value){ + // foreach($root_array as $key => $value){ - $pdTeamChild = array( - 'fk_city_id'=>$value['cityid']['city_id'], - 'fk_team_id'=>$result, - 'team_type' => 1, - 'fk_lender_id' =>$value['lenderid']['entity_id']); + // $pdTeamChild = array( + // 'fk_city_id'=>$value['cityid']['city_id'], + // 'fk_team_id'=>$result, + // 'team_type' => 1, + // 'fk_lender_id' =>$value['lenderid']['entity_id']); - $this->Common_Masters_Model->saveRecords($pdTeamChild,PDTEAMMAP); + // $this->Common_Masters_Model->saveRecords($pdTeamChild,PDTEAMMAP); + // } + + foreach($root_array_city as $key => $value){ + + $pdTeamForCity= array( + 'fk_city_id'=>$value, + 'fk_pdteam_id'=>$result); + $this->Common_Masters_Model->saveRecords($pdTeamForCity,PDTEAMCITY); + + } + + foreach($root_array_product as $key => $value){ + + $pdTeamForProduct = array( + 'fk_product_id'=>$value, + 'fk_pdteam_id'=>$result); + + $this->Common_Masters_Model->saveRecords($pdTeamForProduct,PDTEAMPRODUCT); + } + + foreach($root_array_customersegment as $key => $value){ + + $pdTeamForCS = array( + 'fk_cs_id'=>$value, + 'fk_pdteam_id'=>$result); + + $this->Common_Masters_Model->saveRecords($pdTeamForCS,PDTEAMCUSTOMERSEGMENT); } } @@ -611,26 +689,151 @@ class Common_Masters_Controller extends REST_Controller { } /* For Get PD Team Details (Master Table info)*/ - public function getListOfPDTeam_get() - { - $result = $this->Common_Masters_Model->pdteamlist(); + // public function getListOfPDTeam_get() + // { + // $result = $this->Common_Masters_Model->pdteamlist(); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_OK); - } - } + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // } /* End Of Get PD Team Details (Master Table info)*/ + public function getListOfPDTeam_post(){ + + if(!empty($this->post())){ + $PK = $this->post('primary_key') ; + } + else{ + $PK = ''; + } + + $columns = array('m_entity.full_name as lender_name','PDTEAM.*'); + $table = PDTEAM.' as PDTEAM'; + $joins = array( + array( + 'table' => 'm_entity', + 'condition' => 'PDTEAM.fk_lender_id = m_entity.entity_id', + 'jointype' => 'INNER' + ) + ); + + if($PK != '') + { + $where_condition_array = array('PDTEAM.pdteam_id'=>$PK); + $result = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + + if(count($result) !=0){ + foreach($result as $index=>$res){ + + /**CUSTOMERSEGMENT */ + $columns = array("CUSTOMERSEGMENT.*"); + $table = PDTEAMCUSTOMERSEGMENT. ' as PDTEAMCUSTOMERSEGMENT'; + $joins = array( + array( + 'table'=>CUSTOMERSEGMENT.' as CUSTOMERSEGMENT', + 'condition'=>'PDTEAMCUSTOMERSEGMENT.fk_cs_id = CUSTOMERSEGMENT.customer_segment_id and CUSTOMERSEGMENT.isactive =1', + 'jointype'=>'JOIN'), + ); + $where_condition_array = array('PDTEAMCUSTOMERSEGMENT.fk_pdteam_id'=>$PK); + $result[$index]['CUSTOMERSEGMENT'] = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + + /**CITY */ + $columns = array("CITY.*"); + $table = PDTEAMCITY.' as PDTEAMCITY'; + $joins = array( + array('table'=>CITY.' as CITY', + 'condition'=>'PDTEAMCITY.fk_city_id = CITY.city_id and CITY.isactive = 1', + 'jointype'=>'JOIN') + ); + $where_condition_array = array('PDTEAMCITY.fk_pdteam_id'=>$PK); + $result[$index]['CITYMAP'] = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + + /**PRODUCT */ + $columns = array("PRODUCTS.*"); + $table = PDTEAMPRODUCT.' as PDTEAMPRODUCT'; + $joins = array( + array('table'=>PRODUCTS.' as PRODUCTS', + 'condition'=>'PDTEAMPRODUCT.fk_product_id = PRODUCTS.product_id and PRODUCTS.isactive =1', + 'jointype'=>'JOIN') + + ); + $where_condition_array = array('PDTEAMPRODUCT.fk_pdteam_id'=>$PK); + $result[$index]['PRODUCTS'] = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + + } + } + } + else{ + $result = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins); + } + + if(count($result) > 0){ + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result; + $this->response($data,REST_Controller::HTTP_OK); + } + else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_OK); + } + + } + + /** For validation purpose To Check duplication for Team*/ + public function getListOfPDTeamCityMapping_get() + { + + $columns = array('m_entity.full_name as lender_name','PDTEAM.*'); + $table = PDTEAM.' as PDTEAM'; + $joins = array( + array( + 'table' => 'm_entity', + 'condition' => 'PDTEAM.fk_lender_id = m_entity.entity_id', + 'jointype' => 'INNER' + ) + ); + + $result = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins); + + if(count($result) !=0){ + foreach($result as $index=>$res){ + + /**CITY */ + $columns = array("CITY.*"); + $table = PDTEAMCITY.' as PDTEAMCITY'; + $joins = array( + array('table'=>CITY.' as CITY','condition'=>'PDTEAMCITY.fk_city_id = CITY.city_id and CITY.isactive = 1','jointype'=>'JOIN') + ); + $where_condition_array = array('PDTEAMCITY.fk_pdteam_id'=>$res['pdteam_id']); + $result[$index]['CITYMAP'] = $this->Common_Masters_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + } + + } + if(count($result) > 0){ + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result; + $this->response($data,REST_Controller::HTTP_OK); + } + else{ + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_OK); + } + } /* For Get PD Team Mapping Details (Child Table info)*/ public function getListOfPDTeamMap_post(){ @@ -783,4 +986,32 @@ class Common_Masters_Controller extends REST_Controller { } } /* End of Update PD Notification Details*/ -} \ No newline at end of file + public function getListOfPdTeamCityMapping(){ + $records = $this->post('records'); + //$count = 0; + + + foreach( $records as $record){ + $where_condition_array = array(PDNOTIFICATIONID => $record[PDNOTIFICATIONID]); + $result = $this->Common_Masters_Model->updateRecords($record,PDNOTIFICATION,$where_condition_array); + // if($result == 1) + // { + // $count++; + // } + } + if($result) + { + + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + $this->response($data,REST_Controller::HTTP_OK); + } + } + } \ No newline at end of file diff --git a/api/application/models/Common_Masters_Model.php b/api/application/models/Common_Masters_Model.php index b8816978..bd43c1ca 100644 --- a/api/application/models/Common_Masters_Model.php +++ b/api/application/models/Common_Masters_Model.php @@ -33,6 +33,20 @@ class Common_Masters_Model extends SPARQ_Model { // return $result; // } + public function pdteamlist(){ + + $result = $this->db->get(PDTEAM)->result_array(); + + if(count($result) !=0){ + foreach($result as $key=> $r){ + + $cities = $this->db->get_where(PDTEAMCITY,array('fk_pdteam_id'=>$r['pdteam_id']))->result_array(); + array_push($result[$key],$cities); + } + } + + return $result; + } /** * This Function is used to Delete The Datas From 9a7b524991a0c1a3fff8105e35c21f493ed61701 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 12:24:56 +0530 Subject: [PATCH 08/26] CATEGORY SPELL MISTAKES --- api/application/config/constants.php | 6 ++--- api/application/config/routes.php | 1 + .../Template_Management_Controller.php | 24 +++++++++++++++++++ .../models/Template_Management_Model.php | 8 +++---- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 76d2ef2b..0a714102 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -85,9 +85,9 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code // define login route name for token verification -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors +//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListPDOfficers'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfCategories'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -223,7 +223,7 @@ defined('QUESTIONANSWERS') OR define('QUESTIONANSWERS','m_question_answers'); defined('QUESTIONANSWERSID') OR define('QUESTIONANSWERSID','question_answer_id'); defined('QUESTIONCATEGORY') OR define('QUESTIONCATEGORY','m_question_category'); -defined('QUESTIONCATEGORYID') OR define('QUESTIONCATEGORYID','question_categroy_id'); +defined('QUESTIONCATEGORYID') OR define('QUESTIONCATEGORYID','question_category_id'); defined('TEMPLATE') OR define('TEMPLATE','m_template'); defined('TEMPLATEID') OR define('TEMPLATEID','template_id'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 9948ee97..309b2eb2 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -101,6 +101,7 @@ $route['getTemplateMaster'] = 'Template_Management_Controller/getTemplateMaster' $route['getTemplateLenders'] = 'Template_Management_Controller/getTemplateLenders'; $route['getTemplateCategories'] = 'Template_Management_Controller/getTemplateCategories'; $route['getTemplateQuestionAnswers'] = 'Template_Management_Controller/getTemplateQuestionAnswers'; +$route['getListOfCategories'] = 'Template_Management_Controller/getListOfCategories'; //QUESTION MANAGEMENT $route['(listAllQuestions/:any)'] = 'Question_Management_Controller/listAllQuestions/'; diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index bada6412..e2980c2f 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -346,4 +346,28 @@ class Template_Management_Controller extends REST_Controller { } + public function getListOfCategories_get() + { + $fields = array('question_categroy_id','categroy_name'); + $where_condition_array = array('isactive' => 1); + $result_data = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,QUESTIONCATEGORY); + if(count($result_data)) + { + + + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result_data; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_OK); + + } + } + + } \ No newline at end of file diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 29830105..e310066a 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -79,9 +79,9 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateCategories($template_id) { - $this->db->SELECT('QUESTIONCATEGORY.question_categroy_id,QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); // $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); @@ -97,9 +97,9 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateQuestionAnswers($template_id) { - $this->db->SELECT('QUESTIONCATEGORY.question_categroy_id,QUESTIONCATEGORY.categroy_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weigthage, TEMPLATECATEGORYWEIGHTAGE.isactive'); + $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, TEMPLATECATEGORYWEIGHTAGE.isactive'); $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_categroy_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); $categories = $this->db->GET()->result_array(); From 98b7d10434b1f4d4f80b4b8f01ffdfc257abfb48 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 12:35:00 +0530 Subject: [PATCH 09/26] CATE --- api/application/controllers/Template_Management_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index e2980c2f..ffa25307 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -348,7 +348,7 @@ class Template_Management_Controller extends REST_Controller { public function getListOfCategories_get() { - $fields = array('question_categroy_id','categroy_name'); + $fields = array('question_category_id','category_name'); $where_condition_array = array('isactive' => 1); $result_data = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,QUESTIONCATEGORY); if(count($result_data)) From b68e9c6a7b282cb38d46a59647c405a4a1f89b95 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 13:27:13 +0530 Subject: [PATCH 10/26] CATA2 --- api/application/config/constants.php | 2 +- api/application/models/Question_Management_Model.php | 4 ++-- api/application/models/Template_Management_Model.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 0a714102..bd0e49e9 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfCategories'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateCategories'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/models/Question_Management_Model.php b/api/application/models/Question_Management_Model.php index 7045858e..ed32815e 100644 --- a/api/application/models/Question_Management_Model.php +++ b/api/application/models/Question_Management_Model.php @@ -14,10 +14,10 @@ class Question_Management_Model extends SPARQ_Model { { - $this->db->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_category,QUESTIONCATEGORY.categroy_name, QUESTIONS.fk_question_answertype,QUESTIONANSWERTYPE.answer_type_name,QUESTIONS.isactive, QUESTIONS.createdon, QUESTIONS.fk_createdby, QUESTIONS.updatedon, QUESTIONS.fk_updatedby,concat(USERPROFILE.first_name," " ,USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); + $this->db->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_category,QUESTIONCATEGORY.category_name, QUESTIONS.fk_question_answertype,QUESTIONANSWERTYPE.answer_type_name,QUESTIONS.isactive, QUESTIONS.createdon, QUESTIONS.fk_createdby, QUESTIONS.updatedon, QUESTIONS.fk_updatedby,concat(USERPROFILE.first_name," " ,USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); $this->db->FROM(QUESTIONS.' as QUESTIONS'); $this->db->JOIN(QUESTIONANSWERTYPE.' as QUESTIONANSWERTYPE','QUESTIONS.fk_question_answertype = QUESTIONANSWERTYPE.question_answer_type_id'); - $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','QUESTIONS.fk_question_category = QUESTIONCATEGORY.question_categroy_id'); + $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','QUESTIONS.fk_question_category = QUESTIONCATEGORY.question_category_id'); $this->db->JOIN(USERPROFILE.' as USERPROFILE','QUESTIONS.fk_createdby = USERPROFILE.userid'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','QUESTIONS.fk_updatedby = USERPROFILE1.userid','LEFT'); if($category_id != null || $category_id != '') diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index e310066a..b5f954a1 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -81,7 +81,7 @@ class Template_Management_Model extends SPARQ_Model { { $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id"); $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); // $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); From e862a442e80d2e32055fa26507bbd0130643c640 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 15:38:18 +0530 Subject: [PATCH 11/26] TEMPLATE --- api/application/models/Template_Management_Model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index b5f954a1..867ff9ce 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -79,11 +79,11 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateCategories($template_id) { - $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby'); - $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id"); - $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->SELECT('TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); + $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE .' as TEMPLATECATEGORYWEIGHTAGE'); + // $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id"); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); + //$this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); // $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); $data = $this->db->GET()->result_array(); return $data; From 85b0b318d94bfe8e7531a686a0db8560a8de08cf Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 18:11:46 +0530 Subject: [PATCH 12/26] PDALERTS --- api/application/config/constants.php | 2 +- api/application/controllers/PD_Controller.php | 20 +++++++++---------- .../Template_Management_Controller.php | 17 +++++++++++----- api/application/helpers/pdalerts_helper.php | 6 +++--- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index bd0e49e9..58eec917 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateCategories'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateQuestionAnswers'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 9129d1fd..be5ada1a 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -809,16 +809,16 @@ class PD_Controller extends REST_Controller { } - /* for Load Whole PD Template for PD Conduct Screen*/ - // public function loadFullTemplate_get() - // { - // $template_id = ""; - // if($this->get('template_id')) { $template_id = $this->get('template_id'); } - // if($template_id != "" || $template_id != null) - // { - - // } - // } + /******** for Load Whole PD Template for PD Screen @param template_id***************/ + public function loadFullTemplate_get() + { + $template_id = ""; + if($this->get('template_id')) { $template_id = $this->get('template_id'); } + if($template_id != "" || $template_id != null) + { + + } + } diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index ffa25307..d6bddbe1 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -41,6 +41,8 @@ class Template_Management_Controller extends REST_Controller { } } + + /******** Save and Update Template Name ********/ public function saveNewTemplateName_post() { $records = $this->post('records'); @@ -87,7 +89,7 @@ class Template_Management_Controller extends REST_Controller { } - + /******** save and Edit Template Lender,Product, and Customer Segments ********/ public function saveTemplateLenderDetails_post() { @@ -130,6 +132,8 @@ class Template_Management_Controller extends REST_Controller { } + + /******** Save and Update Template Categories ********/ public function saveTemplateCategoryDetails_post() { @@ -170,7 +174,7 @@ class Template_Management_Controller extends REST_Controller { } - + /******** Save/update Template Question and Answers ********/ public function saveTemplateQuestionAnswers_post() { $count = 0; @@ -265,6 +269,7 @@ class Template_Management_Controller extends REST_Controller { } } + /******** Load Existed Template Master Details for Edit page @param template id ********/ public function getTemplateMaster_post() { $template_id = $this->post('template_id'); @@ -285,7 +290,7 @@ class Template_Management_Controller extends REST_Controller { } - + /******** Load Existed Template Lender Mapping for Edit page @param template id ********/ public function getTemplateLenders_post() { $template_id = $this->post('template_id'); @@ -306,7 +311,7 @@ class Template_Management_Controller extends REST_Controller { } - + /******** Load Existed Template Categories for Edit page @param template id ********/ public function getTemplateCategories_post() { $template_id = $this->post('template_id'); @@ -326,6 +331,8 @@ class Template_Management_Controller extends REST_Controller { } } + + /******** Load Existed Template Question and Answers for Edit page @param template id ********/ public function getTemplateQuestionAnswers_post() { $template_id = $this->post('template_id'); @@ -345,7 +352,7 @@ class Template_Management_Controller extends REST_Controller { } } - + /************** Get List of Categories to Template Add/Edit Page DropDown ***************/ public function getListOfCategories_get() { $fields = array('question_category_id','category_name'); diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index 1cecea72..afea7cdf 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -33,11 +33,11 @@ class PDALERTS */ //1.Get Current Status and createdby , lenders info by pdid - $CI->db->SELECT("PDTRIGGER.fk_lender_id,PDTRIGGER.lender_applicant_id,PDTRIGGER.fk_pd_status,PDSTATUS.pd_status_name,PDTRIGGER.fk_createdby,USERPROFILE.fk_entity_id as created_entity_type,USERPROFILE.email as created_mail,USERPROFILE.mobile_no as created_mobile_no,PDTRIGGER.fk_pd_allocated_to,ALLOCATED.email as allocated_email,ALLOCATED.mobile_no as allocated_mobile_no,ALLOCATED.fk_entity_id as allocated_entity_type,PDTRIGGER.pd_agency_id"); + $CI->db->SELECT("PDTRIGGER.fk_lender_id,PDTRIGGER.lender_applicant_id,PDTRIGGER.pd_status,PDSTATUS.pd_status_name,PDTRIGGER.fk_createdby,USERPROFILE.fk_entity_id as created_entity_type,USERPROFILE.email as created_mail,USERPROFILE.mobile_no as created_mobile_no,PDTRIGGER.fk_pd_allocated_to,ALLOCATED.email as allocated_email,ALLOCATED.mobile_no as allocated_mobile_no,ALLOCATED.fk_entity_id as allocated_entity_type,PDTRIGGER.pd_agency_id"); $CI->db->FROM(PDTRIGGER." as PDTRIGGER"); $CI->db->JOIN(USERPROFILE." as USERPROFILE","PDTRIGGER.fk_createdby = USERPROFILE.userid"); $CI->db->JOIN(USERPROFILE." as ALLOCATED","PDTRIGGER.fk_pd_allocated_to = ALLOCATED.userid"); - $CI->db->JOIN(PDSTATUS." as PDSTATUS","PDTRIGGER.fk_pd_status = PDSTATUS.pd_status_id"); + $CI->db->JOIN(PDSTATUS." as PDSTATUS","PDTRIGGER.pd_status = PDSTATUS.pd_status_id"); $CI->db->WHERE("PDTRIGGER.pd_id",$pdid); $core_details = $CI->db->GET()->result_array(); //print_r($core_details); @@ -50,7 +50,7 @@ class PDALERTS $CI->db->SELECT("PDNOTIFICATION.pdnotification_id, PDNOTIFICATION.fk_pd_status_id, PDSTATUS.pd_status_name,PDNOTIFICATION.sms_lender, PDNOTIFICATION.sms_pdofficer, PDNOTIFICATION.sms_pdincharge, PDNOTIFICATION.mail_lender, PDNOTIFICATION.mail_pdincharge, PDNOTIFICATION.mail_pdofficer"); $CI->db->FROM(PDNOTIFICATION." as PDNOTIFICATION"); $CI->db->JOIN(PDSTATUS." as PDSTATUS","PDNOTIFICATION.fk_pd_status_id = PDSTATUS.pd_status_id AND PDSTATUS.isactive = 1"); - $CI->db->WHERE("PDNOTIFICATION.fk_pd_status_id",$core_details[0]['fk_pd_status']); + $CI->db->WHERE("PDNOTIFICATION.fk_pd_status_id",$core_details[0]['pd_status']); $pd_notification_configs = $CI->db->GET()->result_array(); //print_r($pd_notification_configs); From 58af66a2166e3f6fd0066ae3dee47381cce87b6b Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 19:20:27 +0530 Subject: [PATCH 13/26] PD --- api/application/controllers/PD_Controller.php | 4 ++-- api/application/models/Template_Management_Model.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index be5ada1a..ef7142bd 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -396,7 +396,7 @@ class PD_Controller extends REST_Controller { { if($pd_applicant_detail['pd_co_applicant_id'] != null || $pd_applicant_detail['pd_co_applicant_id'] != "") { - $pd_id = $pd_applicant_detail['fk_pd_id']; + //$pd_id = $pd_applicant_detail['fk_pd_id']; $where_condition_array = array('pd_co_applicant_id' => $pd_applicant_detail['pd_co_applicant_id']); $co_applicant_id = $this->PD_Model->updateRecords($pd_applicant_detail,PDAPPLICANTSDETAILS,$where_condition_array); if($co_applicant_id != null || $co_applicant_id != '') @@ -406,7 +406,7 @@ class PD_Controller extends REST_Controller { } else { - $pd_applicant_detail['fk_pd_id'] = $pd_id; + //$pd_applicant_detail['fk_pd_id'] = $pd_id; $co_applicant_id = $this->PD_Model->saveRecords($pd_applicant_detail,PDAPPLICANTSDETAILS); if($co_applicant_id != null || $co_applicant_id != '') { diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 867ff9ce..fc85f59b 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -99,7 +99,7 @@ class Template_Management_Model extends SPARQ_Model { $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, TEMPLATECATEGORYWEIGHTAGE.isactive'); $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); $categories = $this->db->GET()->result_array(); @@ -115,7 +115,7 @@ class Template_Management_Model extends SPARQ_Model { $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); $this->db->FROM(QUESTIONS.' as QUESTIONS'); - $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.template_question_id','LEFT'); + $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.fk_question_id','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->WHERE('QUESTIONS.fk_question_category',$category['fk_question_category_id']); From a7c58975b517dbd75292173f9ed7109675446f51 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 19:30:48 +0530 Subject: [PATCH 14/26] PD MODEL --- api/application/models/PD_Model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 86900672..bb0b3112 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -70,10 +70,11 @@ class PD_Model extends SPARQ_Model { foreach($result_array as $key => $result) { - $this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode,PDAPPLICANTSDETAILS.relation'); + $this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode,PDAPPLICANTSDETAILS.relation,RELATIONSHIPS.name as relation_name'); $this->db->FROM(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS'); $this->db->JOIN(STATE.' as STATE','PDAPPLICANTSDETAILS.fk_state = STATE.state_id','LEFT'); $this->db->JOIN(CITY.' as CITY','PDAPPLICANTSDETAILS.fk_city = CITY.city_id','LEFT'); + $this->db->JOIN(RELATIONSHIPS.' as RELATIONSHIPS','PDAPPLICANTSDETAILS.relation = RELATIONSHIPS.RELATIONSHIPS','LEFT'); $this->db->WHERE('PDAPPLICANTSDETAILS.fk_pd_id ',$result['pd_id']); $result_child_array = $this->db->GET()->result_array(); if(count($result_child_array) != 0) From a065a89c886685120dd71d953a003756a57c6989 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 19:35:51 +0530 Subject: [PATCH 15/26] PD MODEL2 --- api/application/models/PD_Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index bb0b3112..bfce63b8 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -74,7 +74,7 @@ class PD_Model extends SPARQ_Model { $this->db->FROM(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS'); $this->db->JOIN(STATE.' as STATE','PDAPPLICANTSDETAILS.fk_state = STATE.state_id','LEFT'); $this->db->JOIN(CITY.' as CITY','PDAPPLICANTSDETAILS.fk_city = CITY.city_id','LEFT'); - $this->db->JOIN(RELATIONSHIPS.' as RELATIONSHIPS','PDAPPLICANTSDETAILS.relation = RELATIONSHIPS.RELATIONSHIPS','LEFT'); + $this->db->JOIN(RELATIONSHIPS.' as RELATIONSHIPS','PDAPPLICANTSDETAILS.relation = RELATIONSHIPS.relationship_id','LEFT'); $this->db->WHERE('PDAPPLICANTSDETAILS.fk_pd_id ',$result['pd_id']); $result_child_array = $this->db->GET()->result_array(); if(count($result_child_array) != 0) From e5d43d02310154ff20dadd0bd8d6985e34bc5772 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 20:47:39 +0530 Subject: [PATCH 16/26] PD --- api/application/config/constants.php | 2 +- api/application/config/routes.php | 1 + api/application/controllers/PD_Controller.php | 23 ++++++-- api/application/models/PD_Model.php | 57 ++++++++++++++++++- .../models/Template_Management_Model.php | 19 ++++--- 5 files changed, 86 insertions(+), 16 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 58eec917..b34f2e18 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTemplateQuestionAnswers'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 309b2eb2..6546b4f5 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -130,4 +130,5 @@ $route['updatePDApplicants'] = 'PD_Controller/updatePDApplicants'; $route['allocatePD'] = 'PD_Controller/allocatePD'; $route['schdulePD'] = 'PD_Controller/schdulePD'; $route['getListPDOfficers'] = 'PD_Controller/getListPDOfficers'; +$route['loadFullTemplate'] = 'PD_Controller/loadFullTemplate'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index ef7142bd..26475195 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -324,10 +324,10 @@ class PD_Controller extends REST_Controller { } // update into pd officer details - if($pd_details['fk_pd_allocated_to'] != null || $pd_details['fk_pd_allocated_to'] != '') - { - $this->PD_Model->updatePDofficersDetail($pd_details['fk_pd_allocated_to']); - } + // if($pd_details['fk_pd_allocated_to'] != null || $pd_details['fk_pd_allocated_to'] != '') + // { + // $this->PD_Model->updatePDofficersDetail($pd_details['fk_pd_allocated_to']); + // } if($pd_id != null || $pd_id != '' && $count != 0) { // CALL pdnotification Helper function to send pd alerts @ params pdid,pdstatus @@ -816,7 +816,20 @@ class PD_Controller extends REST_Controller { if($this->get('template_id')) { $template_id = $this->get('template_id'); } if($template_id != "" || $template_id != null) { - + $template_details = $this->PD_Model->getTemplateForPD($template_id); + if(count($template_details)) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $template_details; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_OK); + } } } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index bfce63b8..966dbb52 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -13,9 +13,10 @@ class PD_Model extends SPARQ_Model { public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate)// $page represents mysql offset { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,ENTITYBILLING.entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT'); + $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); $this->db->JOIN(PRODUCTS.' as PRODUCTS','PDTRIGGER.fk_product_id = PRODUCTS.product_id','LEFT'); $this->db->JOIN(SUBPRODUCTS.' as SUBPRODUCTS','PDTRIGGER.fk_subproduct_id = SUBPRODUCTS.subproduct_id','LEFT'); $this->db->JOIN(PDTYPE.' as PDTYPE','PDTRIGGER.fk_pd_type = PDTYPE.pd_type_id','LEFT'); @@ -254,4 +255,58 @@ class PD_Model extends SPARQ_Model { return $result_array; } + + + + public function getTemplateForPD($template_id) + { + + + $this->db->SELECT('TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); + $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE .' as TEMPLATECATEGORYWEIGHTAGE'); + $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); + $categories = $this->db->GET()->result_array(); + + if(count($categories)) + { + /* + DATE_FORMAT(TEMPLATEQUESTION.createdon,"%d/%m/%Y") as createdon, TEMPLATEQUESTION.fk_createdby, DATE_FORMAT(TEMPLATEQUESTION.updatedon,"%d/%m/%Y") as updatedon, TEMPLATEQUESTION.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby + */ + foreach($categories as $category_key => $category) + { + + $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); + //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->JOIN(QUESTIONS.' as QUESTIONS','TEMPLATEQUESTION.fk_question_id = QUESTIONS.question_id','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('TEMPLATEQUESTION.fk_template_question_category_id',$category['fk_question_category_id']); + $questions = $this->db->GET()->result_array(); + + + if(count($questions)) + { + + foreach($questions as $answer_key => $question) + { + $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage, TEMPLATEANSWERWEIGHTAGE.isactive'); + $this->db->FROM(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE'); + $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id','LEFT'); + $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); + $answers = $this->db->GET()->result_array(); + $questions[$answer_key]['answers'] = $answers; + } + } + $categories[$category_key]['questions'] = $questions; + } + + } + + return $categories; + } + } \ No newline at end of file diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index fc85f59b..8866b1a8 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -84,7 +84,7 @@ class Template_Management_Model extends SPARQ_Model { // $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id"); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); //$this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); - // $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); + $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); $data = $this->db->GET()->result_array(); return $data; } @@ -97,11 +97,12 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateQuestionAnswers($template_id) { - $this->db->SELECT('QUESTIONCATEGORY.question_category_id,QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, TEMPLATECATEGORYWEIGHTAGE.isactive'); - $this->db->FROM(QUESTIONCATEGORY .' as QUESTIONCATEGORY'); - $this->db->JOIN(TEMPLATECATEGORYWEIGHTAGE.' as TEMPLATECATEGORYWEIGHTAGE',"TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id AND TEMPLATECATEGORYWEIGHTAGE.fk_template_id = $template_id",'LEFT'); + $this->db->SELECT('TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); + $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE .' as TEMPLATECATEGORYWEIGHTAGE'); + $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); $categories = $this->db->GET()->result_array(); if(count($categories)) @@ -114,11 +115,11 @@ class Template_Management_Model extends SPARQ_Model { $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); - $this->db->FROM(QUESTIONS.' as QUESTIONS'); - $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.fk_question_id','LEFT'); + $this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->JOIN(QUESTIONS.' as QUESTIONS','TEMPLATEQUESTION.fk_question_id = QUESTIONS.question_id','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); - $this->db->WHERE('QUESTIONS.fk_question_category',$category['fk_question_category_id']); + $this->db->WHERE('TEMPLATEQUESTION.fk_template_question_category_id',$category['fk_question_category_id']); $questions = $this->db->GET()->result_array(); @@ -128,8 +129,8 @@ class Template_Management_Model extends SPARQ_Model { foreach($questions as $answer_key => $question) { $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage, TEMPLATEANSWERWEIGHTAGE.isactive'); - $this->db->FROM(QUESTIONANSWERS.' as QUESTIONANSWERS'); - $this->db->JOIN(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id AND QUESTIONANSWERS.question_answer_id = TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id','LEFT'); + $this->db->FROM(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE'); + $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id','LEFT'); $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); $answers = $this->db->GET()->result_array(); $questions[$answer_key]['answers'] = $answers; From 2bace6a8976ba4c0e9e371378541d90ea530fd9e Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 20:52:40 +0530 Subject: [PATCH 17/26] PD5 --- api/application/models/PD_Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 966dbb52..ccaf9dbc 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -13,7 +13,7 @@ class PD_Model extends SPARQ_Model { public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate)// $page represents mysql offset { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,ENTITYBILLING.entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,ENTITYBILLING.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT'); $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); From 40d5ce9035e2ec751bf65c7c0b1787294d4bf74a Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 20:57:09 +0530 Subject: [PATCH 18/26] PD6 --- api/application/models/PD_Model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index ccaf9dbc..49057a4d 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -232,9 +232,10 @@ class PD_Model extends SPARQ_Model { */ public function getPDMasterDetails($pdid) { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, ENTITYBILLING.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id ','LEFT'); + $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); $this->db->JOIN(PRODUCTS.' as PRODUCTS','PDTRIGGER.fk_product_id = PRODUCTS.product_id','LEFT'); $this->db->JOIN(SUBPRODUCTS.' as SUBPRODUCTS','PDTRIGGER.fk_subproduct_id = SUBPRODUCTS.subproduct_id','LEFT'); $this->db->JOIN(PDTYPE.' as PDTYPE','PDTRIGGER.fk_pd_type = PDTYPE.pd_type_id','LEFT'); From fba7aa7d1154ad6aec4ec7d03d46497b2e8ce7e3 Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 21:00:07 +0530 Subject: [PATCH 19/26] PD7 --- api/application/config/constants.php | 2 +- api/application/models/PD_Model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index b34f2e18..7ece7a4e 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getFullPDDetails'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 49057a4d..6d19b8b8 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -232,7 +232,7 @@ class PD_Model extends SPARQ_Model { */ public function getPDMasterDetails($pdid) { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, ENTITYBILLING.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id ','LEFT'); $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); From 969a97dd5e5637a087eab9262d443587a72f4c7e Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 21:05:06 +0530 Subject: [PATCH 20/26] PD8 --- api/application/models/PD_Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 6d19b8b8..d418bf79 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -13,7 +13,7 @@ class PD_Model extends SPARQ_Model { public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate)// $page represents mysql offset { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,ENTITYBILLING.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT'); $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); From fc9e7ab93362d70430a4fd0123017fc5ee58e461 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 16 Oct 2018 12:58:10 +0530 Subject: [PATCH 21/26] TEMPALTE --- api/application/config/constants.php | 2 +- api/application/models/PD_Model.php | 2 +- api/application/models/Template_Management_Model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 7ece7a4e..b34f2e18 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getFullPDDetails'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index d418bf79..396fcbd7 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -263,7 +263,7 @@ class PD_Model extends SPARQ_Model { { - $this->db->SELECT('TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); + $this->db->SELECT('QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE .' as TEMPLATECATEGORYWEIGHTAGE'); $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 8866b1a8..6bfe2461 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -97,7 +97,7 @@ class Template_Management_Model extends SPARQ_Model { public function getTemplateQuestionAnswers($template_id) { - $this->db->SELECT('TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); + $this->db->SELECT('QUESTIONCATEGORY.category_name,TEMPLATECATEGORYWEIGHTAGE.template_category_weightage_id, TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id, TEMPLATECATEGORYWEIGHTAGE.fk_template_id, TEMPLATECATEGORYWEIGHTAGE.weightage, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.createdon,"%d/%m/%Y") as createdon, TEMPLATECATEGORYWEIGHTAGE.fk_createdby, DATE_FORMAT(TEMPLATECATEGORYWEIGHTAGE.updatedon, "%d/%m/%Y") as updatedon, TEMPLATECATEGORYWEIGHTAGE.isactive, TEMPLATECATEGORYWEIGHTAGE.fk_updatedby'); $this->db->FROM(TEMPLATECATEGORYWEIGHTAGE .' as TEMPLATECATEGORYWEIGHTAGE'); $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','TEMPLATECATEGORYWEIGHTAGE.fk_question_category_id = QUESTIONCATEGORY.question_category_id'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATECATEGORYWEIGHTAGE.fk_createdby = USERPROFILE.userid','LEFT'); From d77df52983191b9e6055b6f6a3e1eea4bbfa8cab Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 16 Oct 2018 18:20:43 +0530 Subject: [PATCH 22/26] TEMPLATE --- api/application/config/constants.php | 2 +- api/application/config/routes.php | 1 + api/application/controllers/PD_Controller.php | 7 ++- .../Template_Management_Controller.php | 24 +++++++- api/application/controllers/Welcome.php | 6 ++ api/application/models/PD_Model.php | 7 ++- .../models/Template_Management_Model.php | 56 +++++++++++++++++++ 7 files changed, 98 insertions(+), 5 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index b34f2e18..a50ae377 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getQuestionsForTemplateCreation'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 6546b4f5..85f5715c 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -102,6 +102,7 @@ $route['getTemplateLenders'] = 'Template_Management_Controller/getTemplateLender $route['getTemplateCategories'] = 'Template_Management_Controller/getTemplateCategories'; $route['getTemplateQuestionAnswers'] = 'Template_Management_Controller/getTemplateQuestionAnswers'; $route['getListOfCategories'] = 'Template_Management_Controller/getListOfCategories'; +$route['getQuestionsForTemplateCreation'] = 'Template_Management_Controller/getQuestionsForTemplateCreation'; //QUESTION MANAGEMENT $route['(listAllQuestions/:any)'] = 'Question_Management_Controller/listAllQuestions/'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 26475195..2a4de417 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -22,7 +22,8 @@ class PD_Controller extends REST_Controller { $this->load->library('AWS_SNS'); } - /***********************Get get List Of Lenders Details for PD Trigger Page************************/ + +/***********************Get get List Of Lenders Details for PD Trigger Page************************/ public function getListOfLenders_get() { @@ -724,15 +725,17 @@ class PD_Controller extends REST_Controller { public function listLessPDDetails_get() { $page = 0;$limit = 50;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate =""; + $lenderid = ""; if($this->get('page')) { $page = $this->get('page'); } if($this->get('limit')){ $limit = $this->get('limit'); } if($this->get('sort')) { $sort = $this->get('sort'); } if($this->get('pdofficerid')) { $pdofficerid = $this->get('pdofficerid'); } + if($this->get('lenderid')) { $lenderid = $this->get('lenderid'); } if($this->get('datetype')) { $datetype = $this->get('datetype'); } if($this->get('fdate')) { $fdate = $this->get('fdate'); } if($this->get('tdate')) { $tdate = $this->get('tdate'); } - $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate); + $result_data = $this->PD_Model->listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid); if($result_data['data_status'] == true) { diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index d6bddbe1..5c65fcd4 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -376,5 +376,27 @@ class Template_Management_Controller extends REST_Controller { } } - + public function getQuestionsForTemplateCreation_post() + { + $template_id = "";$category_id = ""; + + if($this->post('template_id')){ $template_id = $this->post('template_id'); } + if($this->post('category_id')){ $category_id = $this->post('category_id'); } + + $questions = $this->Template_Management_Model->getListOfQuestions($template_id,$category_id); + if(count($questions)) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $questions; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_OK); + + } + } } \ No newline at end of file diff --git a/api/application/controllers/Welcome.php b/api/application/controllers/Welcome.php index 9213c0cf..df8b7c0c 100644 --- a/api/application/controllers/Welcome.php +++ b/api/application/controllers/Welcome.php @@ -20,6 +20,12 @@ class Welcome extends CI_Controller { */ public function index() { + // require_once APPPATH . '/controllers/PD_Controller.php'; + // require_once APPPATH . '/libraries/REST_Controller.php'; $this->load->view('welcome_message'); + //$this->load->library('../controllers/PD_Controller'); + // $PD_Controller = new PD_Controller(); + //echo $PD_Controller->index(); + } } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 396fcbd7..1569e444 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -11,7 +11,7 @@ class PD_Model extends SPARQ_Model { } - public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate)// $page represents mysql offset + public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid)// $page represents mysql offset { $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); @@ -36,6 +36,11 @@ class PD_Model extends SPARQ_Model { $this->db->WHERE('PDTRIGGER.fk_pd_allocated_to',$pdofficerid); } + if($lenderid != "" || $lenderid != null) + { + $this->db->WHERE('PDTRIGGER.fk_lender_id',$lenderid); + } + if($datetype != "" || $datetype != null) { if($datetype == 1) diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 6bfe2461..a0b21ecb 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -143,5 +143,61 @@ class Template_Management_Model extends SPARQ_Model { return $categories; } + + + public function getListOfQuestions($template_id,$category_id) + { + $questions = array(); + if(($template_id != "" || $template_id != null) && ($category_id != "" || $category_id != null)) + { + $fields = array('fk_question_id'); + $where_condition_array = array('fk_template_question_category_id' => $category_id,'fk_template_id' => $template_id); + $result_data = $this->selectCustomRecords($fields,$where_condition_array,TEMPLATEQUESTION); + + if(count($result_data)) + { + $temp_array = array(); + foreach($result_data as $res) + { + array_push($temp_array,$res['fk_question_id']); + } + + // $this->db->SELECT('question_id,question'); + // $this->db->FROM(QUESTIONS); + // $this->db->WHERE('fk_question_category',$category_id); + // $this->db->WHERE_NOT_IN('question_id',$temp_array); + // $questions = $this->db->get()->result_array(); + + $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); + //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->FROM(QUESTIONS.' as QUESTIONS'); + $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.fk_question_id','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('QUESTIONS.fk_question_category',$category_id); + $this->db->WHERE_NOT_IN('QUESTIONS.question_id',$temp_array); + $questions = $this->db->GET()->result_array(); + + + if(count($questions)) + { + + foreach($questions as $answer_key => $question) + { + $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage, TEMPLATEANSWERWEIGHTAGE.isactive'); + $this->db->FROM(QUESTIONANSWERS.' as QUESTIONANSWERS'); + $this->db->JOIN(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE','QUESTIONANSWERS.question_answer_id = TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id','LEFT'); + $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); + $answers = $this->db->GET()->result_array(); + $questions[$answer_key]['answers'] = $answers; + } + } + //$questions['answers'] = $questions; + + } + + } + return $questions; + } } \ No newline at end of file From 88624c9fb0c3b93ed46bb504c7b0750a63347cf4 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 16 Oct 2018 19:29:17 +0530 Subject: [PATCH 23/26] PD CATEGORY WEIGHTAGE --- api/application/config/constants.php | 5 +- .../controllers/Common_Masters_Controller.php | 3 ++ api/application/controllers/PD_Controller.php | 51 +++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index a50ae377..57974136 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getQuestionsForTemplateCreation'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'schdulePD'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -309,5 +309,8 @@ defined('ENTITYPDPRICEINFOID') OR define('ENTITYPDPRICEINFOID','entity_pdprice_i defined('VENDORCITYMAP') OR define('VENDORCITYMAP','m_vendor_city_map'); defined('VENDORCITYMAPID') OR define('VENDORCITYMAPID','vendor_city_map_id'); +defined('PDCATEGORYWEIGHTAGE') OR define('PDCATEGORYWEIGHTAGE','t_pd_category_weightage'); +defined('PDCATEGORYWEIGHTAGEID') OR define('PDCATEGORYWEIGHTAGEID','pd_category_weightage_id'); + diff --git a/api/application/controllers/Common_Masters_Controller.php b/api/application/controllers/Common_Masters_Controller.php index e5e34bb7..02320417 100644 --- a/api/application/controllers/Common_Masters_Controller.php +++ b/api/application/controllers/Common_Masters_Controller.php @@ -352,6 +352,7 @@ class Common_Masters_Controller extends REST_Controller { { $records = $this->post('records'); // print_r($records);die; + $result = array(); if(!empty($records)) { foreach($records['teamDetails'] as $users) @@ -364,6 +365,8 @@ class Common_Masters_Controller extends REST_Controller { $result = $this->Common_Masters_Model->updateRecords($record,PDOFFICIERSDETAILS,$where_condition_array); } } + + if(count($result) > 0) { $data['dataStatus'] = true; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 2a4de417..d5f0e590 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -593,6 +593,28 @@ class PD_Controller extends REST_Controller { */ public function schdulePD_post() { + + $records['fk_pd_id'] = 40; + $fields = array('fk_pd_template_id'); + $where_condition_array = array('pd_id'=>$records['fk_pd_id']); + $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER); + //print_r($res_array); + if(count($res_array)) + { + $template_id = $res_array[0]['fk_pd_template_id']; + echo $template_id; + $fields = array('fk_question_category_id','weightage'); + $where_condition_array = array('fk_template_id'=>$template_id); + $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATECATEGORYWEIGHTAGE); + print_r($res_array); + + foreach($res_array as $key => $category) + { + $temp_data = array('fk_pd_id'=>$records['fk_pd_id'],'fk_category_id'=>$category['fk_question_category_id'],'pd_category_weightage'=>$category['weightage']); + $this->PD_Model->saveRecords($temp_data,PDCATEGORYWEIGHTAGE); + } + } + die(); $records = $this->post('records'); if($records['schedule_time'] != "" || $records['schedule_time'] != null) { @@ -602,6 +624,35 @@ class PD_Controller extends REST_Controller { $temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>$records['createdon'],'scheduled_on'=>$records['schedule_time']); $pd_id_modified = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); + /******* Code Snippt for Save Template Category Weightage info to PD category Info*/ + $fields = array('fk_pd_template_id'); + $where_condition_array = array('pd_id'=>$records['fk_pd_id']); + $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER); + + if(count($res_array)) + { + $fields = array('fk_pd_template_id'); + $where_condition_array = array('pd_id'=>$records['fk_pd_id']); + $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER); + + if(count($res_array)) + { + $template_id = $res_array[0]['fk_pd_template_id']; + + $fields = array('fk_question_category_id','weightage'); + $where_condition_array = array('fk_template_id'=>$template_id); + $template_categories = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATECATEGORYWEIGHTAGE); + + foreach($template_categories as $key => $category) + { + $temp_data = array('fk_pd_id'=>$records['fk_pd_id'],'fk_category_id'=>$category['fk_question_category_id'],'pd_category_weightage'=>$category['weightage']); + $this->PD_Model->saveRecords($temp_data,PDCATEGORYWEIGHTAGE); + } + } + } + /******* End of Code Snippt Save Template Category Weightage info to PD category Info*/ + + if($pd_id_modified != "" || $pd_id_modified != null) { PDALERTS::pdnotification($records['fk_pd_id']); From 9e1fb4ede52c5e9c6d443472524d8578dcf539db Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 16 Oct 2018 21:09:03 +0530 Subject: [PATCH 24/26] BASE64 S3 --- api/application/config/constants.php | 2 +- api/application/config/routes.php | 1 + .../controllers/Common_Masters_Controller.php | 5 +- api/application/controllers/PD_Controller.php | 116 ++++++++++++++++-- 4 files changed, 113 insertions(+), 11 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 57974136..132f67aa 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'schdulePD'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'allbase'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 85f5715c..ddf3b635 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -132,4 +132,5 @@ $route['allocatePD'] = 'PD_Controller/allocatePD'; $route['schdulePD'] = 'PD_Controller/schdulePD'; $route['getListPDOfficers'] = 'PD_Controller/getListPDOfficers'; $route['loadFullTemplate'] = 'PD_Controller/loadFullTemplate'; +$route['allbase'] = 'PD_Controller/base'; diff --git a/api/application/controllers/Common_Masters_Controller.php b/api/application/controllers/Common_Masters_Controller.php index 02320417..086512e5 100644 --- a/api/application/controllers/Common_Masters_Controller.php +++ b/api/application/controllers/Common_Masters_Controller.php @@ -351,7 +351,7 @@ class Common_Masters_Controller extends REST_Controller { public function savePdTeamManage_post() { $records = $this->post('records'); - // print_r($records);die; + // print_r($records); $result = array(); if(!empty($records)) { @@ -363,11 +363,12 @@ class Common_Masters_Controller extends REST_Controller { $record['fk_updatedby'] = $records['fk_updatedby']; $where_condition_array = array('fk_user_id' => $record['fk_user_id']); $result = $this->Common_Masters_Model->updateRecords($record,PDOFFICIERSDETAILS,$where_condition_array); + //print_r($result); } } - if(count($result) > 0) + if(count($result)) { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index d5f0e590..80b69c33 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -23,7 +23,52 @@ class PD_Controller extends REST_Controller { } -/***********************Get get List Of Lenders Details for PD Trigger Page************************/ + + public function base_get() + { + $base64_img = "data:image/gif;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="; + + $output_file = APPPATH."/docs/temp_base64_image.png"; + $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + $charactersLength = strlen($characters); + $randomString = ''; + for ($i = 0; $i < 5; $i++) { + $randomString .= $characters[rand(0, $charactersLength - 1)]; + } + $temp_file_name = $randomString.date('Y-m-d-H:m:s'); + + + $ifp = fopen( $output_file, 'wb' ); + + // split the string on commas + // $data[ 0 ] == "data:image/png;base64" + // $data[ 1 ] == + $data = explode( ',', $base64_img ); + print_r($data); + // we could add validation here with ensuring count( $data ) > 1 + fwrite( $ifp, base64_decode( $data[ 1 ] ) ); + + // clean up the file resource + fclose( $ifp ); + + print_r($output_file); + + $tempdoc = $output_file; + $tempdocname = $temp_file_name.'.png'; + $bucketname = LENDER_BUCKET_NAME_PREFIX.'1'; + $key = 'pd'.'1'.'/'.$tempdocname ; + $sourcefile = $tempdoc; + + $bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile); + $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); + print_r($s3result); + if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) + { + // $record_data = array('fk_pd_id' => $pd_id,'pd_document_title'=>$title,'pd_document_name'=>$tempdocname); + // $this->PD_Model->saveRecords($record_data,PDDOCUMENTS); + } + } + /***********************Get get List Of Lenders Details for PD Trigger Page************************/ public function getListOfLenders_get() { @@ -187,8 +232,11 @@ class PD_Controller extends REST_Controller { $pd_applicant_details = json_decode($this->post('pd_applicant_details'),true); $pd_document_titles = ""; + $pd_document_from_mobile = ""; if($this->post('pd_document_titles')){ $pd_document_titles = json_decode($this->post('pd_document_titles'),true); } + if($this->post('pd_document_from_mobile')){ $pd_document_from_mobile = json_decode($this->post('pd_document_from_mobile'),true); } + $pd_documents = array(); $count = 0; @@ -280,7 +328,7 @@ class PD_Controller extends REST_Controller { $pd_id = $this->PD_Model->saveRecords($pd_details,PDTRIGGER); - /***********************PD DOCUMENTS UPLOAD SECTION ***********/ + /***********************PD DOCUMENTS UPLOAD SECTION FROM WEB***********/ if($pd_id != null || $pd_id != '') { @@ -309,7 +357,7 @@ class PD_Controller extends REST_Controller { } } - /***********************END OF PD DOCUMENTS UPLOAD SECTION ***********/ + /***********************END OF PD DOCUMENTS UPLOAD SECTION FROM WEB***********/ if($pd_id != null || $pd_id != '') { @@ -324,11 +372,56 @@ class PD_Controller extends REST_Controller { } } - // update into pd officer details - // if($pd_details['fk_pd_allocated_to'] != null || $pd_details['fk_pd_allocated_to'] != '') - // { - // $this->PD_Model->updatePDofficersDetail($pd_details['fk_pd_allocated_to']); - // } + /***********************PD DOCUMENTS(base64 type) UPLOAD SECTION FROM MOBILE***********/ + if($pd_id != null || $pd_id != '') + { + + if(!empty($pd_document_from_mobile)) + { + + foreach($pd_document_from_mobile as $iter => $doc) + { + $temp_base64_string = $doc['image']; + $title = $doc['Name']; + $output_file = 'temp_base64_image.png'; + + //Generate Random File Name + $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + $charactersLength = strlen($characters); + $randomString = ''; + for ($i = 0; $i < 5; $i++) { + $randomString .= $characters[rand(0, $charactersLength - 1)]; + } + $temp_file_name = $randomString.date('Y-m-d-H:m:s').'.png'; + + + $ifp = fopen( $output_file, 'wb' ); + $data = explode( ',', $base64_img ); + fwrite( $ifp, base64_decode( $data[ 1 ] ) ); + fclose( $ifp ); + $tempdoc = $output_file; + $tempdocname = $temp_file_name; + $bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_details['fk_lender_id']; + $key = 'pd'.$pd_id.'/'.$tempdocname ; + $sourcefile = $tempdoc; + + $bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile); + $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data); + + if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) + { + $record_data = array('fk_pd_id' => $pd_id,'pd_document_title'=>$title,'pd_document_name'=>$tempdocname); + $this->PD_Model->saveRecords($record_data,PDDOCUMENTS); + } + + } + } + } + + + /***********************END OF PD DOCUMENTS(base64 type) UPLOAD SECTION FROM MOBILE***********/ + + if($pd_id != null || $pd_id != '' && $count != 0) { // CALL pdnotification Helper function to send pd alerts @ params pdid,pdstatus @@ -887,6 +980,13 @@ class PD_Controller extends REST_Controller { } } + /******** Save Single PD qustions ********/ + public function saveActualPDQuestions_post() + { + $records = $this->post('records'); + + } + } \ No newline at end of file From f224012b16497a0cd12045c9a55c2355e9558fdc Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 17 Oct 2018 14:44:27 +0530 Subject: [PATCH 25/26] TEMPLATE AND PD CHNAGED --- api/application/config/constants.php | 2 +- api/application/controllers/PD_Controller.php | 6 +- .../Template_Management_Controller.php | 86 +++++++++---------- api/application/models/PD_Model.php | 4 +- .../models/Template_Management_Model.php | 26 +++++- 5 files changed, 72 insertions(+), 52 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 132f67aa..449be2c6 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'allbase'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getQuestionsForTemplateCreation'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 80b69c33..8853a7cf 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -383,7 +383,7 @@ class PD_Controller extends REST_Controller { { $temp_base64_string = $doc['image']; $title = $doc['Name']; - $output_file = 'temp_base64_image.png'; + $output_file = APPPATH."/docs/temp_base64_image.png"; //Generate Random File Name $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; @@ -396,8 +396,8 @@ class PD_Controller extends REST_Controller { $ifp = fopen( $output_file, 'wb' ); - $data = explode( ',', $base64_img ); - fwrite( $ifp, base64_decode( $data[ 1 ] ) ); + $temp_data = explode( ',', $temp_base64_string ); + fwrite( $ifp, base64_decode( $temp_data[ 1 ] ) ); fclose( $ifp ); $tempdoc = $output_file; $tempdocname = $temp_file_name; diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 5c65fcd4..da4d7eed 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -177,11 +177,13 @@ class Template_Management_Controller extends REST_Controller { /******** Save/update Template Question and Answers ********/ public function saveTemplateQuestionAnswers_post() { - $count = 0; + $question_count = 0; + $template_question_answers_details = $this->post('records'); - print_r($template_question_answers_details); + //print_r($template_question_answers_details); foreach($template_question_answers_details as $key => $template_question_answers_detail) { + //echo "FOr".$key; $answers_array = array(); if($template_question_answers_detail['template_question_id'] != null || $template_question_answers_detail['template_question_id'] != "") { @@ -192,8 +194,10 @@ class Template_Management_Controller extends REST_Controller { } $where_condition_array = array('template_question_id' => $template_question_answers_detail['template_question_id']); + unset($template_question_answers_detail['question_id']); + unset($template_question_answers_detail['question']); $question_modified = $this->Template_Management_Model->updateRecords($template_question_answers_detail,TEMPLATEQUESTION,$where_condition_array); - + if($question_modified){$question_count++;} if(count($answers_array)) { foreach($answers_array as $key => $answer) @@ -201,6 +205,8 @@ class Template_Management_Controller extends REST_Controller { if($answer['template_answer_weightage_id'] != "" || $answer['template_answer_weightage_id'] != null) { $where_condition_array = array('template_answer_weightage_id' => $answer['template_answer_weightage_id']); + unset($answer['answer']); + $answer_modified = $this->Template_Management_Model->updateRecords($answer,TEMPLATEANSWERWEIGHTAGE,$where_condition_array); if($answer_modified != "" || $answer_modified != null) {$count++;} @@ -209,12 +215,39 @@ class Template_Management_Controller extends REST_Controller { { $answer_inserted = $this->Template_Management_Model->saveRecords($answer,TEMPLATEANSWERWEIGHTAGE); - if($answer_inserted != "" || $answer_inserted != null) {$count++;} + //if($answer_inserted != "" || $answer_inserted != null) {$count++;} } } } - if(($question_modified != "" || $question_modified != null) && count($answers_array) == $count) + + } + else + { + if(isset($template_question_answers_detail['answers'])) + { + $answers_array = $template_question_answers_detail['answers']; + unset($template_question_answers_detail['answers']); + } + + unset($template_question_answers_detail['question_id']); + unset($template_question_answers_detail['question']); + $question_id = $this->Template_Management_Model->saveRecords($template_question_answers_detail,TEMPLATEQUESTION); + if($question_id){$question_count++;} + if(count($answers_array)) + { + foreach($answers_array as $key => $answer) + { + $answer['fk_template_question_id'] = $question_id; + unset($answer['answer']); + $answer_inserted = $this->Template_Management_Model->saveRecords($answer,TEMPLATEANSWERWEIGHTAGE); + //if($answer_inserted != "" || $answer_inserted != null) {$count++;} + } + } + } + } + + if(($question_count != "" || $question_id != null) ) { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; @@ -227,48 +260,11 @@ class Template_Management_Controller extends REST_Controller { $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; $this->response($data,REST_Controller::HTTP_OK); } - - } - else - { - if(isset($template_question_answers_detail['answers'])) - { - $answers_array = $template_question_answers_detail['answers']; - unset($template_question_answers_detail['answers']); - } - - $question_id = $this->Template_Management_Model->saveRecords($template_question_answers_detail,TEMPLATEQUESTION); - - if(count($answers_array)) - { - foreach($answers_array as $key => $answer) - { - $answer['fk_template_question_id'] = $question_id; - $answer_inserted = $this->Template_Management_Model->saveRecords($answer,TEMPLATEANSWERWEIGHTAGE); - if($answer_inserted != "" || $answer_inserted != null) {$count++;} - } - } - - - if(($question_id != "" || $question_id != null) && count($answers_array) == $count) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $question_id; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_OK); - } - - - } - } } + + + /******** Load Existed Template Master Details for Edit page @param template id ********/ public function getTemplateMaster_post() { diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 1569e444..17040f36 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -13,7 +13,7 @@ class PD_Model extends SPARQ_Model { public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid)// $page represents mysql offset { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y") as scheduled_on,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y") as completed_on'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT'); $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); @@ -237,7 +237,7 @@ class PD_Model extends SPARQ_Model { */ public function getPDMasterDetails($pdid) { - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDSTATUS.pd_status_name, PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y") as scheduled_on,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y") as completed_on'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); $this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id ','LEFT'); $this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT'); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index a0b21ecb..85122522 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -104,7 +104,7 @@ class Template_Management_Model extends SPARQ_Model { // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATECATEGORYWEIGHTAGE.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->WHERE('TEMPLATECATEGORYWEIGHTAGE.fk_template_id',$template_id); $categories = $this->db->GET()->result_array(); - + if(count($categories)) { /* @@ -195,6 +195,30 @@ class Template_Management_Model extends SPARQ_Model { //$questions['answers'] = $questions; } + else + { + $this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question,TEMPLATEQUESTION.template_question_id, TEMPLATEQUESTION.fk_template_id, TEMPLATEQUESTION.fk_question_id, TEMPLATEQUESTION.question_weightage, TEMPLATEQUESTION.question_answerable_by,TEMPLATEQUESTION.fk_template_question_category_id, TEMPLATEQUESTION.isactive'); + //$this->db->FROM(TEMPLATEQUESTION.' as TEMPLATEQUESTION'); + $this->db->FROM(QUESTIONS.' as QUESTIONS'); + $this->db->JOIN(TEMPLATEQUESTION.' as TEMPLATEQUESTION','QUESTIONS.question_id = TEMPLATEQUESTION.fk_question_id','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); + // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); + $this->db->WHERE('QUESTIONS.fk_question_category',$category_id); + $questions = $this->db->GET()->result_array(); + if(count($questions)) + { + + foreach($questions as $answer_key => $question) + { + $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage, TEMPLATEANSWERWEIGHTAGE.isactive'); + $this->db->FROM(QUESTIONANSWERS.' as QUESTIONANSWERS'); + $this->db->JOIN(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE','QUESTIONANSWERS.question_answer_id = TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id','LEFT'); + $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); + $answers = $this->db->GET()->result_array(); + $questions[$answer_key]['answers'] = $answers; + } + } + } } return $questions; From 061266f18b4a7b9f747008916a244cbcc8b20cea Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 17 Oct 2018 14:49:15 +0530 Subject: [PATCH 26/26] PD CON --- api/application/controllers/PD_Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 8853a7cf..e403be91 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -699,7 +699,7 @@ class PD_Controller extends REST_Controller { $fields = array('fk_question_category_id','weightage'); $where_condition_array = array('fk_template_id'=>$template_id); $res_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATECATEGORYWEIGHTAGE); - print_r($res_array); + //print_r($res_array); foreach($res_array as $key => $category) { @@ -707,7 +707,7 @@ class PD_Controller extends REST_Controller { $this->PD_Model->saveRecords($temp_data,PDCATEGORYWEIGHTAGE); } } - die(); + //die(); $records = $this->post('records'); if($records['schedule_time'] != "" || $records['schedule_time'] != null) {