Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DASHBOARD 3

Browse Source
This commit is contained in:
velz 2018-11-01 16:44:25 +05:30
parent 78f07b6c6e
commit 2693586b90
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/constants.php
View File

@ -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', 'getDashBoardDetailsOfCity'); // 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');

25
api/application/controllers/PD_Controller.php
View File

@ -491,11 +491,11 @@ class PD_Controller extends REST_Controller {
if(count($res_array))
{
if($res_array['pd_status'] == TRIGGERED || $res_array['pd_status'] == DRAFT)
if($res_array[0]['pd_status'] == TRIGGERED || $res_array[0]['pd_status'] == DRAFT)
{
$fields = array('fk_template_id');
$where_condition_array = array('fk_lender_id'=>$res_array['fk_lender_id'] ,'fk_product_id'=> $res_array['fk_product_id'],'fk_customer_segment'=> $res_array['fk_customer_segment'],'isactive' => 1);
$where_condition_array = array('fk_lender_id'=>$res_array[0]['fk_lender_id'] ,'fk_product_id'=> $res_array[0]['fk_product_id'],'fk_customer_segment'=> $res_array[0]['fk_customer_segment'],'isactive' => 1);
$table = LENDERTEMPLATE;
@ -850,6 +850,17 @@ class PD_Controller extends REST_Controller {
*/
public function getListPDOfficers_post()
{
// $this->db->SELECT('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role');
// $this->db->FROM(USERPROFILE.' as USERPROFILE');
// $this->db->JOIN(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILE.userid = USERPROFILEROLES.fk_userid');
// $this->db->JOIN(ROLES.' as ROLES','USERPROFILEROLES.user_role = ROLES.role_name');
// $names = $this->db->GET()->result_array();
// print_r($this->db->last_query());
// print_r($names);
// die();
$pdid = $this->post('pdid');
//1.Get LenderID and CityID by using pdid
$fields = array('fk_lender_id','fk_city','fk_pd_type','fk_product_id','fk_customer_segment');
@ -919,6 +930,16 @@ class PD_Controller extends REST_Controller {
}
}
// if($res_array['fk_pd_type'] == 2 || $res_array['fk_pd_type'] == 3)
// {
// $this->db->SELECT('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.profilepic,USERPROFILE.mobile_no,USERPROFILEROLES.user_role');
// $this->db->FROM(USERPROFILE.' as USERPROFILE');
// $this->db->JOIN(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILE.userid = USERPROFILEROLES.fk_pdid');
// $this->db->JOIN(ROLES.' as ROLES','USERPROFILEROLES.user_role = ROLES.role_name');
// $this->db->WHERE('USERPROFILE.userid',$pdofficer['fk_user_id']);
// $names = $this->db->GET()->result_array();
// }
$data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK;
$data['records'] = $list_of_pd_officers;