From 85b0b318d94bfe8e7531a686a0db8560a8de08cf Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 15 Oct 2018 18:11:46 +0530 Subject: [PATCH] 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);