diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index 69cda7bb..d69d24a9 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -4,8 +4,26 @@ * Simple table with sorting and filtering on AngularJS */ // var helloApp = angular.module("helloApp", []); -app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state) { +app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state, ipCookie) { + + // get local cliend details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } $scope.companies = { "ActivityID": "", "ActivityName": "", diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index dfd947cb..5477b170 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -4,7 +4,28 @@ * Simple table with sorting and filtering on AngularJS */ -app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { +app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie) { + + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + $scope.myModel = { "courseCode": "", "courseName": "", diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 516d77d7..96825a27 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -66,15 +66,23 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ // load when html page load $scope.init = function () { - if (localDetail != null) { + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { $scope.currentDate = new Date(); - $scope.localUserListCode = localDetail.localType; -$scope.localBranchID = localDetails.localBranchID; + $scope.localUserListCode = localDetail.localType; + $scope.localBranchID = localDetails.localBranchID; // $scope.currentPage = 1; $scope.getEmployeeList(); $scope.getRoleList(); $scope.getBranchDetails(); } else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } } } diff --git a/Apollo/assets/js/controllers/statusCtrl.js b/Apollo/assets/js/controllers/statusCtrl.js index ce5cbb75..48eb3940 100755 --- a/Apollo/assets/js/controllers/statusCtrl.js +++ b/Apollo/assets/js/controllers/statusCtrl.js @@ -15,6 +15,21 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + /* * edit status details * created by Surendiran diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js index 54f4c265..fab2b35f 100755 --- a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js +++ b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js @@ -4,8 +4,27 @@ * Simple table with sorting and filtering on AngularJS */ // var helloApp = angular.module("helloApp", []); -app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state) { +app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state, ipCookie) { + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + $scope.companies = { "ActivityID": "", "ActivityName": "", diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index 03d839d6..41b43480 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -25,7 +25,20 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams $scope.init = function() { - $scope.getUniversityList(); + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + $scope.getUniversityList(); + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } // sorting function for table params diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html index 5e10ae23..c596e0ed 100755 --- a/Apollo/assets/views/activity.html +++ b/Apollo/assets/views/activity.html @@ -20,7 +20,7 @@
-
+
Add Activity Details diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index ba995321..3d135d28 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -23,7 +23,7 @@
-
+
diff --git a/Apollo/assets/views/status.html b/Apollo/assets/views/status.html index 4071152e..bbf4db47 100755 --- a/Apollo/assets/views/status.html +++ b/Apollo/assets/views/status.html @@ -18,7 +18,7 @@
-
+
diff --git a/Apollo/assets/views/studentStatusUpdate.html b/Apollo/assets/views/studentStatusUpdate.html index 9d6dddff..a9d10495 100755 --- a/Apollo/assets/views/studentStatusUpdate.html +++ b/Apollo/assets/views/studentStatusUpdate.html @@ -20,7 +20,7 @@
-
+