diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 680def71..76ee99ca 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', 'getTemplateCategories'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getPDFormDetails'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -327,5 +327,11 @@ defined('QUESTIONGROUPID') OR define('QUESTIONGROUPID','question_group_id'); defined('TEMPLATEGROUP') OR define('TEMPLATEGROUP','m_template_group'); defined('TEMPLATEGROUPID') OR define('TEMPLATEGROUPID','template_group_id'); +defined('PDFORMS') OR define('PDFORMS','m_pd_forms'); +defined('PDFORMSID') OR define('PDFORMSID','pd_form_id'); + +defined('PDFORMDETAILS') OR define('PDFORMDETAILS','t_pd_form_details'); +defined('PDFORMDETAILSID') OR define('PDFORMDETAILSID','pd_form_detail_id'); + diff --git a/api/application/config/routes.php b/api/application/config/routes.php index f748274b..21459c20 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -151,6 +151,10 @@ $route['savePDQuestions'] = 'PD_Controller/saveActualPDQuestions'; $route['getAnswersForPD'] = 'PD_Controller/getAnswersForPD'; $route['checkOTP'] = 'PD_Controller/checkOTP'; +//PD Form Related +$route['getPDFormDetails'] = 'PD_Controller/getPDFormDetails'; +$route['savePDFormDetails'] = 'PD_Controller/savePDFormDetails'; + //Dashboard and Reports Related routes $route['getDashBoardMaster'] = 'Dash_Board_Controller/getDashBoardDetailsOfPDTypeAndPDStatusWithDayWeekMonth'; $route['getDashBoardLenderCity'] = 'Dash_Board_Controller/getDashBoardDetailsOfLenderAndCitywise'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 20a8e2ac..982125a9 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -1484,5 +1484,121 @@ class PD_Controller extends REST_Controller { } + /********* Get Form Informations @param pd_id and pd_form_id ******/ + public function getPDFormDetails_post() + { + $pd_id = $this->post('pd_id'); + $pd_form_id = $this->post('pd_form_id'); + $result_array = $this->PD_Model->getPDFormDetails($pd_id,$pd_form_id); + $final_data = array(); + + // if($pd_form_id == 1) + // { + //print_r($result_array); + + + $group = array(); + $pre_iter = 1; + foreach($result_array as $rkey => $result) + { + if($result['iteration'] != "" || $result['iteration'] != null) + { + if($result['iteration'] == $pre_iter) + { + $group[$result['iteration']][] = $result; + $pre_iter = $result['iteration']; + } + else + { + $group[$result['iteration']][] = $result; + $pre_iter = $result['iteration']; + } + } + else + { + $final_data[] = $result; + } + + + } + $final_data[] = $group; + //print_r($final_data); + $result_array = $final_data; + + + //} + + if($result_array) + { + $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'] = "Details Not Available!"; + $this->response($data,REST_Controller::HTTP_OK); + } + + } + + + /********* Get Form Informations @param pd_id and pd_form_id ******/ + public function savePDFormDetails_post() + { + $records = $this->post('records'); + + $pd_id = $records['pdid']; + $pd_form_id = $records['formid']; + $fk_createdby = $records['fk_createdby']; + $i = 0; + foreach($records as $rec_key => $record) + { + $i++; + + //****************handle supplier form details logic***************// + // if($pd_form_id == 1) + // { + if($i != 1 && $i != 2 && $i != 3) + { + //echo $rec_key;print_r($record);echo "\n\n\n"; + if(!is_array($record))//sine key and value pair + { + $temp_array = array('fk_pd_id'=>$pd_id,'fk_form_id'=>$pd_form_id,'column_name'=>$rec_key,'column_value'=>$record,'fk_createdby'=>$fk_createdby); + $id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILS); + } + else // array of key value pairs + { + $iter=0; + foreach($record as $mkey => $rec) + { + $iter++; + foreach($rec as $rkey => $r) + { + $temp_array = array(''); + if($r != "" && $r != null) + { + + $temp_array = array('fk_pd_id'=>$pd_id,'fk_form_id'=>$pd_form_id,'column_name'=>$rkey,'column_value'=>$r,'fk_createdby'=>$fk_createdby,'iteration'=>$iter); + $id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILS); + } + + } + + + + } + }// end of array of key value pairs + } + //} + //**************** End of handle supplier form details logic***************// + + } + + } + } \ No newline at end of file diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 2aa7983d..372b6632 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -406,7 +406,7 @@ class Template_Management_Controller extends REST_Controller { if($this->post('template_id')){ $template_id = $this->post('template_id'); } if($this->post('category_id')){ $category_id = $this->post('category_id'); } - $questions = $this->Template_Management_Model->getListOfQuestions($template_id,$category_id); + $questions = $this->Template_Management_Model->getListOfQuestions($template_id,$category_id,$group_id); if(count($questions)) { $data['dataStatus'] = true; diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 710a1f3c..93aa2dec 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -733,5 +733,18 @@ class PD_Model extends SPARQ_Model { // return $categories; } - + public function getPDFormDetails($pd_id,$pd_form_id) + { + $this->db->SELECT('PDFORMDETAILS.iteration, PDFORMDETAILS.column_name, PDFORMDETAILS.column_id, PDFORMDETAILS.column_value, PDFORMDETAILS.createdon, PDFORMDETAILS.fk_createdby,USERPROFILE.first_name,USERPROFILE.last_name'); + $this->db->FROM(PDFORMDETAILS.' as PDFORMDETAILS'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE','PDFORMDETAILS.fk_createdby = USERPROFILE.userid'); + $this->db->WHERE('PDFORMDETAILS.fk_pd_id',$pd_id); + $this->db->WHERE('PDFORMDETAILS.fk_form_id',$pd_form_id); + $this->db->ORDER_BY('PDFORMDETAILS.iteration'); + $form_details = $this->db->GET()->result_array(); + + return $form_details; + + + } } \ No newline at end of file