diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 62f4e19d..859efbb4 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -570,6 +570,10 @@ class Calltracking_model extends CI_Model { $this->db->where('TrackingID',$trackingId); $this->db->order_by('InteractionId','DESC'); $trackingDetails = $this->db->get(); + + + // print_r($trackingDetails); + // die(); return $trackingDetails->result(); } @@ -1141,9 +1145,13 @@ class Calltracking_model extends CI_Model { // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); $followupDetails=$this->getTrackingFollowup($row->TrackingID); + // print_r($followupDetails); + $tracking_array["followupDetails"]=$followupDetails[0]->FollowupOn; + $tracking_array["FollowupComments"] = $followupDetails[0]->FollowupComments; $result[]=$tracking_array; +//print_r($result); } $result_array['trackingDetails']=$result; @@ -1152,6 +1160,12 @@ class Calltracking_model extends CI_Model { } } + + + // print_r($result_array); + + + // print_r($this->db->last_query()); return $result_array; } @@ -1217,6 +1231,7 @@ class Calltracking_model extends CI_Model { $followupDetails=$this->getTrackingFollowup($row->TrackingID); $tracking_array["followupDetails"]=$followupDetails[0]->FollowupOn; + $tracking_array["FollowupComments"]=$followupDetails[0]->FollowupComments; $result[]=$tracking_array; @@ -1289,6 +1304,7 @@ class Calltracking_model extends CI_Model { $followupDetails=$this->getTrackingFollowup($row->TrackingID); $tracking_array["followupDetails"]=$followupDetails[0]->FollowupOn; + $tracking_array["FollowupComments"]=$followupDetails[0]->FollowupComments; $result[]=$tracking_array; diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 78fa5a01..7198bad8 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -603,6 +603,9 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte * */ $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + // alert('in'); + // return false; + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); $scope.searchData = { @@ -745,6 +748,8 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte $scope.data = response.data.trackingDetails; + console.log($scope.data); + localStorage.setItem('trackingList', JSON.stringify($scope.data)); // this for search box @@ -808,6 +813,9 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt * created by kms * */ $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + + // alert('in'); + // return false; $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); $scope.searchData = { diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index 03b9a94d..d7c0bd23 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -111,6 +111,7 @@