diff --git a/api/application/config/routes.php b/api/application/config/routes.php index c634e0ef..cfb9c7c2 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -184,7 +184,8 @@ $route['codeigniterViewTest'] = 'PD_Controller/codeigniterViewTest'; $route['getPDFormDetails'] = 'PD_Controller/getPDFormDetailsJSON'; $route['savePDFormDetails'] = 'PD_Controller/savePDFormDetailsJSON'; $route['getFinalPDReportQuestions'] = 'PD_Controller/getFinalPDReportQuestions'; -$route['getTypeOfActivetyFromBusinessForm'] = 'PD_Controller/getTypeOfActivetyFromBusinessForm'; +$route['getTypeOfActivetyFromBusinessForm'] = 'PD_Controller/getTypeOfActivetyFromBusinessJSON'; +//$route['getTypeOfActivetyFromBusinessJSON'] = 'PD_Controller/getTypeOfActivetyFromBusinessJSON'; //Dashboard and Reports Related routes //$route['getDashBoardMaster'] = 'Dash_Board_Controller/getDashBoardDetailsOfPDTypeAndPDStatusWithDayWeekMonth'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index dfc87856..40f24e65 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2093,7 +2093,7 @@ class PD_Controller extends REST_Controller { public function downloadExcel_post() { - + } //Save Co applicants details from General Form public function saveCoApplicantsFromGeneralInfoForm($records) @@ -3382,6 +3382,91 @@ class PD_Controller extends REST_Controller { } + public function getTypeOfActivetyFromBusinessJSON_post() + { + $records = $this->post('records'); + $pd_id = $records['pd_id']; + $pd_form_id = $records['pd_form_id']; + $final_array = array(); + $fields = array('json'); + $where_condition_array = array('isactive' => 1,'fk_form_id'=>$pd_form_id,'fk_pd_id'=>$pd_id); + $rec = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON); + //print_r($this->db->last_query()); + //print_r($rec); + if(count($rec)) + { + $temp_data = json_decode($rec[0]['json'],true); + // print_r($temp_data); + $final_array['profession_name'] = $temp_data['profession_name']; + $final_array['profession_name_other'] = $temp_data['profession_name_other']; + $final_array['type_of_activity'] = $temp_data['select_business_activity_type']; + + foreach($final_array['type_of_activity'] as $f_key => $f_value) + { + $fields = array('name'); + $where_condition_array = array('type_of_activity_id'=>$f_value['type_of_activity_id'],'isactive'=>1); + $result = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TYPEOFACTIVITY); + $final_array['type_of_activity'][$f_key] = array('type_of_activity_id' => $f_value['type_of_activity_id'],'name' =>$result[0]['name']); + + if($f_value['type_of_activity_id'] == 1) + { + if(array_key_exists('manufacturing_activity_details',$temp_data)) + { + $temp = array(); + foreach($temp_data['manufacturing_activity_details'] as $product_key => $product) + { + $temp[] = array('id' => $product_key,'name' => $product['main_products']); + } + $final_array['type_of_activity'][$f_key]['prodcuts'] =$temp; + } + } + else if($f_value['type_of_activity_id'] == 2)//Retail trading + { + if(array_key_exists('retail_trading_activity_details',$temp_data)) + { + $temp = array(); + foreach($temp_data['retail_trading_activity_details'] as $product_key => $product) + { + $temp[] = array('id' => $product_key,'name' => $product['main_products']); + } + $final_array['type_of_activity'][$f_key]['prodcuts'] =$temp; + } + } + else if($f_value['type_of_activity_id'] == 3)//Wholesale Trade wholesale_trading_activity_details + { + $temp = array(); + foreach($temp_data['wholesale_trading_activity_details'] as $product_key => $product) + { + + $temp[] = array('id' => $product_key,'name' => $product['main_products']); + } + $final_array['type_of_activity'][$f_key]['prodcuts'] =$temp; + } + else//Service Provider + { + $temp = array(); + foreach($temp_data['service_provider_activity_details'] as $product_key => $product) + { + + $temp[] = array('id' => $product_key,'name' => $product['main_products']); + + } + $final_array['type_of_activity'][$f_key]['prodcuts'] =$temp; + } + } + } + else + { + + } + + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = $final_array; + $this->response($data,REST_Controller::HTTP_OK); + + + } /********************************************************************************************* *********************************************************************************************/