Merge remote-tracking branch 'origin/master'

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": "",

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": "",

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.localUserListCode = localDetail.localType;
-$scope.localBranchID = localDetails.localBranchID;
+            $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');
+            }
         }
     }
 

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

Apollo/assets/js/controllers/studentStatusUpdateCtrl.js

@@ -4,7 +4,26 @@
  * 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": "",

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

Apollo/assets/views/activity.html

@@ -20,7 +20,7 @@
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">
-    <div ng-controller="activityCtrl">
+    <div ng-controller="activityCtrl" ng-init="initHead()">
         <form id="form" name="Form" ng-submit="activityForm.submit(Form, companies, 'zoom-in')" method="post" novalidate>
             <fieldset>
                 <legend>Add Activity Details</legend>

Apollo/assets/views/courseDetails.html

@@ -23,7 +23,7 @@
 <!-- end: PAGE TITLE -->
 <!-- start: LIST GROUP -->
 <div class="container-fluid container-fullw bg-white">
-    <div class="row" ng-controller="courseCtrl" data-ng-init="init()">
+    <div class="row" ng-controller="courseCtrl" data-ng-init="init();initHead()">
         <tabset class="tabbable">
             <tab heading="View Course" id="viewcourse">
                 <div class="container-fluid container-fullw">

Apollo/assets/views/status.html

@@ -18,7 +18,7 @@
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">
-    <div ng-controller="statusCtrl">
+    <div ng-controller="statusCtrl" ng-init="initHead()">
         <tabset class="tabbable">
             <tab heading="Add Status" id="statuAddNew">
                 <form name="Form" id="form" novalidate ng-submit="statusForm.submit(Form, myModel, 'zoom-in')" method="post">

Apollo/assets/views/studentStatusUpdate.html

@@ -20,7 +20,7 @@
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">
-    <div ng-controller="studentStatusUpdateCtrl">
+    <div ng-controller="studentStatusUpdateCtrl" ng-init="initHead()">
         <div class="row">
 
             <div class="col-md-3">