From 7155ce781843736f8fa9c2cb78370d2e054b12e2 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 5 Dec 2018 11:50:41 +0530 Subject: [PATCH] PD ERROR RESLOVED --- api/application/config/constants.php | 2 +- api/application/controllers/PD_Controller.php | 11 +++++++---- api/application/models/PD_Model.php | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index a790e196..665b69f5 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', 'getPDFormDetails'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getFullPDDetails'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index f560c7e8..bc7810e4 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -422,11 +422,14 @@ class PD_Controller extends REST_Controller { /****************ADDTIONAL REQUIREMENTS SECTION*******************************************/ - if(($pd_id != null || $pd_id != '') + if($pd_id != null || $pd_id != '') { - foreach($pd_addtional_requirements as $pd_addtional_requirement_key => $pd_addtional_requirement) + if(count($pd_addtional_requirements)) { - $this->PD_Model->saveRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS); + foreach($pd_addtional_requirements as $pd_addtional_requirement_key => $pd_addtional_requirement) + { + $this->PD_Model->saveRecords($pd_addtional_requirement,PDADDTIONALREQUIREMENTS); + } } } @@ -1243,7 +1246,7 @@ class PD_Controller extends REST_Controller { $result_data['pd_question_answer'] = $this->PD_Model->getPDQuestionAnswers($pdid); //Get Addtional Requirements details - $result_data['pd_question_answer'] = $this->PD_Model->getPDAddtionalRequirements($pdid); + $result_data['pd_addtional_requirements'] = $this->PD_Model->getPDAddtionalRequirements($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 2b2797c8..47be560a 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -537,9 +537,11 @@ class PD_Model extends SPARQ_Model { return $result_array; } - public funciton getPDAddtionalRequirements($pdid) + public function getPDAddtionalRequirements($pdid) { - + $this->db->SELECT('add_req_id, add_requirement, isactive, fk_pd_id'); + $this->db->FROM(PDADDTIONALREQUIREMENTS); + return $this->db->GET()->result_array(); } public function getTemplateForPD($pdid,$client)