diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php
index f6fd474f..803bc478 100755
--- a/Apollo/api/application/models/Calltracking_model.php
+++ b/Apollo/api/application/models/Calltracking_model.php
@@ -58,7 +58,7 @@ class Calltracking_model extends CI_Model {
         // store lead,university and course details in comman array
         //$result_array['universityDetails']=$this->getUniversityDetails();
         $result_array['activityDetails']=$this->getActivityDetails();
-        $result_array['statusDetails']=$this->getStatus();
+       // $result_array['statusDetails']=$this->getStatus();
         $result_array['staffDetails']=$this->getStaff("1");
         return $result_array;
 
@@ -71,6 +71,7 @@ class Calltracking_model extends CI_Model {
     public function getUniversityDetails()
     {
         $this->db->select('UniversityID,UniversityName');
+        $this->db->where('IsActive','1');
         $this->db->order_by('UniversityID','ASC');
         $unviversityDetails = $this->db->get(UNIVERSITY);
 
@@ -107,6 +108,7 @@ class Calltracking_model extends CI_Model {
     {
         $this->db->select('CourseID,CourseName');
         $this->db->where('UniversityID',$universityID);
+        $this->db->where('IsActive','1');
         $this->db->order_by('CourseID','ASC');
         $courseDetails = $this->db->get(COURSE);
         return $courseDetails->result();
@@ -119,26 +121,38 @@ class Calltracking_model extends CI_Model {
 
     public function getActivityDetails()
     {
-        $this->db->select('ListCode,ListName');
-        $this->db->where('ListGroup','2');
+        $this->db->select('ActivityID,ActivityName');
         $this->db->where('IsActive','1');
-        $this->db->order_by('ListCode','ASC');
-        $activity = $this->db->get(PICK_LIST_DETAILS);
-        return $activity->result();
+        $this->db->order_by('ActivityID','ASC');
+        $activity = $this->db->get(ACTIVITY);
+        if($activity->result()){
+            $result_activity = array();
+            foreach ($activity->result() as $row)
+            {
+                $activity_array['activityStatus'] = true;
+                $activity_array['activityID'] = $row->ActivityID;
+                $activity_array['activityName'] = $row->ActivityName;
+                $activity_array['activityStatus']= $this->getStatus($row->ActivityID);
+                $result_activity[]=$activity_array;
+            }
+
+        }
+        return $result_activity;
     }
 
     /*
-    * get status details
+    * get activity status details
     * created by kms
     * */
 
-    public function getStatus()
+    public function getStatus($activityID=null)
     {
-        $this->db->select('ListCode,ListName');
-        $this->db->where('ListCode !=',REOPEN);
-        $this->db->where('ListGroup','1');
-        $this->db->order_by('ListCode','ASC');
-        $status = $this->db->get(PICK_LIST_DETAILS);
+        $this->db->select('AVS.StatusID,PLD.ListCode,PLD.ListName');
+        $this->db->from(ACTIVITY_STATUS .' as AVS');
+        $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AVS.StatusName');
+        $this->db->where('AVS.ActivityID',$activityID);
+        $this->db->where('AVS.IsActive','1');
+        $status = $this->db->get();
         return $status->result();
     }
 
@@ -225,12 +239,12 @@ class Calltracking_model extends CI_Model {
     public function getTrackingDetails($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,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,PLD.ListCode,PLD.ListName');
+        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
         $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(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+        $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode');
 
         $leadDet=$this->db->get();
@@ -255,11 +269,11 @@ class Calltracking_model extends CI_Model {
                     $tracking_array["AssignedTo"]=$row->AssignedTo;
                     $tracking_array["Firstname"]=$row->Firstname;
                     $tracking_array["StatusCode"]=$row->StatusCode;
-                    $tracking_array["statusListName"]=$row->statusListName;
+                    $tracking_array["statusName"]=$row->statusListName;
                     $tracking_array["UniversityName"]=$row->University;
                     $tracking_array["CourseName"]=$row->Course;
-                    $tracking_array["ListCode"]=$row->ListCode;
-                    $tracking_array["ListName"]=$row->ListName;
+                    $tracking_array["ActivityID"]=$row->ActivityID;
+                    $tracking_array["ActivityName"]=$row->ActivityName;
                     // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                     $followupDetails=$this->getTrackingFollowup($row->TrackingID);
 
@@ -269,7 +283,7 @@ class Calltracking_model extends CI_Model {
 
                 }
                 $result_array['trackingDetails']=$result;
-                $result_array['statusDetails']=$this->getStatus();
+               // $result_array['statusDetails']=$this->getStatus();
                 $result_array['trackingDetails']=$result;
 
             }
@@ -334,12 +348,12 @@ class Calltracking_model extends CI_Model {
 
     public function getLoadFollowupDetails($trackingID)
     {
-        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,PLD.ListCode,PLD.ListName');
+        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
         $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(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+        $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('LT.TrackingID',$trackingID['TrackingID']);
 
@@ -351,6 +365,7 @@ class Calltracking_model extends CI_Model {
 
             foreach ($leadDet->result() as $row)
             {
+                $activityID = $row->ActivityStatus;
                 $tracking_array["LeadID"]=$row->LeadID;
                 $tracking_array["LeadName"]=$row->LeadName;
                 $tracking_array["MobileNumber"]=$row->MobileNumber;
@@ -360,11 +375,11 @@ class Calltracking_model extends CI_Model {
                 $tracking_array["AssignedTo"]=$row->AssignedTo;
                 $tracking_array["Firstname"]=$row->Firstname;
                 $tracking_array["StatusCode"]=$row->StatusCode;
-                $tracking_array["statusListName"]=$row->statusListName;
+                $tracking_array["statusName"]=$row->statusListName;
                 $tracking_array["UniversityName"]=$row->University;
                 $tracking_array["CourseName"]=$row->Course;
-                $tracking_array["ListCode"]=$row->ListCode;
-                $tracking_array["ListName"]=$row->ListName;
+                $tracking_array["ActivityID"]=$row->ActivityID;
+                $tracking_array["ActivityName"]=$row->ActivityName;
                 $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                 $tracking_array["collectTrackedID"]=$this->getStudentTrackedID($row->MobileNumber);
 
@@ -373,7 +388,7 @@ class Calltracking_model extends CI_Model {
 
             }
             $result_array['trackingDetails']=$result;
-            $result_array['statusDetails']=$this->getStatus();
+            $result_array['statusDetails']=$this->getStatus($activityID);
             $result_array['trackingDetails']=$result;
 
         }
@@ -395,10 +410,10 @@ class Calltracking_model extends CI_Model {
     public function getStudentTrackedID($stuMobile=null)
     {
         $this->db->distinct();
-        $this->db->select('LT.TrackingID,LT.LeadID,PLD.ListCode,PLD.ListName');
+        $this->db->select('LT.TrackingID,LT.LeadID,AV.ActivityID,AV.ActivityName');
         $this->db->from(LEAD_DETAILS.' as LD');
         $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
-        $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+        $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus');
         $this->db->where('LD.MobileNumber',$stuMobile);
         $this->db->order_by('LT.TrackingID','ASC');
         $studeTrackID = $this->db->get();
@@ -464,13 +479,13 @@ class Calltracking_model extends CI_Model {
         $this->db->from(LEAD_DETAILS.' as LD');
         $this->db->from(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
         $this->db->order_by('LT.TrackingID','ASC');
-        if($check!='3'){
+       /* if($check!='3'){
             $this->db->where('LT.StatusCode !=',$status);
         }
         else if($check=='2'){
             $this->db->where('LT.StatusCode !=',$status);
-        }
-        else if($check=='3'){
+        }*/
+         if($check=='3'){
             $this->db->like('LD.CreatedOn', $todayDate, 'after');
         }
 
@@ -484,24 +499,24 @@ class Calltracking_model extends CI_Model {
                 $lastFollowpID=$this->db->get()->last_row();
                 // get last followup details date wise
                 $this->db->distinct();
-                $this->db->select('LD.LeadName,LD.MobileNumber,LT.TrackingID,LT.LeadID,PLD.ListCode,PLD.ListName,LTF.FollowupOn,LT.StatusCode,PLD1.ListName as statusListName');
+                $this->db->select('LD.LeadName,LD.MobileNumber,LT.TrackingID,LT.LeadID,AV.ActivityID,AV.ActivityName,LTF.FollowupOn,LT.StatusCode,PLD1.ListName as statusListName');
                 $this->db->from(LEAD_DETAILS.' as LD');
                 $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
                 $this->db->join(LEAD_TRACKING_FOLLOWUP.' as LTF', 'LTF.TrackingID = LT.TrackingID');
-                $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+                $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('LTF.InteractionId',$lastFollowpID->InteractionId);
 
                 // check today date based follwup details
                 if($check=='1'){
                     $this->db->where('LTF.FollowupOn',$todayDate);
-                    $this->db->where('LT.StatusCode !=',$status);
+                   // $this->db->where('LT.StatusCode !=',$status);
                 }
                 // check today date based pending followp details
-                else if($check=='2'){
+              /*  else if($check=='2'){
                    // $this->db->where('LTF.FollowupOn >',$todayDate);
                     $this->db->where('LT.StatusCode !=',$status);
-                }
+                }*/
                 else if($check=='3'){
                     $this->db->like('LD.CreatedOn', $todayDate, 'after');
                 }
@@ -517,9 +532,9 @@ class Calltracking_model extends CI_Model {
                         $tracking_array["TrackingID"]=$row1->TrackingID;
                         $tracking_array["FollowupOn"]=$row1->FollowupOn;
                         $tracking_array["StatusCode"]=$row1->StatusCode;
-                        $tracking_array["statusListName"]=$row1->statusListName;
-                        $tracking_array["ListCode"]=$row1->ListCode;
-                        $tracking_array["ListName"]=$row1->ListName;
+                        $tracking_array["statusName"]=$row1->statusListName;
+                        $tracking_array["ActivityID"]=$row1->ActivityID;
+                        $tracking_array["ActivityName"]=$row1->ActivityName;
                         $result[]=$tracking_array;
 
                     }
@@ -561,11 +576,11 @@ class Calltracking_model extends CI_Model {
                 $lastFollowpID=$this->db->get()->last_row();
                 // get last followup details date wise
                 $this->db->distinct();
-                $this->db->select('DATE_FORMAT(LTF.CreatedOn, "%d-%m-%Y")  AS CreatedOn,LD.LeadName,LD.MobileNumber,LT.TrackingID,LT.LeadID,PLD.ListCode,PLD.ListName,LTF.FollowupOn,LT.StatusCode,PLD1.ListName as statusListName');
+                $this->db->select('DATE_FORMAT(LTF.CreatedOn, "%d-%m-%Y")  AS CreatedOn,LD.LeadName,LD.MobileNumber,LT.TrackingID,LT.LeadID,AV.ActivityID,AV.ActivityName,LTF.FollowupOn,LT.StatusCode,PLD1.ListName as statusListName');
                 $this->db->from(LEAD_DETAILS.' as LD');
                 $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
                 $this->db->join(LEAD_TRACKING_FOLLOWUP.' as LTF', 'LTF.TrackingID = LT.TrackingID');
-                $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+                $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('LTF.InteractionId',$lastFollowpID->InteractionId);