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