Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASSEST CHANGED

Browse Source
This commit is contained in:
velz 2018-11-21 15:22:36 +05:30
parent 81e622bc1d
commit 54c044ffef
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/application/controllers/PD_Controller.php
View File

@ -1512,6 +1512,11 @@ class PD_Controller extends REST_Controller {
$z = 0;
$y = 0;
/////For handling Rendal form Sub array//////
/////For handling Asset form Commom Remark Filed//////
$asset_remark = array();
/////For handling Asset form Commom Remark Filed//////
foreach($result_array as $rkey => $result)
{
@ -1593,8 +1598,15 @@ class PD_Controller extends REST_Controller {
else
{
$t = array($result['column_name']=>$result['column_value']);
$final_data = array_merge($final_data,$t);
if($pd_form_id != 4)
{
$t = array($result['column_name']=>$result['column_value']);
$final_data = array_merge($final_data,$t);
}
else // asset form details commom remark field
{
$asset_remark = array($result['column_name']=>$result['column_value']);
}
}
@ -1638,7 +1650,12 @@ class PD_Controller extends REST_Controller {
}
//$final_data = array_merge($final_data,$group);
if($pd_form_id == 17)
if($pd_form_id == 4)// to merge assest form commom remarks at end of final data.
{
$final_data = array_merge($final_data,$asset_remark);
}
if($pd_form_id == 17)//merge subgroup of rental verification form with parent group, diff scenario not like other forms
{
if(array_key_exists('rental_home',$final_data))
{