diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index b0361010..bba0ee06 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -93,7 +93,7 @@ class PD_Controller extends REST_Controller { $fields = array('entity_lender_branch_id', 'branch_name'); $where_condition_array = array('fk_entity_id' => $value['entity_id'],'isactive'=>1); - $result_data[$key]['branches '] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,ENTITYLENDERBRANCH); + $result_data[$key]['branches'] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,ENTITYLENDERBRANCH); } $data['dataStatus'] = true; diff --git a/api/application/helpers/getpdformdetails_helper.php b/api/application/helpers/getpdformdetails_helper.php index b5d166e0..e2e924b0 100644 --- a/api/application/helpers/getpdformdetails_helper.php +++ b/api/application/helpers/getpdformdetails_helper.php @@ -15,7 +15,7 @@ class GETPDFORMDETAILS { $final_data = array(); - + //print_r($result_array);die(); $overall = array(); $pre_group = ""; $pre_sub_group = ""; @@ -34,10 +34,16 @@ class GETPDFORMDETAILS /////For handling Asset form Commom Remark Filed////// - $asset_remark = array(); /////For handling Asset form Commom Remark Filed////// + /////For handling Business form Sub Group////// + $manufacturing_activity_details = array(); + $temp_business_pre_iter = 0; + $city_column_name = 0; + $city_group = array(); + /////For handling Business form Sub Group////// + foreach($result_array as $rkey => $result) { @@ -46,7 +52,9 @@ class GETPDFORMDETAILS { if($result['iter_sub_column_name'] == "" || $result['iter_sub_column_name'] == null) { - if($result['iter_column_name'] != $pre_group)// && $result['iteration'] != $pre_iter) + // if( $pd_form_id != 13 && $result['iter_column_name'] == 'manufacturing_activity_details') + // { + if($result['iter_column_name'] != $pre_group)// && $result['iteration'] != $pre_iter) { $t1 = array(); @@ -63,10 +71,11 @@ class GETPDFORMDETAILS $pre_group = $result['iter_column_name']; $pre_iter = $result['iteration']; } + //} } - else// Handle child group + else// Handle all child group { - if($pd_form_id != 17 && $pd_form_id != 5) + if($pd_form_id != 17 && $pd_form_id != 5 && $pd_form_id != 13) { if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter) { @@ -106,6 +115,91 @@ class GETPDFORMDETAILS $pre_sub_iter = $result['iteration']; } } + //*****************************Handle Busness form subgroup things**************************************************** + else if($pd_form_id == 13) + { + + //***********Handle Busness form subgroup manufacturing_activity_details ***************************** + if($result['iter_column_name'] == "manufacturing_activity_details") + { + if($result['iter_sub_column_name'] == "india_where_sale_done") + { + + + //$group = array(); + if($result['iteration'] == $temp_business_pre_iter) + { + if($result['column_name'] == 'state_name') + { + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']][]['state_name'] = $result['column_value']; + } + else if(is_numeric($result['column_name'])) + { + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']]['city_name'][] = array($result['column_name']=>$result['column_value']); + } + } + else + { + if($result['column_name'] == 'state_name') + { + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']][]['state_name'] = $result['column_value']; + + } + else if(is_numeric($result['column_name'])) + { + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']]['city_name'][] = array($result['column_name']=>$result['column_value']); + } + $temp_business_pre_iter = $result['iteration']; + } + + } + else if($result['iter_sub_column_name'] == "countries_where_export_done") + { + + + + if($result['iteration'] == $temp_business_pre_iter) + { + + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']]['countries_where_export_done'][$result['column_name']][] = $result['column_value']; + } + else + { + + $manufacturing_activity_details['manufacturing_activity_details'][$result['iteration']]['countries_where_export_done'][$result['column_name']][] = $result['column_value']; + + $temp_business_pre_iter = $result['iteration']; + } + + } + + } + //*********** END of Handle Busness form subgroup manufacturing_activity_details ***************************** + else if($result['iter_column_name'] == "wholesale_trading_activity_details") + { + //echo $result['iter_column_name']; + } + else if($result['iter_column_name'] == "retail_trading__activity_details") + { + //echo $result['iter_column_name']; + } + else if($result['iter_column_name'] == "service_provider_activity_details") + { + //echo $result['iter_column_name']; + } + else if($result['iter_column_name'] == "others_activity_details") + { + //echo $result['iter_column_name']; + } + } + //*****************************End of Handle Busness form subgroup things**************************************************** + + else// handle Rental form Sub group { if($result['column_name'] == $pre_column_name) @@ -134,6 +228,7 @@ class GETPDFORMDETAILS { $t = array($result['column_name']=>$result['column_value']); $final_data = array_merge($final_data,$t); + //echo $result['column_value'];echo "\n\n\n"; } else // asset form details commom remark field { @@ -148,10 +243,10 @@ class GETPDFORMDETAILS //print_r($final_data); // echo "\n"; - //print_r($sub_group); + // 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 && $pd_form_id != 5) + if(count($sub_group) && $pd_form_id != 17 && $pd_form_id != 4 && $pd_form_id != 5 && $pd_form_id != 13) { foreach($sub_group as $key => $value) @@ -239,6 +334,112 @@ class GETPDFORMDETAILS } } } + + + //******************************attach business form subgroup details to main array************************ + if($pd_form_id == 13) + { + //echo "***************************************\n\n"; + //print_r($manufacturing_activity_details); + if(count($manufacturing_activity_details['manufacturing_activity_details']) && count($final_data['manufacturing_activity_details'])) + { + $total_subarray_count = count($manufacturing_activity_details['manufacturing_activity_details']); + $total_final_count = count($final_data['manufacturing_activity_details']); + + $count = 1; + foreach($manufacturing_activity_details['manufacturing_activity_details'] as $sub_man_details => $details) + { + //loop overll manufacturing_activity_details array + $city_temp_array = array(); + foreach($details as $details_k => $detail) + { + if(is_numeric($details_k)) + { + //print_r($details_k); + //print_r($detail['state_name']); + $state_array = array('state_name' => $detail['state_name'],'city_name' => array()); + $final_data['manufacturing_activity_details'][$count]['india_where_sale_done'][] = $state_array; + } + else if($details_k == "city_name") + { + + $zero_count = 0; + $pre_zero_count = ""; + + foreach($detail as $city_key => $city) + { + foreach($city as $k => $v) + { + + if($k == 0) + { + + $city_temp_array[$zero_count][] = $v; + $pre_zero_count = $zero_count; + $zero_count++; + + } + else + { + $city_temp_array[$pre_zero_count][] = $v; + + } + } + + } + + + + } + else //handle export + { + $loca_export_array = array(); + //print_r($details['countries_where_export_done']); + foreach($details['countries_where_export_done']['country_name'] as $export_key => $export) + { + //print_r($export); + for($i = 0;$i$export,'approx_sale'=>$details['countries_where_export_done']['approx_sale'][$export_key]); + $loca_export_array[] = $t; + //print_r($t); + } + } + // print_r($loca_export_array ); + // if(array_key_exists('Export',$final_data['manufacturing_activity_details'][$count])) + // { + if($final_data['manufacturing_activity_details'][$count]['area_of_sale'] == 'Export') + { + $final_data['manufacturing_activity_details'][$count]['countries_where_export_done'] = $loca_export_array; + } + //} + + } + } + + //map cities with state array + if(array_key_exists('india_where_sale_done',$final_data['manufacturing_activity_details'][$count])) + { + + foreach($final_data['manufacturing_activity_details'][$count]['india_where_sale_done'] as $t_key => $t_v) + { + $final_data['manufacturing_activity_details'][$count]['india_where_sale_done'][$t_key]['city_name'] = array_merge($final_data['manufacturing_activity_details'][$count]['india_where_sale_done'][$t_key]['city_name'],$city_temp_array[$t_key]); + + } + } + $count++; + + } + + + + + } + + } + //****************************** End of attach business form subgroup details to main array************************ + $result_array = $final_data; return $result_array; }