From e772b1f5f34b511e36176651081daa339498fe2a Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 24 Oct 2018 16:56:46 +0530 Subject: [PATCH] PD PROCESS CHANGE --- api/application/config/constants.php | 5 +++- api/application/models/PD_Model.php | 41 +++++++++++++++------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 5a7fa6d8..c8a42285 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', 'getVendorCityMap'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAnswersForPD'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -315,6 +315,9 @@ defined('PDCATEGORYWEIGHTAGEID') OR define('PDCATEGORYWEIGHTAGEID','pd_category_ defined('PDDETAIL') OR define('PDDETAIL','t_pd_details'); defined('PDDETAILID') OR define('PDDETAILID','pd_detail_id'); +defined('PDANSWER') OR define('PDANSWER','t_pd_answers'); +defined('PDANSWERID') OR define('PDANSWERID','pd_detail_answer_id'); + defined('COMMONMASTER') OR define('COMMONMASTER','h_common_masters'); defined('COMMONMASTERID') OR define('COMMONMASTERID','log_id'); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index deb7ed8c..ee0343a3 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -424,7 +424,7 @@ class PD_Model extends SPARQ_Model { //$this->db->WHERE('TEMPLATEQUESTION.fk_template_id',$template_id); $questions = $this->db->GET()->result_array(); - //print_r($questions); + //print_r($questions);die(); $categories[$category_key]['questions_count'] = count($questions); if(count($questions)) @@ -432,10 +432,11 @@ class PD_Model extends SPARQ_Model { //image S3 url attach is pending 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,PDDETAIL.pd_detail_id'); + + $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,PDANSWER.pd_detail_answer_id'); $this->db->FROM(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE'); $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id','LEFT'); - $this->db->JOIN(PDDETAIL.' as PDDETAIL',"QUESTIONANSWERS.question_answer_id = PDDETAIL.pd_answer_id AND PDDETAIL.fk_pd_id = $pdid",'LEFT'); + $this->db->JOIN(PDANSWER." as PDANSWER","QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.fk_pd_id = $pdid",'LEFT'); // $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); $this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_template_question_id',$question['template_question_id']); // $this->db->WHERE('PDDETAIL.fk_pd_id',$pdid); @@ -460,32 +461,34 @@ class PD_Model extends SPARQ_Model { public function getAnswersForPD($question_id,$pd_id,$template_id,$category_id) { $pd_master_detials = $this->getPDMasterDetails($pd_id); - $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage,PDDETAIL.pd_detail_id,PDDETAIL.pd_anwer_image_title,PDDETAIL.pd_answer_image'); + $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage,PDANSWER.pd_detail_answer_id'); $this->db->FROM(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE'); $this->db->JOIN(TEMPLATEQUESTION." as TEMPLATEQUESTION","TEMPLATEANSWERWEIGHTAGE.fk_template_question_id = TEMPLATEQUESTION.template_question_id AND TEMPLATEQUESTION.fk_template_question_category_id = $category_id AND TEMPLATEQUESTION.fk_template_id = $template_id AND TEMPLATEQUESTION.fk_question_id = $question_id"); $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id'); - $this->db->JOIN(PDDETAIL.' as PDDETAIL',"QUESTIONANSWERS.question_answer_id = PDDETAIL.pd_answer_id AND PDDETAIL.fk_pd_id = $pd_id",'LEFT'); - // $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); + + $this->db->JOIN(PDANSWER.' as PDANSWER',"QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.fk_pd_id = $pd_id",'LEFT'); + + // $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']); // $this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_template_question_id',$question_id); //$this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_question_category_id',$category_id); //$this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_template_id',$template_id); // $this->db->WHERE('PDDETAIL.fk_pd_id',$pdid); $answers = $this->db->GET()->result_array(); - if(count($answers)) - { - $bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_detials[0]['fk_lender_id']; - foreach($answers as $answer_key => $answer) - { - if($answer['pd_answer_image'] != "" || $answer['pd_answer_image'] != null) - { - $profilepics3path = 'pd'.$pd_master_detials[0]['pd_id'].'/'.$answer['pd_answer_image']; - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$profilepics3path,'+30 minutes'); - $answers[$answer_key]['doc_url'] = $singed_uri; - } - } + // if(count($answers)) + // { + // $bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_detials[0]['fk_lender_id']; + // foreach($answers as $answer_key => $answer) + // { + // if($answer['pd_answer_image'] != "" || $answer['pd_answer_image'] != null) + // { + // $profilepics3path = 'pd'.$pd_master_detials[0]['pd_id'].'/'.$answer['pd_answer_image']; + // $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$profilepics3path,'+30 minutes'); + // $answers[$answer_key]['doc_url'] = $singed_uri; + // } + // } - } + // } return $answers; }