From f7eda095c9a83bc9a7b190f979502943b35e2dcc Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Mon, 5 Nov 2018 15:18:06 +0530
Subject: [PATCH] FORMS2

---
 api/application/controllers/PD_Controller.php | 35 ++++++++++++++-----
 api/application/models/PD_Model.php           |  5 +--
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 982125a9..16fafd9d 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -1499,30 +1499,41 @@ class PD_Controller extends REST_Controller {
 			
 			$group = array();
 			$pre_iter = 1;
+			$t1 = array();
+			$t2 = array();
 			foreach($result_array as $rkey => $result)
 			{
 			  if($result['iteration'] != "" || $result['iteration'] != null)
 			  {
 				  if($result['iteration'] == $pre_iter)
 				  {
-					  $group[$result['iteration']][] = $result;
+					
+					 
+					  $t1 = array_merge($t1,array($result['column_name']=>$result['column_value']));
+					  $group[$result['iter_column_name']][$result['iteration']] = $t1;
 					  $pre_iter = $result['iteration'];
 				  }
 				  else
 				  {
-					   $group[$result['iteration']][] = $result;
-					   $pre_iter = $result['iteration'];
+					   
+						 $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
+						 $group[$result['iter_column_name']][$result['iteration']] = $t2;
+						 $pre_iter = $result['iteration'];
 				  }
 			  }
 			  else
 			  {
-				$final_data[] = $result;  
+				$t = array($result['column_name']=>$result['column_value']);
+				//$final_data[] = $t;  
+				$final_data = array_merge($final_data,$t);
 			  }
 			  
-			  
+			  $final_data = array_merge($final_data,$group);
 			}
-			$final_data[] = $group;
-			//print_r($final_data);
+			
+			//$final_data[] = $group;
+			
+			
 			$result_array = $final_data;
 			
 			
@@ -1555,6 +1566,12 @@ class PD_Controller extends REST_Controller {
 		$pd_form_id = $records['formid'];
 		$fk_createdby = $records['fk_createdby'];
 		$i = 0;
+		
+		//Deactivate Old rec
+			$where_condition_array = array('fk_pd_id' => $pd_id,"fk_form_id"=>$pd_form_id);
+			$array = array('isactive'=>0);
+			$pd_id_modified = $this->PD_Model->updateRecords($array,PDFORMDETAILS,$where_condition_array);
+			
 		foreach($records as $rec_key => $record)
 		{
 			$i++;
@@ -1562,7 +1579,7 @@ class PD_Controller extends REST_Controller {
 			//****************handle supplier form details logic***************//
 			// if($pd_form_id == 1)
 			// {
-				if($i != 1 && $i != 2 && $i != 3)
+				if($rec_key !='pdid' && $rec_key != 'formid' && $rec_key != 'fk_createdby')
 				{
 					//echo $rec_key;print_r($record);echo "\n\n\n";
 					if(!is_array($record))//sine key and value pair
@@ -1582,7 +1599,7 @@ class PD_Controller extends REST_Controller {
 								if($r != "" && $r != null)
 								{
 									
-									$temp_array = array('fk_pd_id'=>$pd_id,'fk_form_id'=>$pd_form_id,'column_name'=>$rkey,'column_value'=>$r,'fk_createdby'=>$fk_createdby,'iteration'=>$iter);
+									$temp_array = array('fk_pd_id'=>$pd_id,'fk_form_id'=>$pd_form_id,'iter_column_name'=>$rec_key,'column_name'=>$rkey,'column_value'=>$r,'fk_createdby'=>$fk_createdby,'iteration'=>$iter);
 									$id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILS);
 								}
 								
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 93aa2dec..10d8b75a 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -735,12 +735,13 @@ class PD_Model extends SPARQ_Model {
 	
       public function getPDFormDetails($pd_id,$pd_form_id)
 	  {
-		  $this->db->SELECT('PDFORMDETAILS.iteration, PDFORMDETAILS.column_name, PDFORMDETAILS.column_id, PDFORMDETAILS.column_value, PDFORMDETAILS.createdon, PDFORMDETAILS.fk_createdby,USERPROFILE.first_name,USERPROFILE.last_name');
+		  $this->db->SELECT('PDFORMDETAILS.iter_column_name,PDFORMDETAILS.iteration, PDFORMDETAILS.column_name, PDFORMDETAILS.column_id, PDFORMDETAILS.column_value, PDFORMDETAILS.createdon, PDFORMDETAILS.fk_createdby,USERPROFILE.first_name,USERPROFILE.last_name');
 		  $this->db->FROM(PDFORMDETAILS.' as PDFORMDETAILS');
 		  $this->db->JOIN(USERPROFILE.' as USERPROFILE','PDFORMDETAILS.fk_createdby = USERPROFILE.userid');
 		  $this->db->WHERE('PDFORMDETAILS.fk_pd_id',$pd_id);
 		  $this->db->WHERE('PDFORMDETAILS.fk_form_id',$pd_form_id);
-		  $this->db->ORDER_BY('PDFORMDETAILS.iteration');
+		  $this->db->WHERE('PDFORMDETAILS.isactive',1);
+		  //$this->db->ORDER_BY('PDFORMDETAILS.iteration');
 		  $form_details = $this->db->GET()->result_array();
 		  
 		  return $form_details;