From de784f99d75b188047fec1dfa44ad0055c2f834f Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Tue, 24 Aug 2021 19:45:10 +0530
Subject: [PATCH] MIS Report Change on Headers 2 : ps

---
 .../controllers/Dash_Board_Controller.php     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/api/application/controllers/Dash_Board_Controller.php b/api/application/controllers/Dash_Board_Controller.php
index 203e9574..c43e1469 100644
--- a/api/application/controllers/Dash_Board_Controller.php
+++ b/api/application/controllers/Dash_Board_Controller.php
@@ -181,38 +181,37 @@ class Dash_Board_Controller extends REST_Controller {
 		
 		$res = $this->Dash_Board_Model->pdTATreport($applicant_id,$from_date,$to_date,$city,$branch,$lender_short_name);
 	
-		$pre_defined_lenders = array('ICICI','CLIX','HHFL','IMGC','IIB');
-		$title = array();$title2 = array();
-		if(in_array($lender_short_name,$pre_defined_lenders)){
-			$field_mapping = $this->Dash_Board_Model->lenderwise_field_mapping($lender_short_name);
+		$mapped_title = array();
+		$title = array();
+		$final = array();
+
+		$lender = in_array($lender_short_name,array('ICICI','CLIX','HHFL','IMGC','IIB')) ? $lender_short_name : 'OTHERS';
+
+			$field_mapping = $this->Dash_Board_Model->lenderwise_field_mapping($lender);
 			for($a=0;$a<count($field_mapping);$a++){
 				$column = explode(",",$field_mapping[$a]['column_list']);
 				$lender = $field_mapping[$a]['lender_short_name'];
 				$title_arr = explode(",",$field_mapping[$a]['column_title']);
 			}
 			$array = json_decode(json_encode($res), true);
-			$new = array();
+		
 			for($i=0;$i<count($array);$i++){	
 				for($j=0;$j<count($column);$j++){	
-					$new[$i][$column[$j]] = $array[$i][$column[$j]];
+					$final[$i][$column[$j]] = $array[$i][$column[$j]];
 				}
 			}
 			for($k=0;$k<count($column);$k++){	
-				$title[$column[$k]] = $title_arr[$k];
-				$title2[$k] = $title_arr[$k];
+				$mapped_title[$column[$k]] = $title_arr[$k];
+				$title[$k] = $title_arr[$k];
 			}
-			$final = $new;
-		}else{
-		    $lender = $lender_short_name;
-			$final = json_decode(json_encode($res), true);
-		}					
+
 		$data['dataStatus'] = true;
 		$data['status'] = REST_Controller::HTTP_OK;
 		// $data['records'] = $res;
 		$data['records'] = $final;
-		$data['lender'] = $lender;
-		$data['header'] = $title;
-		$data['header2']= $title2;
+		$data['lender'] = $lender_short_name;
+		$data['mappedHeader'] = $mapped_title;
+		$data['header']= $title;
 		$this->response($data,REST_Controller::HTTP_OK);	
 	}	
 }	
\ No newline at end of file