From dc5aab1e28c5ad19110f5c969ce85e4b90ef13c9 Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 25 Oct 2018 18:21:55 +0530 Subject: [PATCH] PD PROCESS 10 --- api/application/config/constants.php | 4 ++-- api/application/models/PD_Model.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index eaab23bc..c8a42285 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -85,9 +85,9 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code // 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', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors -//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAnswersForPD'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 9c69b9a9..1d667f89 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -503,7 +503,7 @@ class PD_Model extends SPARQ_Model { $overalldata['pd_detail_id'] = $pd_detail[0]['pd_detail_id']; $overalldata['question_id'] = $pd_detail[0]['question_id']; $overalldata['pd_question'] = $pd_detail[0]['pd_question']; - $fields = array('pd_document_id', 'fk_pd_id', 'fk_pd_detail_id', 'pd_document_title', 'pd_document_name'); + $fields = array('pd_document_title', 'pd_document_name'); $where_condition_array = array('fk_pd_id'=>$pd_id,'fk_pd_detail_id'=> $pd_detail[0]['pd_detail_id']); $pd_docs = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDDOCUMENTS); @@ -517,7 +517,7 @@ class PD_Model extends SPARQ_Model { { $profilepics3path = 'pd'.$pd_master_detials[0]['pd_id'].'/'.$doc['pd_document_name']; $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$profilepics3path,'+30 minutes'); - $pd_docs[$doc_key]['doc_url'] = $singed_uri; + $pd_docs[$doc_key]['pd_document_name'] = $singed_uri; } }