diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index d3c312ef..13284f20 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -486,7 +486,7 @@ class Calltracking_model extends CI_Model { public function getTrackingDetails($search=null,$status) { - $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments'); + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,LT.ReferredBy as ReferredBy'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); @@ -494,6 +494,7 @@ 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->where('PLD1.ListName !=', 'CLOSE'); $this->db->where('LTF.IsActive', '1'); if($search['CreatedBranch'] !='All' AND $search['requestedDept'] != EMPLOYEE){ @@ -555,6 +556,7 @@ class Calltracking_model extends CI_Model { $tracking_array["AlternateMobile"]=$row->AlternateMobile; $tracking_array["Address"]=$row->Address; $tracking_array["Comments"]=$row->FollowupComments; + $tracking_array["ReferredBy"]=$row->ReferredBy; // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); // $followupDetails=$this->getTrackingFollowup($row->TrackingID); diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index a7e2225c..8a9eaf6c 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -186,6 +186,7 @@ Course Activity Assigned + ReferredBy Comments Status @@ -214,6 +215,7 @@ box-shadow: 0px 0px 2px green; padding: 0.5em 0.6em;" aria-hidden="true"> --> + {{p.ReferredBy}} {{p.Comments}}