From 621ff8489629276b3348541677ea3c6929108581 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 14 Dec 2018 15:55:08 +0530 Subject: [PATCH] ADDRESS FORM ERROR RESLOVED --- .../helpers/getpdformdetails_helper.php | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/api/application/helpers/getpdformdetails_helper.php b/api/application/helpers/getpdformdetails_helper.php index 54e8f474..42ec3d89 100644 --- a/api/application/helpers/getpdformdetails_helper.php +++ b/api/application/helpers/getpdformdetails_helper.php @@ -66,7 +66,7 @@ class GETPDFORMDETAILS } else// Handle child group { - if($pd_form_id != 17) + if($pd_form_id != 17 && $pd_form_id != 5) { if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter) { @@ -86,6 +86,26 @@ class GETPDFORMDETAILS $pre_sub_iter = $result['iteration']; } } + else if($pd_form_id == 5)//handle Address form subgroup details + { + if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter) + { + + $t2 = array(); + $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); + $sub_group[$result['iter_sub_column_name']][$result['iteration']][] = $t2; + $pre_sub_group = $result['iter_sub_column_name']; + $pre_sub_iter = $result['iteration']; + } + else + { + + $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); + $sub_group[$result['iter_sub_column_name']][$result['iteration']][] = $t2; + $pre_sub_group = $result['iter_sub_column_name']; + $pre_sub_iter = $result['iteration']; + } + } else// handle Rental form Sub group { if($result['column_name'] == $pre_column_name) @@ -126,12 +146,12 @@ class GETPDFORMDETAILS $final_data = array_merge($final_data,$group); } - // print_r($final_data); + //print_r($final_data); // echo "\n"; - //print_r($sub_group); + //print_r($sub_group);die(); // Merge subgroup into main group for all forms except rendtal form (id = 17) $i = 0; - if(count($sub_group) && $pd_form_id != 17 && $pd_form_id != 4) + if(count($sub_group) && $pd_form_id != 17 && $pd_form_id != 4 && $pd_form_id != 5) { foreach($sub_group as $key => $value) @@ -146,7 +166,7 @@ class GETPDFORMDETAILS { $i++; - echo $fkey.'-'.$i.'-'.$vkey; + //echo $fkey.'-'.$i.'-'.$vkey; if($i == $vkey) { @@ -177,6 +197,23 @@ class GETPDFORMDETAILS } $final_data = array_merge($final_data,$asset_remark); } + + if($pd_form_id == 5)//Merge Address form sub_group details separatly + { + if(array_key_exists('premises_city',$sub_group)) + { + foreach($sub_group['premises_city'] as $k => $value) + { + // echo $k; + // print_r($value); + if(array_key_exists($k,$final_data['additional_premises'])) + { + $final_data['additional_premises'][$k]['premises_city'] = $value; + } + } + } + $final_data = array_merge($final_data,$asset_remark); + } //die(); if($pd_form_id == 17)//merge subgroup of rental verification form with parent group, diff scenario not like other forms {