diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 06c6df43..c4954ef3 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getFinalPDReportQuestions'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getTypeOfActivetyFromBusinessForm'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 81a4ed44..e6a146a8 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -174,6 +174,7 @@ $route['getListOfPDReportVersions'] = 'PD_Controller/getListOfPDReportVersions'; $route['getPDFormDetails'] = 'PD_Controller/getPDFormDetails'; $route['savePDFormDetails'] = 'PD_Controller/savePDFormDetails'; $route['getFinalPDReportQuestions'] = 'PD_Controller/getFinalPDReportQuestions'; +$route['getTypeOfActivetyFromBusinessForm'] = 'PD_Controller/getTypeOfActivetyFromBusinessForm'; //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 aa3087e9..a9ff5cbb 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2827,7 +2827,7 @@ class PD_Controller extends REST_Controller { else { $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_OK; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; $data['msg'] = 'PD Report Not Generated/Report Not Available!'; $this->response($data,REST_Controller::HTTP_OK); } @@ -2873,5 +2873,43 @@ class PD_Controller extends REST_Controller { /********************************************************************************************* *********************************************************************************************/ - + public function getTypeOfActivetyFromBusinessForm_post() + { + + $records = $this->post('records'); + $pdid = $records['pd_id']; + + $fields = array('column_name', 'column_value'); + $where_condition_array = array('column_name'=>'type_of_activity','isactive'=>1,'fk_form_id'=>13,'fk_pd_id'=>$pdid); + $result_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILS); + + //print_r($this->db->last_query()); + + if(count($result_array)) + { + $fields = array('name'); + $where_condition_array = array('type_of_activity_id'=>$result_array[0]['column_value'],'isactive'=>1); + $result = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,TYPEOFACTIVITY); + + if(count($result)){ $result_array[0]['name'] = $result[0]['name']; } + + + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result_array; + $this->response($data,REST_Controller::HTTP_OK); + + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = "Fill Business Details First/ No Data Available!"; + $this->response($data,REST_Controller::HTTP_OK); + } + + + + + } } \ No newline at end of file