diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 0e64a295..d6161397 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -157,6 +157,10 @@ class Call_Tracking_Controller extends REST_Controller { // $search['searchName']= $this->post('searchName'); $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search,$status); + + // print_r($getTrackedDetails); + // die(); + if ($getTrackedDetails) { $getTrackedDetails['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 925a2fd7..62f4e19d 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -356,7 +356,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'); + $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->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'); @@ -424,6 +424,7 @@ class Calltracking_model extends CI_Model { $tracking_array["ActivityName"]=$row->ActivityName; $tracking_array["AlternateMobile"]=$row->AlternateMobile; $tracking_array["Address"]=$row->Address; + $tracking_array["Comments"]=$row->FollowupComments; // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); // $followupDetails=$this->getTrackingFollowup($row->TrackingID); @@ -439,6 +440,9 @@ class Calltracking_model extends CI_Model { } } + + + if($status!=true) { $result_array['pendingTrackingDetails'] = $this->getPrevPendingTrackingDetails($search); @@ -448,16 +452,19 @@ class Calltracking_model extends CI_Model { { $result_array['pendingTrackingDetails']=1; } + + // print_r($result_array); + // die(); - +//print_r($this->db->last_query()); return $result_array; } public function getPrevPendingTrackingDetails($search=null) { - $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'); + $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->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'); @@ -507,6 +514,7 @@ class Calltracking_model extends CI_Model { $tracking_array["ActivityName"]=$row->ActivityName; $tracking_array["AlternateMobile"]=$row->AlternateMobile; $tracking_array["Address"]=$row->Address; + $tracking_array["Comments"]=$row->FollowupComments; // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); // $followupDetails=$this->getTrackingFollowup($row->TrackingID); diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index c51c3fe4..14adcca2 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -206,6 +206,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate,toDate) { + + $scope.searchData = { "searchDate": search1, "searchName": search2, @@ -466,6 +468,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $http(getTrackDetails).then(function (response) { if(response.data.pendingTrackingDetails.trackingStatus && response.data.trackingDetails.length > 0){ $scope.loader = false; + + + console.log(response.data) //$scope.currentDate1=$filter('date')(new Date(), 'dd-MM-yyyy'); $scope.tillPendingDetails = response.data.pendingTrackingDetails.trackingDetails; angular.forEach($scope.tillPendingDetails, function (value, key) { @@ -491,7 +496,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", }); - +//console.log($scope.data); $rootScope.trackingStatus = response.data.statusDetails; localStorage.setItem('trackingList', JSON.stringify($scope.data)); @@ -1530,6 +1535,8 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $rootScope.updateFollowup = function (form,followupDetails,myModel1, loading) { + // alert('com'); + // return false; var firstError = null; if (form.$invalid) { diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index d37b5cf9..aabceda5 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -170,6 +170,7 @@