From 4a6b81191bc6db007f0277dbcb868fba8a1576a8 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 28 Dec 2017 17:48:05 +0530
Subject: [PATCH] course details changes done

---
 .../application/models/Calltracking_model.php   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php
index fc0cf9bb..a06b369f 100755
--- a/Apollo/api/application/models/Calltracking_model.php
+++ b/Apollo/api/application/models/Calltracking_model.php
@@ -628,14 +628,16 @@ class Calltracking_model extends CI_Model {
     public function getRecentleadDetails($search=null)
     {
 
-        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
+        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y")  AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y")  AS UpdatedOn');
         $this->db->from(LEAD_DETAILS.' as LD');
         $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
         $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo');
         $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
         $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
-        $this->db->like('LD.CreatedOn', $search['loadDate'], 'after');
+        if($search['loadDate'] !='' ) {
+            $this->db->like('LD.CreatedOn', $search['loadDate'], 'after');
+        }
         $this->db->order_by('LT.TrackingID', 'DESC');
         $leadDet=$this->db->get();
         if($this->db->affected_rows()==0){
@@ -666,6 +668,8 @@ class Calltracking_model extends CI_Model {
                     $tracking_array["ActivityName"]=$row->ActivityName;
                     $tracking_array["AlternateMobile"]=$row->AlternateMobile;
                     $tracking_array["Address"]=$row->Address;
+                    $tracking_array["CreatedOn"]=$row->CreatedOn;
+                    $tracking_array["UpdatedOn"]=$row->UpdatedOn;
                     // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                     $followupDetails=$this->getTrackingFollowup($row->TrackingID);
 
@@ -696,7 +700,9 @@ class Calltracking_model extends CI_Model {
         $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
         $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
-        $this->db->like('LT.UpdatedOn', $search['loadDate'], 'after');
+        if($search['loadDate'] !='' ) {
+            $this->db->like('LT.UpdatedOn', $search['loadDate'], 'after');
+        }
         $this->db->like('PLD1.ListName', 'CLOSE', 'after');
         $this->db->order_by('LT.TrackingID', 'DESC');
         $leadDet=$this->db->get();
@@ -760,7 +766,10 @@ class Calltracking_model extends CI_Model {
         $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
         $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
-        $this->db->like('LT.UpdatedOn', $search['loadDate'], 'after');
+        if($search['loadDate'] !='' ){
+            $this->db->like('LT.UpdatedOn', $search['loadDate'], 'after');
+
+        }
         $this->db->where('PLD1.ListName !=', 'CLOSE');
         $this->db->order_by('LT.TrackingID', 'DESC');
         $leadDet=$this->db->get();