From 1659a1630efdbf698ed70188d9137104a69850f7 Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 18 Oct 2018 12:17:28 +0530 Subject: [PATCH] TEMPLATE AND PD --- api/application/config/constants.php | 36 +++++++++---------- api/application/models/PD_Model.php | 1 + .../models/Template_Management_Model.php | 1 + 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 060274ea..5802aa3b 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', 'getTemplateLenders'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'loadFullTemplate'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -95,23 +95,23 @@ defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lend /*********************END of AWS resources Constants*************************************************/ /*******************Constants PD status*********************************/ -defined('TRIGGERED') OR define('TRIGGERED','1'); //First time PD Trigger. -defined('ALLOCATED') OR define('ALLOCATED','2'); //PD Allocated to PD officer -defined('ACCEPTED') OR define('ACCEPTED','3'); // PD Accepted PD officer after Allocation -defined('BOUNCED') OR define('BOUNCED','4'); // PD Not accepted by PD Officer -defined('SCHEDULED') OR define('SCHEDULED','5'); //PD Scheduled by PD Officer -defined('INITIATED') OR define('INITIATED','6'); // PD Initiated or Ready to go a PD -defined('STARTED') OR define('STARTED','7'); // PD started by PD officer -defined('INPROGRESS') OR define('INPROGRESS','8'); // PD inprogress -defined('COMPLETED') OR define('COMPLETED','9'); // PD Completed -defined('QC_INPROGRESS') OR define('QC_INPROGRESS','10'); // QC_INPROGRESS -defined('QC_COMPLETED') OR define('QC_COMPLETED','11'); // QC_COMPLETED -defined('PD_REPORT_GENERATED') OR define('PD_REPORT_GENERATED','12'); //PD_REPORT_ACCEPTED by Lender -defined('PD_CHNAGE_REQUEST') OR define('PD_CHNAGE_REQUEST','13'); // From Lender side requesting change of PD report -defined('ALLOCATED_TO_PARTNER') OR define('ALLOCATED_TO_PARTNER','14'); // PD Allocated to PD agency not for PD officer -defined('ARCHIVED') OR define('ARCHIVED','15'); -defined('CANCELLED') OR define('CANCELLED','16'); -defined('DRAFT') OR define('DRAFT','17'); +defined('TRIGGERED') OR define('TRIGGERED','TRIGGERED'); //First time PD Trigger. +defined('ALLOCATED') OR define('ALLOCATED','ALLOCATED'); //PD Allocated to PD officer +defined('ACCEPTED') OR define('ACCEPTED','ACCEPTED'); // PD Accepted PD officer after Allocation +defined('BOUNCED') OR define('BOUNCED','BOUNCED'); // PD Not accepted by PD Officer +defined('SCHEDULED') OR define('SCHEDULED','SCHEDULED'); //PD Scheduled by PD Officer +defined('INITIATED') OR define('INITIATED','INITIATED'); // PD Initiated or Ready to go a PD +defined('STARTED') OR define('STARTED','STARTED'); // PD started by PD officer +defined('INPROGRESS') OR define('INPROGRESS','INPROGRESS'); // PD inprogress +defined('COMPLETED') OR define('COMPLETED','COMPLETED'); // PD Completed +defined('QC_INPROGRESS') OR define('QC_INPROGRESS','QC_INPROGRESS'); // QC_INPROGRESS +defined('QC_COMPLETED') OR define('QC_COMPLETED','QC_COMPLETED'); // QC_COMPLETED +defined('PD_REPORT_GENERATED') OR define('PD_REPORT_GENERATED','PD_REPORT_GENERATED'); //PD_REPORT_ACCEPTED by Lender +defined('PD_CHNAGE_REQUEST') OR define('PD_CHNAGE_REQUEST','PD_CHNAGE_REQUEST'); // From Lender side requesting change of PD report +defined('ALLOCATED_TO_PARTNER') OR define('ALLOCATED_TO_PARTNER','ALLOCATED_TO_PARTNER'); // PD Allocated to PD agency not for PD officer +defined('ARCHIVED') OR define('ARCHIVED','ARCHIVED'); +defined('CANCELLED') OR define('CANCELLED','CANCELLED'); +defined('DRAFT') OR define('DRAFT','DRAFT'); /*******************End Of Constants PD status**************************/ diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 2928e0f6..31265e64 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -292,6 +292,7 @@ class PD_Model extends SPARQ_Model { // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->WHERE('TEMPLATEQUESTION.fk_template_question_category_id',$category['fk_question_category_id']); + $this->db->WHERE('TEMPLATEQUESTION.fk_template_id',$template_id); $questions = $this->db->GET()->result_array(); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 85122522..658210cd 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -204,6 +204,7 @@ class Template_Management_Model extends SPARQ_Model { // $this->db->JOIN(USERPROFILE.' as USERPROFILE','TEMPLATEQUESTION.fk_createdby = USERPROFILE.userid','LEFT'); // $this->db->JOIN(USERPROFILE.' as USERPROFILE1','TEMPLATEQUESTION.fk_updatedby = USERPROFILE1.userid','LEFT'); $this->db->WHERE('QUESTIONS.fk_question_category',$category_id); + $this->db->WHERE('TEMPLATEQUESTION.fk_template_id',$template_id); $questions = $this->db->GET()->result_array(); if(count($questions)) {