diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index 26c0a48a..f328d093 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -93,6 +93,7 @@ $route['getRecentLeadDetails'] = 'Call_Tracking_Controller/getRecentLeadDetails'
$route['getRecentCloseDetails'] = 'Call_Tracking_Controller/getRecentCloseDetails';
$route['getRecentPendingDetails'] = 'Call_Tracking_Controller/getRecentPendingDetails';
$route['callAsImportantFlag'] = 'Call_Tracking_Controller/callAsImportantFlag';
+$route['updateTrackingLeadDetails'] = 'Call_Tracking_Controller/updateTrackingLeadDetails';
// auto call track
$route['autoAddlead'] = 'Call_Tracking_Controller/autoAddlead';
$route['autoTrackingDetails'] = 'Call_Tracking_Controller/autoTrackingDetails';
diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php
index afc265f0..07f2012c 100755
--- a/Apollo/api/application/controllers/Call_Tracking_Controller.php
+++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php
@@ -584,11 +584,13 @@ public function getstaffCountDetails_post()
}
}
-
-
/*
* End of call tracking
*/
-
+public function updateTrackingLeadDetails_post(){
+$details = $this->post();
+print_r($details);
+die();
+}
}
\ No newline at end of file
diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php
index d4771e57..b053c4a2 100755
--- a/Apollo/api/application/models/Employee_model.php
+++ b/Apollo/api/application/models/Employee_model.php
@@ -20,11 +20,13 @@ class Employee_model extends CI_Model
// get login employee profile details
public function get_emp_prof_detail($empLoginID = null) {
+ // echo "hai i am here don't worry be happy";
+
$this->db->select('StaffID');
$this->db->from(LOGIN);
$this->db->where('ID', $empLoginID);
$loginEmpDetail = $this->db->get()->first_row();
- if ($loginEmpDetail) {
+ if (!empty($loginEmpDetail)) {
$EmpId = $loginEmpDetail->StaffID;
$this->db->select('t1.*');
$this->db->from('' . STAFF . ' as t1');
@@ -32,9 +34,9 @@ class Employee_model extends CI_Model
// $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
$responseDetails = $this->db->get()->first_row();
$result['empStatus'] = true;
- // print_r($responseDetails->ListCode);exit();
+ print_r($responseDetails);exit();
- if ($responseDetails->ListCode == SUPER_ADMIN) {
+ if (!empty($responseDetails) && $responseDetails->ListCode == SUPER_ADMIN) {
// print_r($result['details']->ListCode);exit();
// get branch details for super admin
$responseDetails->BranchCode = 'All';
@@ -70,7 +72,7 @@ class Employee_model extends CI_Model
// $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
$branchDetails = $this->db->get();
$result['branchStatus'] = true;
- $result['work_State'] = $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
+ $result['work_State'] = !empty($responseDetails) && $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
$result['branch_details'] = $branchDetails->result();
}
} else {
diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index 1468eccf..9e660b11 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -759,17 +759,16 @@ $scope.GetstaffwiseDetails($scope.tod);
var ide = e.target;
var val = (ide.checked ? true : false);
var sid = e.target.id;
+
+
angular.forEach($scope.data,function(value,key){
- console.log(value);
+ // console.log(value);
if(sid == value.LeadID)
{
- console.log("sid",value);
sid = value;
}
});
-
var pos = $scope.selectedLeadID.indexOf(sid);
- //alert(val);
if(val)
{
if( pos == -1)
@@ -792,52 +791,52 @@ $scope.GetstaffwiseDetails($scope.tod);
}else{
$scope.disable = true;
}
- console.log($scope.selectedLeadID);
+ console.log("donedon",$scope.selectedLeadID);
}
$scope.calltracking = function(){
- console.log('Function',selectedLeadID);
+ console.log('Function',$scope.selectedLeadID);
if($scope.selectedLeadID ==''){
swal('Select Check box','','warning');
return false;
}else{
- swal('CallTracking','','info');
$scope.controller = 'ng-controller="callTrackingCtrl"';
- // var lead = {
- // method: 'POST',
- // url: apiPoint.url + 'updateCallTrackingDetails/',
- // headers: {
- // 'Content-Type': 'application/json'
- // },
- // data: {
- // requestedBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
- // lead:$scope.selectedLeadID,
- // branchID:JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
- // userType:JSON.parse(sessionStorage.getItem('localObj')).localType,
- // }
- // };
- // $http(lead).then(function (response) {
- // if (response.data.status==200) {
-
- // $rootScope.modalInstance = $modal.open({
- // templateUrl: 'assets/views/autoCalltracking2.html',
- // controller: 'callTrackingCtrl',
- // // size: size,
-
- // resolve: {
- // pdfitems: function () {
- // return $scope.activity;
-
- // }
-
- // }
- // });
+ var lead = {
+ method: 'POST',
+ url: apiPoint.url + 'updateCallTrackingDetails/',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ data: {
+ requestedBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
+ lead:$scope.selectedLeadID,
+ branchID:JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+ userType:JSON.parse(sessionStorage.getItem('localObj')).localType,
+ }
+ };
+ $http(lead).then(function (response) {
+ if (response.data.status==200) {
+ $rootScope.modalInstance = $modal.open({
+ templateUrl: 'assets/views/autoCalltracking2.html',
+ controller: 'callTrackingCtrl',
+ size: size,
+ resolve: {
+ pdfitems: function () {
+ return $scope.activity;
+ }
+ }
+ });
- // $rootScope.modalInstance.result.then(function (selectedItem) {
- // $scope.selected = selectedItem;
- // }, function () { $log.info('Modal dismissed at: ' + new Date());
- // });
- // }
- // });
+ $rootScope.modalInstance.result.then(function (selectedItem) {
+ $scope.selected = selectedItem;
+ }, function () {
+ $log.info('Modal dismissed at: ' + new Date());
+ });
+ }
+ else{
+ $log.warn('Problem in Modal : ' + new Date());
+ // ('Modal dismissed at: ' + new Date());
+ }
+ });
}
}
diff --git a/Apollo/assets/views/autoCalltracking2.html b/Apollo/assets/views/autoCalltracking2.html
index d2fe2c51..5e5a9d28 100644
--- a/Apollo/assets/views/autoCalltracking2.html
+++ b/Apollo/assets/views/autoCalltracking2.html
@@ -55,7 +55,7 @@
Status
-