diff --git a/Apollo/assets/js/controllers/sessionCtrl.js b/Apollo/assets/js/controllers/sessionCtrl.js index 181bb4f5..96f149ad 100755 --- a/Apollo/assets/js/controllers/sessionCtrl.js +++ b/Apollo/assets/js/controllers/sessionCtrl.js @@ -102,22 +102,17 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', $scope.checkStaff = function () { var inlocalDetails = JSON.parse(localStorage.getItem('localObj')); var inlocalDetailss = ipCookie('cookiechk'); - console.log(inlocalDetails); if (inlocalDetails != null) { if ((inlocalDetails.localType == 'R002' && inlocalDetailss.localType == 'R002') || (inlocalDetails.localType == 'R005' && inlocalDetailss.localType == 'R005')) { - console.log('if'); } else { if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') { - console.log('else if'); ipCookie.remove('cookiechk'); $window.localStorage.clear(); $state.go('login.signin'); } else { - - console.log('else else') $location.url('/dashboard').replace(); $window.location.reload(); $state.go('app.dashboard'); @@ -130,7 +125,7 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', } else { $state.go('login.signin'); } - } + }; }]); app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", "$state", 'ipCookie', '$window', function ($scope, $http, apiPoint, $localStorage, $state, ipCookie, $window) { diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index f9668e5a..40b7af8c 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -20,20 +20,17 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter const LOCALTYPE = logcheck.localType; if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { - console.log("if"); } else { if (logcheck != null && LOCALTYPE != 'R001') { - console.log("else if"); $state.go('app.dashboard'); } else { - console.log("else else"); window.localStorage.clear(); $state.go('login.signin'); } } if (localDetail != null) { - if (localDetails.localType === 'R004') { + if (localDetails.localType === 'R004' || localDetails.localType === 'R003' || localDetails.localType === 'R002') { // $scope.getUniversityList(); $scope.getUniversitySearchList(); $scope.getUniveesityListFromApp(); diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 66c211a4..53856499 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -8,7 +8,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil /** * student university fee details compare */ - // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); @@ -16,32 +15,17 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil // load when html page load $scope.init = function () { - var logcheck = JSON.parse(localStorage.getItem('localObj')); - - const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { - }else { - if(logcheck != null && LOCALTYPE !='R001') { - console.log("else if"); - $state.go('app.dashboard'); - } else { - console.log("else else"); - window.localStorage.clear(); - $state.go('login.signin'); - } - } - if (localDetail != null) { - if (localDetails.localType === 'R004') { - // $scope.getUniversityList(); + if (localDetail.localType === 'R004' || localDetail.localType === 'R003' || localDetail.localType === 'R002') { + // $scope.getUniversityList(); $scope.getUniversitySearchList(); $scope.getFileUploadUniversity(); } else { - ipCookie.remove('cookiechk'); - $window.localStorage.clear(); + localStorage.removeItem('localObj'); $state.go('login.signin'); } } else { + $state.go('login.signin'); } } /*get university details for file upload diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js index c1a2bebb..addee84e 100644 --- a/Apollo/assets/js/controllers/univFormPaymentCtrl.js +++ b/Apollo/assets/js/controllers/univFormPaymentCtrl.js @@ -16,7 +16,7 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable $scope.init = function () { if (localDetail != null) { - if (localDetail.localType === 'R004') { + if (localDetail.localType === 'R004' || localDetail.localType === 'R003' || localDetail.localType === 'R002') { $scope.getPaymentUnivSearchData(); } else { localStorage.removeItem('localObj'); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 5ebc61c5..0050c924 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1082,6 +1082,35 @@ --> +
  • + +
    +
    + +
    +
    + University Form Upload +
    +
    +     + +
    • @@ -1363,6 +1392,35 @@ +
  • + +
    +
    + +
    +
    + University Form Upload +
    +
    +     + +