diff --git a/Apollo/assets/js/controllers/sessionCtrl.js b/Apollo/assets/js/controllers/sessionCtrl.js index 27b42a35..458a58fe 100755 --- a/Apollo/assets/js/controllers/sessionCtrl.js +++ b/Apollo/assets/js/controllers/sessionCtrl.js @@ -11,7 +11,6 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', // client side logined details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - console.log('session control'); $scope.getLoginDash = ''; @@ -23,6 +22,9 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', } else if (localDetail.localType == 'R002') { $scope.getLoginDash = 'staff'; } + else if (localDetail.localType == 'R001') { + $scope.getLoginDash = 'student'; + } } else { $state.go('login.signin'); } @@ -44,7 +46,7 @@ app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - + console.log(localDetails); $scope.init = function () { if (localDetail != null) { $scope.getProfile(); @@ -73,7 +75,7 @@ app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", 'Content-Type': 'application/json' }, data: { - employeeLoginID: localDetails.localUserID + employeeLoginID: localDetails.localUserID, } }; $http(req).then(function (response) { @@ -92,8 +94,11 @@ app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", 'branchCode': $scope.resultData.BranchCode, 'branchList': response.data.branch_details, }; - var currArr = response.data.branch_details; - $scope.getCurrentBran = currArr.find(item => item.BranchCode === localDetails.localBranchID); + if(response.data.branch_details.length > 0){ + var currArr = response.data.branch_details; + $scope.getCurrentBran = currArr.find(item => item.BranchCode === localDetails.localBranchID); + } + } else { } });