From 753e3b17aab7a1cd47bbb3b4208585117b9b21aa Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Sat, 17 Nov 2018 11:19:41 +0530
Subject: [PATCH] PD SCHEDULE ERROR RESLOVED

---
 api/application/config/constants.php          |  2 +-
 api/application/controllers/PD_Controller.php |  2 +-
 api/application/models/PD_Model.php           | 24 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index fbf129bc..a9d75b4b 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', 'updatePDMaster'); // 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');
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index a82f8429..449528cd 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -790,7 +790,7 @@ class PD_Controller extends REST_Controller {
 			//$id = $this->PD_Model->saveRecords($records,PDSCHEDULE);
 			
 				$where_condition_array = array('pd_id' => $records['fk_pd_id']);
-				$temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>$records['createdon'],'scheduled_on'=>$records['schedule_time']);
+				$temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>date('Y-m-d H:m:i');,'scheduled_on'=>$records['schedule_time']);
 				$pd_id_modified = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array);
 				
 				/******* Code Snippt for Save Template Category Weightage info to PD category Info*/
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index ed4d8a63..c57d46ee 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -446,7 +446,9 @@ class PD_Model extends SPARQ_Model {
 			 $pd_master_detials = $this->getPDMasterDetails($pdid);
 			 $pd_applicants_detials = $this->getApplicantsDetails($pdid);
 			//sprint_r($pd_master_detials);
+			if(count($pd_master_detials)){
 			 $template_id = $pd_master_detials[0]['fk_pd_template_id'];
+			}
 			 
 			 if($template_id != "" || $template_id != null)
 			 {
@@ -550,10 +552,30 @@ class PD_Model extends SPARQ_Model {
 			$this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATEFORMS.form_id = PDFORMS.pd_form_id');
 			$this->db->WHERE('TEMPLATEFORMS.fk_template_id',$template_id);
 			$template_forms = $this->db->GET()->result_array();
+			foreach($template_forms as $template_key => $value)
+			{
+				$this->db->SELECT('count(*) as count');
+				$this->db->FROM(PDFORMDETAILS.' as PDFORMDETAILS');
+				$this->db->WHERE('PDFORMDETAILS.fk_pd_id',$pdid);
+				$this->db->WHERE('PDFORMDETAILS.fk_form_id',$value['form_id']);
+				$template_forms_count = $this->db->GET()->result_array();
+				if(count($template_forms_count))
+				{
+					$template_forms[$template_key]['isAnswered'] = true;
+				}
+				else
+				{
+					$template_forms[$template_key]['isAnswered'] = false;
+				}
+				
+			}
 			
 	$result_data['question_answers'] = $categories;   
 	$result_data['counts'] = array('overall_answered_count'=>$overall_answered_count,'overall_question_count'=>$overall_question_count);
-	$result_data['pdmaster_details'] = $pd_master_detials[0];   
+	if(count($pd_master_detials))
+	{
+		$result_data['pdmaster_details'] = $pd_master_detials[0];   
+	}
 	$result_data['pdapplicants_detials'] = $pd_applicants_detials;   
 	$result_data['assessed_income'] = "";   
 	$result_data['template_forms'] = $template_forms;