From 259663b9fb2394d5787497f81f41df3259c88d20 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Mon, 3 Dec 2018 12:10:19 +0530
Subject: [PATCH] ASSESSED INCOME 3

---
 api/application/config/constants.php          | 2 +-
 api/application/controllers/PD_Controller.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 0f12996c..e7d72071 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', 'getAssessedIncome'); // no errors
+defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getPDFormDetails'); // no errors
 
 /*********************AWS resources Constants*************************************************/
 defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 4fafad09..7fb1695a 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -1575,6 +1575,8 @@ class PD_Controller extends REST_Controller {
 		
 		$result_array = $this->PD_Model->getPDFormDetails($pd_id,$pd_form_id);
 		
+		//call helper function for get structured key,value pairs
+		$final_array = GETPDFORMDETAILS::getPDFormDetailsStructured($result_array,$pd_id,$pd_form_id);
 		// *****************************Get Docs from bucket 
 		 // Get Alredy stored Images
 							$fields = array('pd_document_title', 'pd_document_name');
@@ -1594,12 +1596,16 @@ class PD_Controller extends REST_Controller {
 										 $pd_docs[$doc_key]['pd_document_name'] = $singed_uri;
 									 }
 								 }
+								 
+								 
+								  $final_array['base64images'] = $pd_docs;
 							 }
+							
 								
 							 
 		// *************************End Get Docs from bucket 
 		
-		$final_array = GETPDFORMDETAILS::getPDFormDetailsStructured($result_array,$pd_id,$pd_form_id);
+		
 		
 		if($result_array)
 		{
@@ -1638,6 +1644,7 @@ class PD_Controller extends REST_Controller {
 		 if(array_key_exists('base64images',$records))	
 		 {
 			 $base64images = $records['base64images'];
+			 unset($records['base64images']);
 		 }
 		//Deactivate Old rec
 			$where_condition_array = array('fk_pd_id' => $pd_id,"fk_form_id"=>$pd_form_id);