From e2b3cd50abe4254dd536554c982adc3bff69b0c4 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 24 Apr 2018 18:19:51 +0530
Subject: [PATCH] call tracking changes

---
 .../assets/js/controllers/callTrackingCtrl.js | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index 5e9194c4..5d2f8b05 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -263,6 +263,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
                 $scope.ldloading1 = {};
 
                 $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
                 if($scope.userType !='R004'){
                     $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
                     $scope.updateAssignTo = myModel.assignedTo;
@@ -272,7 +273,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
                     $scope.updateBranchID = myModel.branch.BranchCode;
                     $scope.updateAssignTo = myModel.assignedTo;
 
-                }
+                }*/
 
                 var addLead = {
                     method: 'POST',
@@ -287,8 +288,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
                         courseName: myModel.courseName,
                         date: $scope.nextFollowupDate,
                         activity: myModel.activity.activityID,
-                        assignedTo: $scope.updateAssignTo,
-
+                        assignedTo: myModel.assignedTo,
                         status: myModel.status,
                         referedBy: myModel.referedBy,
                         comments:myModel.comments,
@@ -296,10 +296,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
                         address:myModel.address,
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: $scope.updateBranchID
-
-
-
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
 
                     }
                 };
@@ -1469,7 +1466,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
 
 
 
-            if($scope.userType !='R004'){
+          /*  if($scope.userType !='R004'){
                 $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
 
 
@@ -1478,7 +1475,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
                 $scope.updateBranchID = myModel1.branch;
 
 
-            }
+            }*/
             $rootScope.ldloading2 = {};
 
             $rootScope.ldloading2[loading.replace('-', '_')] = true;
@@ -1497,7 +1494,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
                     assignedTo: myModel1.assignStaff,
                     comments: myModel1.comments,
                     updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                    branchId: $scope.updateBranchID,
+                    branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
                     address: myModel1.Address,
                     alternateMobile: myModel1.AlternateMobile,
                     referredBy: myModel1.ReferredBy,
@@ -1560,7 +1557,10 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
                 $rootScope.myModel1.ReferredBy=$rootScope.followupDetails.ReferredBy;
                 $rootScope.staffArray='';
                 $rootScope.staffDetails=response.data.staffDetails;
-               if($scope.userType =='R004'){
+
+                /* hide this fun after branch level changes
+
+              if($scope.userType =='R004'){
                    // get deactive branch list
                    $scope.checkBranchData = {
                        BranchCode: $rootScope.followupDetails.CreatedBranch,
@@ -1622,7 +1622,28 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
                    }
 
 
-               }
+               }*/
+
+               // ref1 start after branch level changes
+                // get deactive staff details list
+                $scope.checkEmpData = {
+                    loginId: $rootScope.followupDetails.AssignedTo,
+                    staffName: $rootScope.followupDetails.Firstname +'-'+$rootScope.followupDetails.StaffID
+                };
+
+                if($rootScope.staffDetails){
+                    var empresult = $filter('filter')($rootScope.staffDetails, $scope.checkEmpData);
+                    if(empresult.length==0){
+
+                        $rootScope.staffDetails.push($scope.checkEmpData);
+                    }
+                }
+                else{
+                    $rootScope.staffDetails=[];
+                    $rootScope.staffDetails.push($scope.checkEmpData);
+                }
+
+                // ref1end after branch level changes
 
 
 
@@ -1732,7 +1753,8 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
             },
             data: {
                 requestedBy  :studentDetails.MobileNumber,
-                requestedFrom: 3
+                requestedFrom: 3,
+                branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
             }
         };
         $http(getcourse).then(function (response) {