diff --git a/api/application/config/routes.php b/api/application/config/routes.php index ab03e9e1..775dfd83 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -164,6 +164,7 @@ $route['saveAssessedIncomeHouseholdExpenses'] = 'PD_Controller/saveAssessedIncom $route['saveAssessedIncomeMonthwiseItems'] = 'PD_Controller/saveAssessedIncomeMonthwiseItems'; $route['calculateAssessedIncome'] = 'PD_Controller/calculateAssessedIncome'; $route['saveAssessedIncomeCalculateMode'] = 'PD_Controller/saveAssessedIncomeCalculateMode'; +$route['savePDAddtionalRequiremets'] = 'PD_Controller/savePDAdditionalRequiremets'; //PD Form Related $route['getPDFormDetails'] = 'PD_Controller/getPDFormDetails'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index bc7810e4..27a4c94e 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -428,6 +428,7 @@ class PD_Controller extends REST_Controller { { foreach($pd_addtional_requirements as $pd_addtional_requirement_key => $pd_addtional_requirement) { + $pd_addtional_requirement['fk_pd_id'] = $pd_id; $this->PD_Model->saveRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS); } } @@ -455,21 +456,11 @@ class PD_Controller extends REST_Controller { } - - - /* - * - *Update PD trigger Master Details(Web app only) from PD trigger Edit/view page - */ - public function updatePDMaster_post() + public function savePDAdditionalRequiremets_post() { - $pd_details = $this->post('records'); - $pd_addtional_requirements = array(); - if(array_key_exists('addtional_requirements',$pd_details)) - { - $pd_addtional_requirements = $pd_details['addtional_requirements']; - unset($pd_details['addtional_requirements']); - } + $records = $this->post('records'); + $pd_addtional_requirements = $records['addtional_requirements']; + $count = 0; if(count($pd_addtional_requirements)) { @@ -478,15 +469,41 @@ class PD_Controller extends REST_Controller { if($pd_addtional_requirement['add_req_id'] != null || $pd_addtional_requirement['add_req_id'] != "") { $where_condition_array = array('add_req_id' => $pd_addtional_requirement['add_req_id']); - $this->PD_Model->updateRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS,$where_condition_array); + $pk_id = $this->PD_Model->updateRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS,$where_condition_array); + if($pk_id != "" || $pk_id != null){ $count++; } } else { - $pd_addtional_requirement['fk_pd_id'] = $pd_details['pd_id']; - $this->PD_Model->saveRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS); + $pd_addtional_requirement['fk_pd_id'] = $records['pdid']; + $pk_id = $this->PD_Model->saveRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS); + if($pk_id != "" || $pk_id != null){ $count++; } } } } + if($count != 0 && $count == count($pd_addtional_requirements)) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = true; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = "Some thing went wrong"; + $this->response($data,REST_Controller::HTTP_OK); + } + + } + + /* + * + *Update PD trigger Master Details(Web app only) from PD trigger Edit/view page + */ + public function updatePDMaster_post() + { + $pd_details = $this->post('records'); // OTP Generate Condition if($pd_details['pd_status'] == INITIATED) @@ -1246,7 +1263,7 @@ class PD_Controller extends REST_Controller { $result_data['pd_question_answer'] = $this->PD_Model->getPDQuestionAnswers($pdid); //Get Addtional Requirements details - $result_data['pd_addtional_requirements'] = $this->PD_Model->getPDAddtionalRequirements($pdid); + $result_data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); //Get All PD Logs $result_data['pd_logs'] = $this->PD_Model->getPDLogs($pdid); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 47be560a..6fdbb953 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -537,10 +537,12 @@ class PD_Model extends SPARQ_Model { return $result_array; } - public function getPDAddtionalRequirements($pdid) + public function getPDAdditionalRequirements($pdid) { $this->db->SELECT('add_req_id, add_requirement, isactive, fk_pd_id'); $this->db->FROM(PDADDTIONALREQUIREMENTS); + $this->db->WHERE('isactive',1); + $this->db->WHERE('fk_pd_id',$pdid); return $this->db->GET()->result_array(); }