From bfe6580a6017cee28baa6401fed6cbf5a002f43d Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 27 Sep 2018 10:40:50 +0530 Subject: [PATCH] QUES MAS CHANGED --- api/application/controllers/PD_Controller.php | 6 +++--- .../controllers/Question_Management_Controller.php | 2 +- api/application/models/Question_Management_Model.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index f2713e49..169fbb62 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -172,9 +172,9 @@ class PD_Controller extends REST_Controller { /********For Save New PD while Trigger****/ public function triggerNewPD_post() { - echo "TRIGGER"; - //$this->aws_ses->verifyEmailAddress('velmurugan.s@venbainfotech.com'); - die(); + // echo "TRIGGER"; + // //$this->aws_ses->verifyEmailAddress('velmurugan.s@venbainfotech.com'); + // die(); $pd_details = json_decode($this->post('pd_details'),true); $pd_applicant_details = json_decode($this->post('pd_applicant_details'),true); $pd_document_titles = json_decode($this->post('pd_document_titles'),true); diff --git a/api/application/controllers/Question_Management_Controller.php b/api/application/controllers/Question_Management_Controller.php index c9696ebe..d64a6aa8 100644 --- a/api/application/controllers/Question_Management_Controller.php +++ b/api/application/controllers/Question_Management_Controller.php @@ -65,7 +65,7 @@ class Question_Management_Controller extends REST_Controller { //$count++; foreach($answers as $answer) { - $temp_answers = array('fk_question_id' => $question_id, 'answer' =>$answer , 'createdon' =>$records['createdon'] , 'fk_createdby' =>$records['fk_createdby']); + $temp_answers = array('fk_question_id' => $question_id, 'answer' =>$answer['answer'] , 'createdon' =>$records['createdon'] , 'fk_createdby' =>$records['fk_createdby']); $child_id = $this->db->saveRecords($temp_answers,QUESTIONANSWERS); } diff --git a/api/application/models/Question_Management_Model.php b/api/application/models/Question_Management_Model.php index 5ace9256..6de4bde1 100644 --- a/api/application/models/Question_Management_Model.php +++ b/api/application/models/Question_Management_Model.php @@ -14,7 +14,7 @@ class Question_Management_Model extends SPARQ_Model { { - $this->db->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_catagory,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->SELECT('QUESTIONS.question_id, QUESTIONS.question, QUESTIONS.description, QUESTIONS.fk_question_catagory,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 AND QUESTIONANSWERTYPE.isactive = 1'); $this->db->JOIN(QUESTIONCATEGORY.' as QUESTIONCATEGORY','QUESTIONS.fk_question_catagory = QUESTIONCATEGORY.question_categroy_id AND QUESTIONCATEGORY.isactive = 1');