diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index b74e53f7..6a82734c 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -31,6 +31,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.myModel.date=$scope.currentDate; $scope.search=$scope.currentDate; $scope.myModel.searchDate=$scope.currentDate; + $scope.myModel.mobile=""; $scope.checkDate = function (value) { if(value==null || value==undefined){ $scope.search=''; @@ -47,7 +48,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * edit branch details * created by kms * */ - $scope.setEditId = function (p) { + $scope.setEditId = function (p,model) { + console.log(model); localStorage.setItem('trackID', p.TrackingID); localStorage.setItem('count', 0); $rootScope.followupDetails=p; @@ -112,7 +114,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", universityID: myModel.universityName, courseName: myModel.courseName, date: $scope.nextFollowupDate, - activity: myModel.activity, + activity: myModel.activity.activityID, assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, @@ -188,7 +190,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.status=response.data.statusDetails; $scope.staffDetails=response.data.staffDetails; //$scope.university=response.data.universityDetails; - $scope.myModel.status=$scope.status[0].ListCode; + // $scope.myModel.status=$scope.status[0].ListCode; $scope.myModel.studentName=response.data.existLeadDetails.LeadName; $scope.myModel.universityName=response.data.existLeadDetails.University; $scope.myModel.courseName=response.data.existLeadDetails.Course; @@ -350,6 +352,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $rootScope.updateFollowup = function (followupDetails,myModel1, loading) { + if(isNaN(myModel1.date)){ $scope.nextFollowupDate = myModel1.date; @@ -360,8 +363,10 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy'); } - - if (myModel1.comments=='') { + if(myModel1.status==null || myModel1.status=='' || myModel1.status==undefined){ + swal("Warning!", 'Please select status', "warning"); + } + else if (myModel1.comments=='') { swal("Warning!", 'Please enter comments', "warning"); } else {