diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index 437dd18c..0f57192a 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -170,7 +170,7 @@ swal("Warning!", "Status are required", "warning"); var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE =='R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/announcementCtrl.js b/Apollo/assets/js/controllers/announcementCtrl.js index 31621f4f..a261a5d1 100755 --- a/Apollo/assets/js/controllers/announcementCtrl.js +++ b/Apollo/assets/js/controllers/announcementCtrl.js @@ -199,7 +199,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 626e21b7..9e10e2d5 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -244,7 +244,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index aa4eb69d..c97022e6 100755 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -357,7 +357,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 3c4deddb..a5c2ee86 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -408,7 +408,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/centerCtrl.js b/Apollo/assets/js/controllers/centerCtrl.js index 38904a52..1405e047 100755 --- a/Apollo/assets/js/controllers/centerCtrl.js +++ b/Apollo/assets/js/controllers/centerCtrl.js @@ -196,7 +196,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/certificateCtrl.js b/Apollo/assets/js/controllers/certificateCtrl.js index 2c038ffe..f240329c 100755 --- a/Apollo/assets/js/controllers/certificateCtrl.js +++ b/Apollo/assets/js/controllers/certificateCtrl.js @@ -115,7 +115,7 @@ $scope.certificateForm = { var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index 32c6a294..ba1bcf06 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -22,7 +22,7 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter" var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js index 6d3a92b6..6c40f5e9 100755 --- a/Apollo/assets/js/controllers/dayBookMasterCtrl.js +++ b/Apollo/assets/js/controllers/dayBookMasterCtrl.js @@ -123,7 +123,7 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 24e57b6a..3ee128e7 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -20,7 +20,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng $scope.init = function () { $scope.todayDate = new Date(); const LOCALTYPE = localDetail.localType; - if(LOCALTYPE === 'R002') { + if(LOCALTYPE === 'R002' || LOCALTYPE == 'R005') { $scope.currentDate = new Date(); var d = new Date(); $scope.oneMonthBefore = d.setMonth(d.getMonth()-1); diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 28bef2ef..8d911999 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -67,7 +67,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ // load when html page load $scope.init = function () { const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) { $scope.currentDate = new Date(); $scope.localUserListCode = localDetail.localType; $scope.localBranchID = localDetails.localBranchID; diff --git a/Apollo/assets/js/controllers/incomeCtrl.js b/Apollo/assets/js/controllers/incomeCtrl.js index a76ebe32..44667ea9 100644 --- a/Apollo/assets/js/controllers/incomeCtrl.js +++ b/Apollo/assets/js/controllers/incomeCtrl.js @@ -18,7 +18,7 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { }else { if(localDetail != null) { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 6a654cc6..c81bf6b5 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -23,7 +23,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index acc29565..fba35298 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -527,7 +527,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js index 440bd164..bb220c68 100755 --- a/Apollo/assets/js/controllers/semcoursemapCtrl.js +++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js @@ -69,7 +69,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js index 9b6e9886..dfbe75a6 100755 --- a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js @@ -19,7 +19,7 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = localDetail.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index c6e7df12..2b261e15 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -15,7 +15,7 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 0d7e2704..1f69b904 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -200,7 +200,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sessionScheduleCtrl.js b/Apollo/assets/js/controllers/sessionScheduleCtrl.js index 7e046785..12ee13c2 100755 --- a/Apollo/assets/js/controllers/sessionScheduleCtrl.js +++ b/Apollo/assets/js/controllers/sessionScheduleCtrl.js @@ -276,7 +276,7 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/statusCtrl.js b/Apollo/assets/js/controllers/statusCtrl.js index ceeff45c..6263a3b7 100755 --- a/Apollo/assets/js/controllers/statusCtrl.js +++ b/Apollo/assets/js/controllers/statusCtrl.js @@ -18,7 +18,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) { }else { if(localDetail != null && LOCALTYPE != 'R001') { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 78dbbe0d..368406f3 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -56,7 +56,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js index bcb2cbe3..dec3ee2f 100755 --- a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js +++ b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js @@ -13,7 +13,7 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_ $scope.initHead = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) { }else { if(localDetail != null && LOCALTYPE !='R001') { $state.go('app.dashboard'); diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index b9f3ef48..4dca3eed 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -35,7 +35,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' || LOCALTYPE == 'R005' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/subjectCtrl.js b/Apollo/assets/js/controllers/subjectCtrl.js index a31a8167..9cc1466d 100755 --- a/Apollo/assets/js/controllers/subjectCtrl.js +++ b/Apollo/assets/js/controllers/subjectCtrl.js @@ -200,7 +200,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index 01130bb8..50fdf386 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -31,7 +31,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams $scope.init = function() { // alert(); const LOCALTYPE = localDetail.localType; - if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { $scope.getUniversityList(); }else { if(localDetail != null && LOCALTYPE != 'R001') {