diff --git a/api/application/config/customconfig_one.php b/api/application/config/customconfig_one.php
index 9fc24d2c..a7f1de59 100644
--- a/api/application/config/customconfig_one.php
+++ b/api/application/config/customconfig_one.php
@@ -47,4 +47,9 @@ $config['token_timeout'] = 1;
 $config['authorization_key'] = 'sparqvenba2018';
 
 /* End of file jwt.php */
-/* Location: ./application/config/jwt.php */
\ No newline at end of file
+/* Location: ./application/config/jwt.php */
+
+$config['master_tables_field_names'] = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'name','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name');
+
+$config['master_tables_pkid'] = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'master_tables_field_names');
+?>
\ No newline at end of file
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 5c84db41..5528173f 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -2207,9 +2207,9 @@ class PD_Controller extends REST_Controller {
 	public function transformKeyPairToQuestionAnswers($pd_form_raw_data,$form_id)
 	{
 		//field name array holds - field name of each masters table 
-		$master_tables_field_names = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'name','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name');
+		$master_tables_field_names = $this->config->item('master_tables_field_names');
 		
-		$master_tables_pkid = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'master_tables_field_names');
+		$master_tables_pkid = $this->config->item('master_tables_pkid');
 		
 		//Get Question Key Mapping masters
 		$fields = array('question', 'key', 'ismaster', 'master_name');
@@ -2233,11 +2233,12 @@ class PD_Controller extends REST_Controller {
 						else
 						{
 							$table = constant($master['master_name']);
-							$temp_fields =  array($master_tables_field_names[$master['master_name']]);
+							$temp_fields =  array($master_tables_field_names[$master['master_name']].' as name');
 							$where_condition_array = array($master_tables_pkid[$master['master_name']] => $raw_data['column_value']);
 							$result_data = $this->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table);
 							if(count($result_data))
 							{
+								//print_r($result_data);
 								$current_question_array[] = array('question'=>$master['question'],'answer'=>$result_data[0]['name']);
 							}
 							// 
@@ -2547,17 +2548,21 @@ class PD_Controller extends REST_Controller {
 	{
 		$records = $this->post('records');
 		$pdid = $records['pd_id'];
-		$final_report_string = "RAW";
+		$original_template = "RAW";
 		
 		$pd_master_details = $this->PD_Model->getPDMasterDetails($pdid);
 		
+		//getSingleObjectInaBucketAsSignedURI($bucket_name,$folder_name,$time = '+5 minutes')
 		
+		//CHeck if already pd original version created 
+		if($pd_master_details[0]['is_original_report_created'] == "" || $pd_master_details[0]['is_original_report_created'] == null)
+		{
 		//Get PD Report Functions
 		$fields = array('report_template_id', 'fk_template_id','content');
 		$where_condition_array = array('fk_template_id'=>$pd_master_details[0]['fk_pd_template_id'],'isactive'=>1);
 		$result_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,REPORTTEMPLATES);
-		$final_report_string = $result_array[0]['content'];
-		print_r($final_report_string);
+		$original_template = $result_array[0]['content'];
+		
 		if(count($result_array))
 		{
 			preg_match_all("/{{(.*?)}}/",$result_array[0]['content'],$keys_from_template);
@@ -2572,52 +2577,92 @@ class PD_Controller extends REST_Controller {
 				
 				{
 					if($temp_key = array_search($template_key,$pd_form_raw))
-					//if(array_key_exists($template_key,$pd_form_raw_data))
+					
 					{
-						
-						$result_array[0]['content'] = str_replace($keys_from_template[0][$key_from_template],$pd_form_raw_data[$pd_form_raw_data_key]['column_value'],$result_array[0]['content']);
+						//echo $pd_form_raw_data[$pd_form_raw_data_key]['column_value'].'---'.$pd_form_raw_data[$pd_form_raw_data_key]['column_name'];
 						//echo "\n\n";
-						//print_r($final_report_string);
+						$result_array[0]['content'] = str_replace($keys_from_template[0][$key_from_template],$pd_form_raw_data[$pd_form_raw_data_key]['column_value'],$result_array[0]['content']);
 						
 					}
-					
-					
 				}
-					
-			}
-			
-				
+			}	
 		}
-		echo "\n\n";
-		print_r($result_array[0]['content']);
+		
 		
 		$output_file = APPPATH."/docs/temp.html";
 		$ifp = fopen( $output_file, 'wb' ); 
+		fwrite( $ifp, $original_template );
 		fwrite( $ifp, $result_array[0]['content'] );
 		fclose( $ifp ); 
 		//print_r($output_file);
 		$file= file_get_contents($output_file);
 		$pdf_doc = $this->pdfgenerator->generate($file, $filename='original_version', $stream=false, $paper = 'A4', $orientation = "portrait");
-		print_r($pdf_doc);
-		// $bucketname = LENDER_BUCKET_NAME_PREFIX.'1';
-					// $key = 'pd'.'1'.'/'.'pd_report_original_version.pdf';
-					// $sourcefile = $pdf_doc;
-					
-					// $bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile);
-					// $s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
-					// print_r($s3result);
-					// if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
-					// {
-						// echo "done";
-					// }
+		//print_r($pdf_doc);
+		
 
-					// $output_file2 = APPPATH."/docs/sample.pdf";
-					// echo file_put_contents($output_file2, $pdf_doc,FILE_APPEND);
-					//write_file($output_file2, $pdf_doc);
-		
-		// $ifp2 = fopen( $output_file2, 'wb' ); 
-		// fwrite( $ifp2, $pdf_doc );
-		// fclose( $ifp2 ); 
-		
+					$output_file2 = APPPATH."/docs/sample.pdf";
+					if(file_put_contents($output_file2, $pdf_doc))
+					{
+					$bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id'];
+					$key = 'pd'.$pdid.'/'.'pd_report_original_version.pdf';
+					$sourcefile = $output_file2;
+					
+					$bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile);
+					$s3result= $this->aws_s3->uploadFileToS3Bucket($bucket_data);
+					//print_r($s3result);
+					if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
+					{
+						
+						$where_condition_array = array("pd_id" => $pdid);
+						$temp_array = array('is_original_report_created'=>1);
+						$id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array);
+						
+						$uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,$time = '3600 seconds');
+						if($id != null || $id != "" )
+						{
+							$data['dataStatus'] = true;
+							$data['status'] = REST_Controller::HTTP_OK;
+							$data['records'] = array('pd_report_uri' => $s3result['ObjectURL']);
+							$this->response($data,REST_Controller::HTTP_OK);
+						}
+						else
+						{
+							$data['dataStatus'] = false;
+							$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
+							$data['msg'] = 'Something Went Wrong..!Try later';
+							$this->response($data,REST_Controller::HTTP_OK);
+						}
+						
+					}
+					}
+		}
+		else
+		{
+			//get latest or same original version of pd_report_original_version
+			$flag = 0;
+			if($pd_master_details[0]['pd_report_latest_version'] != null || $pd_master_details[0]['pd_report_latest_version'] != "")
+			{
+				$flag = 1;
+			}
+			
+			
+			$bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id'];
+			$key = 'pd'.$pdid.'/'.'pd_report_original_version.pdf';
+			if($flag == 1)
+			{
+				$key = 'pd'.$pdid.'/'.'version'.$pd_master_details[0]['pd_report_latest_version'].'.pdf';
+			}
+			//echo $key;
+			$uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,$time = '3600 seconds');
+			if($uri != "" || $uri != null)
+			{
+							$data['dataStatus'] = true;
+							$data['status'] = REST_Controller::HTTP_OK;
+							$data['records'] = array('pd_report_uri' => $uri);
+							$this->response($data,REST_Controller::HTTP_OK);
+			}
+			
+		}
+					
 	}
 }
\ No newline at end of file
diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php
index 0f6345a6..36b10045 100644
--- a/api/application/controllers/Template_Management_Controller.php
+++ b/api/application/controllers/Template_Management_Controller.php
@@ -537,9 +537,9 @@ class Template_Management_Controller extends REST_Controller {
 		$formid = $records['formid'];
 		$categoryid = $records['categoryid'];
 		//*******************INTERNAL PURPOSE***************************************************
-		$master_tables_field_names = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'name','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name');
+		$master_tables_field_names = $this->config->item('master_tables_field_names');
 		
-		$master_tables_pkid = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'master_tables_field_names');
+		$master_tables_pkid = $this->config->item('master_tables_pkid');
 		//*******************INTERNAL PURPOSE***************************************************
 		
 		//get Alreday assigned ques and kys from template
@@ -667,9 +667,9 @@ class Template_Management_Controller extends REST_Controller {
 		$templateid = $this->post('templateid');
 		
 		//*******************INTERNAL PURPOSE***************************************************
-		$master_tables_field_names = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'name','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name');
+		$master_tables_field_names = $this->config->item('master_tables_field_names');
 		
-		$master_tables_pkid = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'master_tables_field_names');
+		$master_tables_pkid = $this->config->item('master_tables_pkid');
 		//*******************INTERNAL PURPOSE***************************************************
 		
 		
@@ -747,6 +747,7 @@ class Template_Management_Controller extends REST_Controller {
 		 $pk_id = 0;
 		 if($records['report_template_id'] != "" || $records['report_template_id'] != null)
 		 {
+			 //echo "update";die();
 			 $where_condition_array = array('report_template_id' => $records['report_template_id']);
 			 $pk_id = $this->Template_Management_Model->updateRecords($records,REPORTTEMPLATES,$where_condition_array);
 		 }
diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf
index cb513b77..90d3ee9c 100644
Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ
diff --git a/api/application/docs/temp.html b/api/application/docs/temp.html
index 8ddd615c..e0e1bd33 100644
--- a/api/application/docs/temp.html
+++ b/api/application/docs/temp.html
@@ -1 +1,341 @@
-<p><span style='color:#27ae60'>My </span><span style='color:#27ae60'>html</span><span style='color:#27ae60'> content</span></p><p style='color: #ddd; font-size: 20px;'>Hi Karthi Raj,</p> <p>This is 50, I am form {{org_name}}, {{place}} , your transaction number ({{trans_number}}), has been activated,</p><p>can you please list all  check checkcheck.</p><p>Hope will get reply soon!!</p><p><strong>Regards,</strong></p><p>Rahit,</p><p>{{place}}</p><p>list all supplier details below</p><p>Resico</p>
\ No newline at end of file
+<p><span style='color:#27ae60'>My </span><span style='color:#27ae60'>html</span><span style='color:#27ae60'> content</span></p><p style='color: #ddd; font-size: 20px;'>Hi {{name_ans}},</p>
+  <p>This is {{name_ans}}, I am form {{age_ans}}, {{assets_mode}} , your Qualification number ({{qualification_ans}}), has been activated,</p>
+  <p>can you please verify with your local branch.</p>
+  <p>Hope will get reply soon!!</p>
+  <p><strong>Regards,</strong></p>
+  <p onclick='alert()'>{{name_of_the_owner}},</p>
+  <p style='font-weight: bold;'>Main Raw Materials are Listed Below</p>
+  <p>{{main_raw_materials}}</p>
+  
+  <p style='font-weight: bold;'>Suppliers are Listed Below</p>
+  
+	  <table style='height: 9px; margin-left: auto; margin-right: auto;' border=1 width='401'>
+	<tbody>
+	<tr>
+	<td style='width: 192.5px;'>{{supplier_name}}</td>
+	<td style='width: 192.5px;'>{{contact_person}}</td>
+	<td style='width: 192.5px;'>{{mobile_number}}</td>
+	<td style='width: 192.5px;'>{{payment_mode}}</td>
+	<td style='width: 192.5px;'>{{frequency_of_purchase}}</td>
+	</tr>
+	</tbody>
+	</table>
+  
+  
+  <hr>
+  <svg class='chart' width='420' height='150' aria-labelledby='title desc' role='img'>
+  <title id='title'>A bar chart showing information</title>
+  <desc id='desc'>4 apples; 8 bananas; 15 kiwis; 16 oranges; 23 lemons</desc>
+  <g class='bar'>
+    <rect width='40' height='19'></rect>
+    <text x='45' y='9.5' dy='.35em'>4 apples</text>
+  </g>
+  <g class='bar'>
+    <rect width='80' height='19' y='20'></rect>
+    <text x='85' y='28' dy='.35em'>8 bananas</text>
+  </g>
+  <g class='bar'>
+    <rect width='150' height='19' y='40'></rect>
+    <text x='150' y='48' dy='.35em'>15 kiwis</text>
+  </g>
+  <g class='bar'>
+    <rect width='160' height='19' y='60'></rect>
+    <text x='161' y='68' dy='.35em'>16 oranges</text>
+  </g>
+  <g class='bar'>
+    <rect width='230' height='19' y='80'></rect>
+    <text x='235' y='88' dy='.35em'>23 lemons</text>
+  </g>
+</svg>
+<svg viewBox='0 0 500 100' class='chart'>
+  
+  <polyline
+     fill='none'
+     stroke='#0074d9'
+     stroke-width='2'
+     points='
+       00,120
+       20,60
+       40,80
+       60,20
+       80,80
+       100,80
+       120,60
+       140,100
+       160,90
+       180,80
+       200, 110
+       220, 10
+       240, 70
+       260, 100
+       280, 100
+       300, 40
+       320, 0
+       340, 100
+       360, 100
+       380, 120
+       400, 60
+       420, 70
+       440, 80
+     '
+   ></polyline>
+  
+</svg>
+
+<style>
+.bar {
+  fill: red; /* changes the background */
+  height: 21px;
+  transition: fill .3s ease;
+  cursor: pointer;
+  font-family: Helvetica, sans-serif;
+}
+.bar text {
+  color: black;
+}
+.bar:hover,
+.bar:focus {
+  fill: black;
+}
+.bar:hover text,
+.bar:focus text {
+  fill: red;
+}
+.chart {
+  background: white;
+  width: 500px;
+  height: 100px;
+  border-left: 1px dotted #555;
+  border-bottom: 1px dotted #555;
+  padding: 20px 20px 20px 0;
+}
+</style>
+<script>
+var total = 158,
+    buttons = document.querySelector('.buttons'),
+    pie = document.querySelector('.pie'),
+    activeClass = 'active';
+
+var continents = {
+  asia: 60,
+  northAmerica : 5,
+  southAmerica: 9,
+  oceania: 1,
+  africa: 15,
+  europe: 12
+};
+
+// work out percentage as a result of total
+var numberFixer = function(num){
+  var result = ((num * total) / 100);
+  return result;
+}
+
+// create a button for each country
+for(property in continents){
+  var newEl = document.createElement('button');
+  newEl.innerText = property;
+  newEl.setAttribute('data-name', property);
+  buttons.appendChild(newEl);
+}
+
+// when you click a button setPieChart and setActiveClass
+  buttons.addEventListener('click', function(e){
+    if(e.target != e.currentTarget){
+      var el = e.target,
+          name = el.getAttribute('data-name');
+      setPieChart(name);
+      setActiveClass(el);
+    }
+    e.stopPropagation();
+  });
+
+var setPieChart = function(name){
+  var number = continents[name],
+      fixedNumber = numberFixer(number),
+      result = fixedNumber + ' ' + total;
+  
+  pie.style.strokeDasharray = result;
+}
+
+var setActiveClass = function(el) {
+  for(var i = 0; i < buttons.children.length; i++) {
+    buttons.children[i].classList.remove(activeClass);
+    el.classList.add(activeClass);
+  }
+}
+
+// Set up default settings
+setPieChart('asia');
+setActiveClass(buttons.children[0]);
+</script><p><span style='color:#27ae60'>My </span><span style='color:#27ae60'>html</span><span style='color:#27ae60'> content</span></p><p style='color: #ddd; font-size: 20px;'>Hi Karthi Raj,</p>
+  <p>This is Karthi Raj, I am form 50, 2 , your Qualification number (2), has been activated,</p>
+  <p>can you please verify with your local branch.</p>
+  <p>Hope will get reply soon!!</p>
+  <p><strong>Regards,</strong></p>
+  <p onclick='alert()'>Sriram,</p>
+  <p style='font-weight: bold;'>Main Raw Materials are Listed Below</p>
+  <p>check checkcheck</p>
+  
+  <p style='font-weight: bold;'>Suppliers are Listed Below</p>
+  
+	  <table style='height: 9px; margin-left: auto; margin-right: auto;' border=1 width='401'>
+	<tbody>
+	<tr>
+	<td style='width: 192.5px;'>Resico</td>
+	<td style='width: 192.5px;'>test</td>
+	<td style='width: 192.5px;'>9685471122</td>
+	<td style='width: 192.5px;'>3</td>
+	<td style='width: 192.5px;'>1</td>
+	</tr>
+	</tbody>
+	</table>
+  
+  
+  <hr>
+  <svg class='chart' width='420' height='150' aria-labelledby='title desc' role='img'>
+  <title id='title'>A bar chart showing information</title>
+  <desc id='desc'>4 apples; 8 bananas; 15 kiwis; 16 oranges; 23 lemons</desc>
+  <g class='bar'>
+    <rect width='40' height='19'></rect>
+    <text x='45' y='9.5' dy='.35em'>4 apples</text>
+  </g>
+  <g class='bar'>
+    <rect width='80' height='19' y='20'></rect>
+    <text x='85' y='28' dy='.35em'>8 bananas</text>
+  </g>
+  <g class='bar'>
+    <rect width='150' height='19' y='40'></rect>
+    <text x='150' y='48' dy='.35em'>15 kiwis</text>
+  </g>
+  <g class='bar'>
+    <rect width='160' height='19' y='60'></rect>
+    <text x='161' y='68' dy='.35em'>16 oranges</text>
+  </g>
+  <g class='bar'>
+    <rect width='230' height='19' y='80'></rect>
+    <text x='235' y='88' dy='.35em'>23 lemons</text>
+  </g>
+</svg>
+<svg viewBox='0 0 500 100' class='chart'>
+  
+  <polyline
+     fill='none'
+     stroke='#0074d9'
+     stroke-width='2'
+     points='
+       00,120
+       20,60
+       40,80
+       60,20
+       80,80
+       100,80
+       120,60
+       140,100
+       160,90
+       180,80
+       200, 110
+       220, 10
+       240, 70
+       260, 100
+       280, 100
+       300, 40
+       320, 0
+       340, 100
+       360, 100
+       380, 120
+       400, 60
+       420, 70
+       440, 80
+     '
+   ></polyline>
+  
+</svg>
+
+<style>
+.bar {
+  fill: red; /* changes the background */
+  height: 21px;
+  transition: fill .3s ease;
+  cursor: pointer;
+  font-family: Helvetica, sans-serif;
+}
+.bar text {
+  color: black;
+}
+.bar:hover,
+.bar:focus {
+  fill: black;
+}
+.bar:hover text,
+.bar:focus text {
+  fill: red;
+}
+.chart {
+  background: white;
+  width: 500px;
+  height: 100px;
+  border-left: 1px dotted #555;
+  border-bottom: 1px dotted #555;
+  padding: 20px 20px 20px 0;
+}
+</style>
+<script>
+var total = 158,
+    buttons = document.querySelector('.buttons'),
+    pie = document.querySelector('.pie'),
+    activeClass = 'active';
+
+var continents = {
+  asia: 60,
+  northAmerica : 5,
+  southAmerica: 9,
+  oceania: 1,
+  africa: 15,
+  europe: 12
+};
+
+// work out percentage as a result of total
+var numberFixer = function(num){
+  var result = ((num * total) / 100);
+  return result;
+}
+
+// create a button for each country
+for(property in continents){
+  var newEl = document.createElement('button');
+  newEl.innerText = property;
+  newEl.setAttribute('data-name', property);
+  buttons.appendChild(newEl);
+}
+
+// when you click a button setPieChart and setActiveClass
+  buttons.addEventListener('click', function(e){
+    if(e.target != e.currentTarget){
+      var el = e.target,
+          name = el.getAttribute('data-name');
+      setPieChart(name);
+      setActiveClass(el);
+    }
+    e.stopPropagation();
+  });
+
+var setPieChart = function(name){
+  var number = continents[name],
+      fixedNumber = numberFixer(number),
+      result = fixedNumber + ' ' + total;
+  
+  pie.style.strokeDasharray = result;
+}
+
+var setActiveClass = function(el) {
+  for(var i = 0; i < buttons.children.length; i++) {
+    buttons.children[i].classList.remove(activeClass);
+    el.classList.add(activeClass);
+  }
+}
+
+// Set up default settings
+setPieChart('asia');
+setActiveClass(buttons.children[0]);
+</script>
\ No newline at end of file
diff --git a/api/application/libraries/Pdfgenerator.php b/api/application/libraries/Pdfgenerator.php
index b452fb22..9681f1d9 100644
--- a/api/application/libraries/Pdfgenerator.php
+++ b/api/application/libraries/Pdfgenerator.php
@@ -23,9 +23,9 @@ class Pdfgenerator
 				if ($stream) {
 					$dompdf->stream($filename.".pdf", array("Attachment" => 0));
 				} else {
-					//return $dompdf->output();
-					$output_file2 = APPPATH."/docs/sample.pdf";
-					echo file_put_contents($output_file2, $dompdf->output());
+					return $dompdf->output();
+					//$output_file2 = APPPATH."/docs/sample.pdf";
+					//echo file_put_contents($output_file2, $dompdf->output());
 					// $CI =& get_instance();
 					// $CI->load->helper('file');
 					// write_file(APPPATH."/docs/sample.pdf",$dompdf->output());
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index db6db99c..f0de1c52 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -14,7 +14,7 @@ class PD_Model extends SPARQ_Model {
 		public function listLessPDDetails($page,$limit,$sort,$pdofficerid,$datetype,$fdate,$tdate,$lenderid,$status)// $page represents mysql offset
 		{
 			//echo $status;die();
-			$this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks');
+			$this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name,PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name, PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.is_original_report_created,PDTRIGGER.pd_report_latest_version');
 			$this->db->FROM(PDTRIGGER.' as PDTRIGGER');
 			$this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id','LEFT');
 			$this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT');
@@ -508,7 +508,7 @@ class PD_Model extends SPARQ_Model {
 	*/
 	public function getPDMasterDetails($pdid)
 	{
-		$this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,PDTRIGGER.scheduled_on as scheduled_on_for_validation,DATE_FORMAT(PDTRIGGER.scheduled_on,"%dth %b %Y ") as scheduled_date_for_log,DATE_FORMAT(PDTRIGGER.scheduled_on,"%h:%i %p") as scheduled_time_for_log,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.bounce_reason,PDTRIGGER.bounce_reason_others,BOUNCEMASTER.bounce_reason_name');
+		$this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.fk_lender_id,ENTITY.full_name as lender_full_name,ENTITY.short_name as lender_short_name, PDTRIGGER.fk_entity_billing_id,ENTITYBILLING.billing_name,PDTRIGGER.lender_applicant_id, DATE_FORMAT(PDTRIGGER.pd_date_of_initiation, "%d/%m/%Y") as pd_date_of_initiation, PDTRIGGER.fk_product_id,PRODUCTS.name as product_name,PRODUCTS.abbr as product_abbr, PDTRIGGER.fk_subproduct_id,SUBPRODUCTS.name as subproduct_name,SUBPRODUCTS.abbr as subproduct_abbr, PDTRIGGER.fk_pd_type,PDTYPE.type_name as pd_type_name, PDTRIGGER.pd_status,PDTRIGGER.pd_specific_clarification, DATE_FORMAT(PDTRIGGER.createdon,"%d/%m/%Y %H:%i:%s") as createdon, PDTRIGGER.fk_createdby, DATE_FORMAT(PDTRIGGER.updatedon,"%d/%m/%Y %H:%i:%s") as updatedon, PDTRIGGER.fk_updatedby,concat(USERPROFILE.first_name," ",USERPROFILE.last_name) as createdby,concat(USERPROFILE1.first_name," ",USERPROFILE1.last_name) as updatedby, PDTRIGGER.fk_pd_allocation_type,,PDALLOCATIONTYPE.pd_allocation_type_name, PDTRIGGER.fk_pd_allocated_to,concat(USERPROFILE2.first_name," ",USERPROFILE2.last_name) as pd_allocated_to,PDTRIGGER.executive_id,concat(EXECUTIVE.first_name," ",EXECUTIVE.last_name) as executive_name,PDTRIGGER.central_pd_officer_id,concat(CENTRALOFFICER.first_name," ",CENTRALOFFICER.last_name) as centralofficer,PDTRIGGER.fk_pd_template_id,TEMPLATE.template_name, PDTRIGGER.fk_customer_segment,CUSTOMERSEGMENT.name as customer_segment_name,CUSTOMERSEGMENT.abbr as customer_segment_abbr, PDTRIGGER.pd_officier_final_judgement, PDTRIGGER.pd_agency_id,AGENCY.full_name as agency_name, PDTRIGGER.loan_amount,PDTRIGGER.addressline1,PDTRIGGER.addressline2,PDTRIGGER.addressline3,PDTRIGGER.fk_city,CITY.name as city_name,PDTRIGGER.fk_state,STATE.name as state_name,PDTRIGGER.pincode,PDTRIGGER.pd_contact_person,PDTRIGGER.pd_contact_mobileno,DATE_FORMAT(PDTRIGGER.scheduled_on,"%d/%m/%Y %h:%i %p") as scheduled_on,PDTRIGGER.scheduled_on as scheduled_on_for_validation,DATE_FORMAT(PDTRIGGER.scheduled_on,"%dth %b %Y ") as scheduled_date_for_log,DATE_FORMAT(PDTRIGGER.scheduled_on,"%h:%i %p") as scheduled_time_for_log,DATE_FORMAT(PDTRIGGER.completed_on,"%d/%m/%Y %h:%i:%s %p") as completed_on,PDTRIGGER.remarks,PDTRIGGER.bounce_reason,PDTRIGGER.bounce_reason_others,BOUNCEMASTER.bounce_reason_name,PDTRIGGER.is_original_report_created,PDTRIGGER.pd_report_latest_version');
 			$this->db->FROM(PDTRIGGER.' as PDTRIGGER');
 			$this->db->JOIN(ENTITY.' as ENTITY','PDTRIGGER.fk_lender_id = ENTITY.entity_id ','LEFT');
 			$this->db->JOIN(ENTITYBILLING.' as ENTITYBILLING','PDTRIGGER.fk_entity_billing_id = ENTITYBILLING.entity_billing_id','LEFT');