From 0f9b563b13be30a23d832942134df132acbd1c71 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 9 Nov 2018 18:59:31 +0530 Subject: [PATCH] DASHBOARD CHNAGED --- api/application/config/constants.php | 2 +- .../controllers/Dash_Board_Controller.php | 2 +- api/application/controllers/PD_Controller.php | 20 +++++---- api/application/models/Dash_Board_Model.php | 44 ++++++++++++++++++- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 613278f8..cc9c0395 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', 'getPDFormDetails'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getDashBoardLenderCity'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/controllers/Dash_Board_Controller.php b/api/application/controllers/Dash_Board_Controller.php index ca4d2d25..2c6085ab 100644 --- a/api/application/controllers/Dash_Board_Controller.php +++ b/api/application/controllers/Dash_Board_Controller.php @@ -34,7 +34,7 @@ class Dash_Board_Controller extends REST_Controller { public function getDashBoardDetailsOfLenderAndCitywise_get() { $res = $this->Dash_Board_Model->getDetailsOfLenderAndCitywise(); - + print_r($res); die(); $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = $res; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index a526b157..d39ddbe6 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -1501,6 +1501,7 @@ class PD_Controller extends REST_Controller { $pre_group = ""; $pre_sub_group = ""; $pre_iter = ""; + $pre_sub_iter = ""; $t1 = array(); $t2 = array(); $group = array(); @@ -1537,27 +1538,27 @@ class PD_Controller extends REST_Controller { } else// Handle child group { - if($result['iter_sub_column_name'] != $pre_group && $result['iteration'] != $pre_iter) + if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter) { $t2 = array(); - $sub_group = array(); - // echo "New-".$result['iter_column_name']; + //$sub_group = array(); + //echo '\n'."New-".$result['iter_column_name'].$result['iteration']; // print_r(array($result['column_name']=>$result['column_value'])); $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2; $pre_sub_group = $result['iter_sub_column_name']; - $pre_iter = $result['iteration']; + $pre_sub_iter = $result['iteration']; } else { - // echo "old-".$result['iter_column_name']; + // echo '\n'."old-".$result['iter_column_name'].$result['iteration']; // print_r(array($result['column_name']=>$result['column_value'])); $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2; $pre_sub_group = $result['iter_sub_column_name']; - $pre_iter = $result['iteration']; + $pre_sub_iter = $result['iteration']; } @@ -1591,16 +1592,17 @@ class PD_Controller extends REST_Controller { // print_r($final_value); $temp_array = array($key=>$final_value); //print_r($temp_array); - + //$i = 0; foreach($final_data as $fkey => $fdata) { $i++; - //echo $vkey.'-'.$i; + //echo $vkey.'-'.$i.'-'.$fkey.'\n'; if($i == $vkey) { - + //$i--; $final_data[$fkey][$vkey] = array_merge($final_data[$fkey][$vkey],$temp_array); + //print_r($final_data[$fkey][$vkey]); } //$fdata[$i] } diff --git a/api/application/models/Dash_Board_Model.php b/api/application/models/Dash_Board_Model.php index 1e2211de..aa1aa506 100644 --- a/api/application/models/Dash_Board_Model.php +++ b/api/application/models/Dash_Board_Model.php @@ -32,6 +32,7 @@ class Dash_Board_Model extends SPARQ_Model { where date_format(pd.createdon,'%Y-%m-%d') = date_format(CURDATE(),'%Y-%m-%d') group by pd.fk_lender_id,pd.fk_city,pd.fk_pd_type,pd.pd_status;"; $result_data['current_day'] = $this->db->query($sql_query_current_day)->result_array(); + $result_data['current_day'] = $this->groupData($result_data['current_day']); $sql_query_current_week = "SELECT pd.fk_lender_id,entity.full_name,pd.fk_city,city.name as city_name,if(pd.fk_pd_type = 1,'FULL',if(pd.fk_pd_type = 2,'SMART',if(pd.fk_pd_type = 3,'TELE','OTHERS'))) as PDTYPE,pd.pd_status,count(*) as count FROM t_pd_triggered as pd JOIN m_entity as entity on pd.fk_lender_id = entity.entity_id @@ -39,19 +40,23 @@ class Dash_Board_Model extends SPARQ_Model { where WEEK(pd.createdon) = WEEK(CURDATE()) group by pd.fk_lender_id,pd.fk_city,pd.fk_pd_type,pd.pd_status;"; $result_data['current_week'] = $this->db->query($sql_query_current_week)->result_array(); + $result_data['current_week'] = $this->groupData($result_data['current_week']); $sql_query_current_month = "SELECT pd.fk_lender_id,entity.full_name,pd.fk_city,city.name as city_name,if(pd.fk_pd_type = 1,'FULL',if(pd.fk_pd_type = 2,'SMART',if(pd.fk_pd_type = 3,'TELE','OTHERS'))) as PDTYPE,pd.pd_status,count(*) as count FROM t_pd_triggered as pd JOIN m_entity as entity on pd.fk_lender_id = entity.entity_id JOIN m_city as city on pd.fk_city = city.city_id where MONTH(pd.createdon) = MONTH(CURDATE()) - group by pd.fk_lender_id,pd.fk_city,pd.fk_pd_type,pd.pd_status;"; + group by pd.fk_lender_id,pd.fk_city,pd.fk_pd_type;"; $result_data['current_month'] = $this->db->query($sql_query_current_month)->result_array(); + $result_data['current_month'] = $this->groupData($result_data['current_month']); + return $result_data; } public function getDashBoardDetailsOfCitywise() { + $sql_query_current_day = "SELECT pd.fk_city,city.name as city_name,if(pd.fk_pd_type = 1,'FULL',if(pd.fk_pd_type = 2,'SMART',if(pd.fk_pd_type = 3,'TELE','OTHERS'))) as PDTYPE,pd.pd_status,count(*) as count FROM t_pd_triggered as pd JOIN m_city as city on pd.fk_city = city.city_id where date_format(pd.createdon,'%Y-%m-%d') = date_format('31-10-2018','%Y-%m-%d') @@ -59,17 +64,22 @@ class Dash_Board_Model extends SPARQ_Model { $result_data['current_day'] = $this->db->query($sql_query_current_day)->result_array(); + $sql_query_current_week = "SELECT pd.fk_city,city.name as city_name,if(pd.fk_pd_type = 1,'FULL',if(pd.fk_pd_type = 2,'SMART',if(pd.fk_pd_type = 3,'TELE','OTHERS'))) as PDTYPE,pd.pd_status,count(*) as count FROM t_pd_triggered as pd JOIN m_city as city on pd.fk_city = city.city_id where WEEK(pd.createdon) = WEEK(CURDATE()) group by pd.fk_city,pd.fk_pd_type,pd.pd_status;"; $result_data['current_week'] = $this->db->query($sql_query_current_week)->result_array(); + $sql_query_current_month = "SELECT pd.fk_city,city.name as city_name,if(pd.fk_pd_type = 1,'FULL',if(pd.fk_pd_type = 2,'SMART',if(pd.fk_pd_type = 3,'TELE','OTHERS'))) as PDTYPE,pd.pd_status,count(*) as count FROM t_pd_triggered as pd JOIN m_city as city on pd.fk_city = city.city_id where MONTH(pd.createdon) = MONTH(CURDATE()) group by pd.fk_city,pd.fk_pd_type,pd.pd_status;"; $result_data['current_month'] = $this->db->query($sql_query_current_month)->result_array(); + //print_r($result_data['current_month']); + + return $result_data; } @@ -92,5 +102,37 @@ class Dash_Board_Model extends SPARQ_Model { return $query->result(); } + //for Internal purpose + public function groupData($arrayOfData) + { + + $pre_lender = ""; + $pre_city = ""; + $string = ""; + $array = array(); + $fkey = ""; + foreach($arrayOfData as $key => $d) + { + //print_r($d); + + if($d['fk_lender_id'] != $pre_lender || $d['fk_city'] != $pre_city) + { + //echo "New"; + $array[$key] = array('lender'=>$d['full_name'],'city'=>$d['city_name'],$d['PDTYPE'] => $d['count']); + $pre_lender = $d['fk_lender_id']; + $pre_city = $d['fk_city']; + $fkey = $key; + } + else + { + //echo "OLd"; + $array[$fkey] = array_merge($array[$fkey],array($d['PDTYPE'] => $d['count'])); + $pre_lender = $d['fk_lender_id']; + $pre_city = $d['fk_city']; + } + } + return $array; + } + } \ No newline at end of file