diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index 7c1bddc4..e08bf47d 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -189,6 +189,7 @@ class Sales_PD_Controller extends REST_Controller {
 
 				
 				//$json_data = (json_decode($sales_pd_data[0]['pd_json'],true));
+				//satellite_image::getSatelliteImage($sales_pd_id,2);
 				$all_section_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('sales_pd_id' => $sales_pd_id,'isactive' => 1),SALESPD_SECTION_DATA);
 			//	print_r($this->db->last_query());die();	
 				$view_data['master'] = $sales_pd_data;
@@ -244,7 +245,7 @@ class Sales_PD_Controller extends REST_Controller {
 	{
 		 $lender_id = $this->uri->segment(2);
 		 $user_id = $this->uri->segment(3);
-		 $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.sales_pd_sno','SALES_PD_DATA.applicant_name','SALES_PD_DATA.officer_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.product_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.short_name','PRODUCT.abbr','SALES_PD_DATA.createdon,SALES_PD_DATA.status');
+		 $columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.sales_pd_sno','SALES_PD_DATA.applicant_name','concat(USERPROFILE.first_name," ",USERPROFILE.first_name) as officer_name','SALES_PD_DATA.applicant_id','SALES_PD_DATA.lender_id','SALES_PD_DATA.product_id','SALES_PD_DATA.is_pdf','SALES_PD_DATA.is_edited','ENTITY.short_name','PRODUCT.abbr','SALES_PD_DATA.createdon','SALES_PD_DATA.status');
 		 $table = SALES_PD_DATA.' as SALES_PD_DATA';
 		 $joins = array(
 							array('table' => ENTITY. ' as ENTITY',
@@ -252,7 +253,10 @@ class Sales_PD_Controller extends REST_Controller {
 								  'jointype' => 'INNER'),
 							array('table' => PRODUCTS. ' as PRODUCT',
 								  'condition' =>'SALES_PD_DATA.product_id = PRODUCT.product_id',
-								  'jointype' => 'INNER')
+								  'jointype' => 'INNER'),
+							array('table' => USERPROFILE. ' as USERPROFILE',
+								  'condition' =>'SALES_PD_DATA.createdby = USERPROFILE.userid',
+								  'jointype' => 'LEFT')
 						  );
 
 			$where_condition_array = array();
@@ -290,9 +294,10 @@ class Sales_PD_Controller extends REST_Controller {
 		 //
 		//print_r($section_array);die();
 		//echo '###'.$section_array['section_id'].'####';
-		if($section_array['section_id'] == 9)
+		if($section_array['section_id'] == 2)
 		{
-			//print_r($section_array);		die();
+			//print_r(json_decode($section_array['section_data'],true));	
+		    //die();
 		}
 		if($section_array['section_id'])
 		{
@@ -316,17 +321,26 @@ class Sales_PD_Controller extends REST_Controller {
 		foreach ($questions as $ques_key => $question) 
 		{
 			//if($question['section_id']){}
-			if($question['is_repeatable'] == null && ($question['type'] == 1 || $question['type'] == 2 || $question['type'] == 3 || $question['type'] == 6 || $question['type'] == 7 || $question['type'] == 8))//text,radio,SDD
+			if($question['is_repeatable'] == null && ($question['type'] == 1 || $question['type'] == 2 || $question['type'] == 3 || $question['type'] == 4 || $question['type'] == 6 || $question['type'] == 7 || $question['type'] == 8))//text,radio,SDD,MDD,camera,txt area, searchable dd
 			{
 				
 				$temp_array[ $question['question_key'] ] = isset($question['answer_value']) ? $question['answer_value'] : null;
-				if($question['question_key'] == 'state' || $question['question_key'] == 'city' || $question['question_key'] == 'pincode')
+				if($question['question_key'] == 'state' || $question['question_key'] == 'city' || $question['question_key'] == 'pincode' || $question['question_key'] == 'loan_purpose')
 				{
+					//if($question['type'] == 4) { print_r($question['answer_value']); }
 					$temp_array[ $question['question_key'] ] = $this->getMasterData($question['answer_value'],$question['answers']);
+					//if($question['type'] == 4) { print_r($temp_array[ $question['question_key'] ]); }
 				}
 				if(isset($question['subfield_key']))
 				{
-					$temp_array[ $question['question_key'] ] = $question['subfield_value'];
+
+					$temp_array[ $question['question_key'] ] .= $question['subfield_value'];
+					if(substr_count($temp_array[ $question['question_key'] ], ','))
+					{
+						$temp_array[ $question['question_key'] ] = substr_replace($temp_array[ $question['question_key'] ],' and ', strrpos($temp_array[ $question['question_key'] ],','),1);
+
+					}
+
 				}
 			}
 			else if($question['is_repeatable'] == 1 )
@@ -365,21 +379,46 @@ class Sales_PD_Controller extends REST_Controller {
 				}
 			}
 		}
-		//print_r($temp_array);die();
+		// //print_r($temp_array);die();
+		// if($section_id == 2)
+		// {
+		// 	//print_r(json_decode($section_array['section_data'],true));		die();
+		// 	die();
+		// }
 		return $temp_array;
 	}
 
 	function getMasterData($id,$array)
 	{
 		
-		foreach($array as $value)
+		//print_r($id);
+		if(!is_array($id))
 		{
-			if($id == $value['answer_id'])
+			foreach($array as $value)
 			{
-				return $value['answer'];
-				break;
+				if($id == $value['answer_id'])
+				{
+					return $value['answer'];
+					break;
+				}
 			}
 		}
+		else
+		{
+			$final_string = '';
+
+			foreach($id as $value)
+			{
+				foreach($array as $mas_value)
+				{
+					if( !strcasecmp($value,$mas_value['answer_id']) && (substr_count($value,'Others') == 0))
+					{
+						$final_string .=  $mas_value['answer'] . ',';
+					}
+				}
+			}
+			return $final_string;
+		}
 		
 	}
 
@@ -390,7 +429,7 @@ class Sales_PD_Controller extends REST_Controller {
 		if($records['img_name'] == 'selfie_with_person_met')
 		{
 			//$location = $records['location'];
-			$update_fields = array('location' => $records['location']);
+			$update_fields = array('geo_location' => $records['location']);
 			$this->Sales_PD_Model->updateRecords($update_fields,SALES_PD_DATA,array('sales_pd_id' => $records['fk_sales_pd_id']));
 		}
 		
@@ -452,6 +491,7 @@ class Sales_PD_Controller extends REST_Controller {
 					else
 					{
 						$records['status'] = 'COMPLETED';
+						satellite_image::getSatelliteImage($id,2);
 						$id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id']));	
 					}
 				}
@@ -514,9 +554,9 @@ class Sales_PD_Controller extends REST_Controller {
 					//update Applicant ID and applicant Name to sales pD master Table
 					$applicant_id = '';
 					$applicant_name = '';
-					if($records['section_data'])
+					if($records['questions'])
 					{
-						foreach ($records['section_data']['questions'] as $g_key => $g_value)
+						foreach ($records['questions'] as $g_key => $g_value)
 						{
 							if($g_value['question_key'] == 'application_id')
 							{
@@ -568,9 +608,9 @@ class Sales_PD_Controller extends REST_Controller {
 			case 8: //final remarks of PD officer
 					//update PD officer Name to sales pD master Table
 					$officer = '';
-					if($records['section_data'])
+					if($records['questions'])
 					{
-						foreach($records['section_data']['questions'] as $g_key => $g_value)
+						foreach($records['questions'] as $g_key => $g_value)
 						{
 							if($g_value['question_key'] == 'name_of_sales_team_member')
 							{
diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php
index 7a204c77..6b985ce1 100644
--- a/api/application/views/sale_pd_templates/MWISE.php
+++ b/api/application/views/sale_pd_templates/MWISE.php
@@ -4,7 +4,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 						$uparrow = '<span style="color:green;">↑</span>';
 				    	$downarrow = '<span style="color:red;">↓</span>';
 				    	$dash = '<span style="color:black;"> </span>';
-				    	$product_name = $master[0]['abbr']
+				    	$product_name = $master[0]['abbr'];
 				    	$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
 				    	//print_r($master[0]['abbr']);die();
 ?><!DOCTYPE html>