Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call tracking comments

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-27 12:46:06 +05:30
parent cf569772b0
commit 66e8e6932c
6 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Apollo/api/application/models/Calltracking_model.php
View File

@ -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;

8
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -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 = {

3
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -111,6 +111,7 @@
</th>
<th>Assigned </th>
<th>Created </th>
<th>Comments</th>
<th>Status</th>
</tr>
@ -142,6 +143,8 @@
padding: 0.5em 0.6em;" aria-hidden="true"></b>
</a></td>-->
<td>{{p.FollowupComments}}</td>
<td ng-if="p.statusName!='CLOSE'">
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">

2
Apollo/assets/views/callTrackingDetails.html
View File

@ -198,7 +198,7 @@
box-shadow: 0px 0px 2px green;
padding: 0.5em 0.6em;" aria-hidden="true"></b>
</a></td>-->
<td>{{p.Comments}}</td>
<td>{{p.FollowupComments}}</td>
<td ng-if="p.statusName!='CLOSE'">

5
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -113,11 +113,12 @@
</th>
<th>Assigned </th>
<th>Created </th>
<th>Comments</th>
<th>Status</th>
</tr>
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tbody dir-paginate="p in data|unique:'TrackingID'|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tr>
<td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
@ -142,6 +143,8 @@
padding: 0.5em 0.6em;" aria-hidden="true"></b>
</a></td>-->
<td>{{p.FollowupComments}}</td>
<td ng-if="p.statusName!='CLOSE'">
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">

3
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -112,6 +112,7 @@
</th>
<th>Assigned</th>
<th>Created</th>
<th>Comments</th>
<th>Status</th>
</tr>
@ -141,6 +142,8 @@
padding: 0.5em 0.6em;" aria-hidden="true"></b>
</a></td>-->
<td>{{p.FollowupComments}}</td>
<td ng-if="p.statusName!='CLOSE'">
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">