From 0000fb3162b31f5fde14f8d0537d00f68e21eef4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Nov 2017 14:47:04 +0530 Subject: [PATCH 1/5] changes in call tracking model --- Apollo/api/application/models/Calltracking_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index d1f16b06..13bca699 100644 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -136,7 +136,7 @@ class Calltracking_model extends CI_Model { $this->db->select('LO.ID,ST.StaffID,ST.Firstname'); $this->db->from(LOGIN.' as LO'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); - $this->db->where('LO.IsActive',$status); + $this->db->where('ST.IsActive',$status); $staffDetails=$this->db->get(); if($staffDetails){ $result_staff = array(); From 445c25b261df0d49d9da9e8fd74d192539939da0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Nov 2017 14:47:37 +0530 Subject: [PATCH 2/5] changes in call tracking model --- Apollo/assets/views/callTrackingFollowup.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index 05de4b05..48080afd 100644 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -144,10 +144,10 @@
From 9b3189c59a5b152658b3a7b9c9eb469940d87c47 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Nov 2017 14:47:57 +0530 Subject: [PATCH 3/5] changes in call tracking model --- .../assets/js/controllers/callTrackingCtrl.js | 186 ++++++++++-------- 1 file changed, 100 insertions(+), 86 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index f7cd0016..1b24eafe 100644 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -23,10 +23,23 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", //get current date - + $scope.hideDateSearch=true; $scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy'); $scope.myModel.date=$scope.currentDate; $scope.search=$scope.currentDate; + $scope.myModel.searchDate=$scope.currentDate; + $scope.checkDate = function (value) { + if(value==null || value==undefined){ + $scope.search=''; + } + else{ + $scope.filterSearch=$filter('date')(value, 'dd-MM-yyyy'); + $scope.search=$scope.filterSearch; + } + + + + } /* * edit branch details * created by kms @@ -35,13 +48,13 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", localStorage.setItem('trackID', p.TrackingID); localStorage.setItem('count', 0); $rootScope.followupDetails=p; - /* $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode; - $rootScope.currentDate1=new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2); + /* $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode; + $rootScope.currentDate1=new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2); - $rootScope.myModel1.date=$rootScope.followupDetails.followupDetails[0].FollowupOn;*/ + $rootScope.myModel1.date=$rootScope.followupDetails.followupDetails[0].FollowupOn;*/ - /* $scope.editId = pid;*/ - $state.go('app.trackingFollowup'); + /* $scope.editId = pid;*/ + $state.go('app.trackingFollowup'); }; /* @@ -63,6 +76,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", var firstError = null; if (form.$invalid) { + var field = null, firstError = null; for (field in form) { if (field[0] != '$') { @@ -77,6 +91,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", angular.element('.ng-invalid[name=' + firstError + ']').focus(); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { + $scope.ldloading1 = {}; $scope.ldloading1[loading.replace('-', '_')] = true; @@ -148,58 +163,58 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.loading=false; $scope.getLead = function (form,mobile) { - //call form success - if(form.mobilenumber.$valid){ - $scope.loading=true; - /* $scope.ldloading2 = {}; + //call form success + if(form.mobilenumber.$valid){ + $scope.loading=true; + /* $scope.ldloading2 = {}; - $scope.ldloading2[loading.replace('-', '_')] = true;*/ + $scope.ldloading2[loading.replace('-', '_')] = true;*/ - var lead = { - method: 'POST', - url: apiPoint.url + 'getTrackingLeadDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - mobileNumber:mobile - } - }; - $http(lead).then(function (response) { - if (response.data.status==200) { - - $scope.myModel.courseName=response.data.existLeadDetails.CourseID; - $scope.myModel.enquiryStatus=response.data.existLeadDetails.IsNewEnquiry; - $scope.activity=response.data.activityDetails; - $scope.status=response.data.statusDetails; - $scope.staffDetails=response.data.staffDetails; - $scope.university=response.data.universityDetails; - - $scope.myModel.status=$scope.status[0].ListCode; - $scope.myModel.studentName=response.data.existLeadDetails.LeadName; - // find index for university drop down list - for(var i in $scope.university) { - if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){ - $scope.myModel.universityName=$scope.university[i]; - } + var lead = { + method: 'POST', + url: apiPoint.url + 'getTrackingLeadDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + mobileNumber:mobile } + }; + $http(lead).then(function (response) { + if (response.data.status==200) { - $scope.loading=false; + $scope.myModel.courseName=response.data.existLeadDetails.CourseID; + $scope.myModel.enquiryStatus=response.data.existLeadDetails.IsNewEnquiry; + $scope.activity=response.data.activityDetails; + $scope.status=response.data.statusDetails; + $scope.staffDetails=response.data.staffDetails; + $scope.university=response.data.universityDetails; + + $scope.myModel.status=$scope.status[0].ListCode; + $scope.myModel.studentName=response.data.existLeadDetails.LeadName; + // find index for university drop down list + for(var i in $scope.university) { + if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){ + $scope.myModel.universityName=$scope.university[i]; + } + } + + $scope.loading=false; - } else { - $scope.loading=false; - $scope.myModel.universityName=""; + } else { + $scope.loading=false; + $scope.myModel.universityName=""; - } - }); + } + }); - } - else{ - $scope.loading=false; - } + } + else{ + $scope.loading=false; + } }; @@ -218,50 +233,50 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.init = function (form,myModel,type) { $scope.loader = true; - var getTrackDetails = { - method: 'POST', - url: apiPoint.url + 'getTrackingDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - requestedDept: JSON.parse(localStorage.getItem('localObj')).localType - } - }; - $http(getTrackDetails).then(function (response) { + var getTrackDetails = { + method: 'POST', + url: apiPoint.url + 'getTrackingDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + requestedDept: JSON.parse(localStorage.getItem('localObj')).localType + } + }; + $http(getTrackDetails).then(function (response) { - if (response.data.status == 200 && response.data.trackingStatus == true) { - $scope.loader = false; + if (response.data.status == 200 && response.data.trackingStatus == true) { + $scope.loader = false; - $rootScope.trackingStatus = response.data.statusDetails; + $rootScope.trackingStatus = response.data.statusDetails; - $scope.data = response.data.trackingDetails; + $scope.data = response.data.trackingDetails; - // this for search box - /* $scope.search = {searchDate: ''}; - $scope.tableParams = new ngTableParams({ - page: 1, - count: 10, - filter: $scope.search - }, { - total: data.length, - getData: function ($defer, params) { - var orderedData = params.sorting() ? $filter('orderBy')(data, params.orderBy()) : data; - orderedData = params.filter() ? $filter('filter')(orderedData, params.filter().followupDate) : orderedData; - $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count())); - } - });*/ + // this for search box + /* $scope.search = {searchDate: ''}; + $scope.tableParams = new ngTableParams({ + page: 1, + count: 10, + filter: $scope.search + }, { + total: data.length, + getData: function ($defer, params) { + var orderedData = params.sorting() ? $filter('orderBy')(data, params.orderBy()) : data; + orderedData = params.filter() ? $filter('filter')(orderedData, params.filter().followupDate) : orderedData; + $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count())); + } + });*/ - } else { - $scope.loader = false; + } else { + $scope.loader = false; - $scope.branchInfo = ''; - $scope.data=''; + $scope.branchInfo = ''; + $scope.data=''; - } - }); + } + }); } @@ -379,4 +394,3 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", }]); - From b950101d337cce7aef6a29e36999d8c11ae78b0b Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Nov 2017 14:48:15 +0530 Subject: [PATCH 4/5] changes in call tracking model --- Apollo/assets/views/callTrackingDetails.html | 98 ++++++++++++-------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index ae50698a..f8d24ebb 100644 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -1,3 +1,13 @@ +
@@ -99,15 +109,34 @@ });
- + + + + + + +
- +
-
+

@@ -176,18 +205,22 @@ S.No + Tracking ID + + Date + Student Name Mobile Number - Tracking ID - - + + University + Course Activity Assigned To @@ -197,16 +230,19 @@ - + {{$index+1}} - {{p.followupDetails }} + {{p.TrackingID}} + {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - {{p.TrackingID}} + {{p.UniversityName}} + {{p.CourseName }} {{p.ListName}} {{p.Firstname}} - Click To Follow Up + + @@ -235,7 +271,7 @@ @@ -264,7 +300,7 @@ Student name is required @@ -318,7 +354,7 @@ - @@ -366,7 +402,7 @@ Date - - @@ -464,7 +500,7 @@ Status - Comments -
- - @@ -535,21 +571,7 @@
- -
- - - - - - - - - - - - From 97efdb7064ec5835b99e7b79e0758443e3e71ed2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Nov 2017 15:31:40 +0530 Subject: [PATCH 5/5] changes in call tracking model --- Apollo/api/application/controllers/Call_Tracking_Controller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 3357ef82..8aef9223 100644 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -159,6 +159,8 @@ class Call_Tracking_Controller extends REST_Controller { $update_followup_details['TrackingID'] = $this->post('trackingID'); $update_followup_details['UpdatedBy'] = $this->post('updatedBy'); $update_followup_details['StatusCode'] = $this->post('status'); + $update_followup_details['UpdatedOn'] = date('Y-m-d H:i:s'); + // store followup details for insert $followup_details['TrackingID'] = $this->post('trackingID'); $followup_details['FollowupOn'] = $this->post('date');