From cbd68b72fc5759e9b960d7bf54decf07783993c0 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 14 Aug 2018 14:25:42 +0530 Subject: [PATCH] access control --- .../controllers/Call_Tracking_Controller.php | 2 +- Apollo/api/application/models/Login_model.php | 5 +- .../api/application/models/Reports_model.php | 4 +- .../assets/js/controllers/BatchmomentCtrl.js | 19 ++++ Apollo/assets/js/controllers/activityCtrl.js | 53 ++++++++--- .../assets/js/controllers/announcementCtrl.js | 20 ++++ .../js/controllers/answerBookletStatusCtrl.js | 24 +++++ .../js/controllers/applicationStatusCtrl.js | 21 +++++ Apollo/assets/js/controllers/batchCtrl.js | 27 ++++++ Apollo/assets/js/controllers/branchCtrl.js | 23 +++++ .../assets/js/controllers/callTrackingCtrl.js | 91 +++++++++++++++++++ Apollo/assets/js/controllers/centerCtrl.js | 23 +++++ .../assets/js/controllers/certificateCtrl.js | 25 +++++ .../js/controllers/certificationStatusCtrl.js | 24 +++++ Apollo/assets/js/controllers/courseCtrl.js | 4 +- .../js/controllers/dayBookMasterCtrl.js | 23 +++++ Apollo/assets/js/controllers/employeeCtrl.js | 2 +- .../js/controllers/examAttendanceCtrl.js | 24 +++++ .../assets/js/controllers/feesStatusCtrl.js | 26 ++++++ .../js/controllers/generateHallTicketCtrl.js | 21 +++++ Apollo/assets/js/controllers/incomeCtrl.js | 20 ++++ .../js/controllers/income_reportCtrl.js | 35 +++++++ .../js/controllers/report_expenseCtrl.js | 15 +++ .../assets/js/controllers/report_leadCtrl.js | 17 ++++ Apollo/assets/js/controllers/schCtrl.js | 20 ++++ .../assets/js/controllers/semcoursemapCtrl.js | 23 +++++ .../sendSMSDetailssuperadminCtrl.js | 22 +++++ .../js/controllers/sendSMSsuperadminCtrl.js | 26 ++++++ .../js/controllers/sessionMasterCtrl.js | 25 +++++ .../js/controllers/sessionScheduleCtrl.js | 25 +++++ Apollo/assets/js/controllers/statusCtrl.js | 23 ++++- Apollo/assets/js/controllers/studentCtrl.js | 27 ++++++ .../js/controllers/studentStatusUpdateCtrl.js | 2 +- .../js/controllers/studyMaterialStatusCtrl.js | 26 ++++++ Apollo/assets/js/controllers/subjectCtrl.js | 22 +++++ .../assets/js/controllers/universityCtrl.js | 4 +- 36 files changed, 767 insertions(+), 26 deletions(-) diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 4ec40ade..72b913bd 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -415,7 +415,7 @@ class Call_Tracking_Controller extends REST_Controller { */ public function autoAddlead_post(){ $student = $this->post('student'); - + //print_r($student);die; if(!empty($student)){ $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index af78b7af..bfb292bc 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -283,7 +283,8 @@ class Login_model extends CI_Model if($responseDetails->LoginAccess ==1){ $string2 = str_shuffle('1234567890'); $otp = substr($string2,0,6); - //echo $otp;die; + //$otp = '431528'; + // //echo $otp;die; $save['OTP'] = $otp; $save['UpdatedOn'] = date('Y-m-d H:i:s'); // print_r($save);die; @@ -291,7 +292,7 @@ class Login_model extends CI_Model $this->db->where('ListCode',STUDENT); $query = $this->db->update('T_Login',$save); - + // $query =1; if($query == 1){ $sms = $this->smssend($mobile,$otp); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 8fcab464..79de6b99 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -163,7 +163,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear } public function certificate_status($bat=null,$br=null,$u=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts @@ -235,7 +235,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts diff --git a/Apollo/assets/js/controllers/BatchmomentCtrl.js b/Apollo/assets/js/controllers/BatchmomentCtrl.js index 394d3892..237159c5 100644 --- a/Apollo/assets/js/controllers/BatchmomentCtrl.js +++ b/Apollo/assets/js/controllers/BatchmomentCtrl.js @@ -28,6 +28,25 @@ $scope.promoteButtonStatus = false; * created by velz * */ $scope.init = function () { + + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } var getUniv = { method: 'POST', diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index d69d24a9..fd2d9c0c 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -10,20 +10,22 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ 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.initHead = function() { + // // alert(); + // const LOCALTYPE = localDetail.localType; + // if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // }else { + // if((localDetail != null) && (LOCALTYPE !='R001')) { + // $state.go('app.dashboard'); + // } else { + // ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } + // } + + $scope.companies = { "ActivityID": "", "ActivityName": "", @@ -163,6 +165,29 @@ swal("Warning!", "Status are required", "warning"); $scope.loader = ''; $scope.emptyData = ''; $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + localStorage.setItem('localStatusDetails', ''); var getActivity = { diff --git a/Apollo/assets/js/controllers/announcementCtrl.js b/Apollo/assets/js/controllers/announcementCtrl.js index 7401bcdf..bf3239bd 100755 --- a/Apollo/assets/js/controllers/announcementCtrl.js +++ b/Apollo/assets/js/controllers/announcementCtrl.js @@ -195,6 +195,26 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + var getAnnouncement = { method: 'POST', url: apiPoint.url + 'getAnnouncementDetails/', diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index 84435d42..7f76b306 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -29,6 +29,30 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.localBranchDetails = ''; $scope.init = function () { + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // die(); + // } + // } + + + + + if (localDetail != null) { if (localDetails.localType === 'R004') { $scope.localTypeSuperAdmin = true; diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index e68625ff..9ed53ff7 100755 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -34,6 +34,27 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + if (localDetail != null) { if (localDetails.localType === 'R004') { $scope.localTypeSuperAdmin = true; diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 9ef5ac69..18164da5 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -240,6 +240,33 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl $scope.emptyData=''; $rootScope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + + + localStorage.setItem('localUniversityDetails', ''); var getBranch = { diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index 122e5b25..bae7ad09 100755 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -353,6 +353,29 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + var getBranch = { method: 'POST', url: apiPoint.url + 'getBranchDetails/', diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 81040070..ca3949fb 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -403,6 +403,32 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $scope.init = function (myModel) { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + $scope.data = []; if(myModel!='' && myModel!=undefined){ $scope.finalSearchArry=myModel; @@ -656,6 +682,26 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte }*/ + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + $scope.loader = true; var getRecentlead = { @@ -838,6 +884,30 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); }*/ + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + $scope.loader = true; var getRecentclose = { @@ -1021,6 +1091,27 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); }*/ + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + $scope.loader = true; var getRecentclose = { diff --git a/Apollo/assets/js/controllers/centerCtrl.js b/Apollo/assets/js/controllers/centerCtrl.js index 8203f8c7..9bd307b1 100755 --- a/Apollo/assets/js/controllers/centerCtrl.js +++ b/Apollo/assets/js/controllers/centerCtrl.js @@ -191,6 +191,29 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $rootScope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + var getCenter = { method: 'POST', url: apiPoint.url + 'getCenterDetails/', diff --git a/Apollo/assets/js/controllers/certificateCtrl.js b/Apollo/assets/js/controllers/certificateCtrl.js index a78c022c..071561ce 100755 --- a/Apollo/assets/js/controllers/certificateCtrl.js +++ b/Apollo/assets/js/controllers/certificateCtrl.js @@ -111,6 +111,31 @@ $scope.certificateForm = { $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + var getCertificate = { method: 'POST', url: apiPoint.url + 'getCertificateDetails/', diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 225338d6..e67f0b91 100755 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -31,6 +31,30 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.localBranchDetails = ''; $scope.init = function () { + + + + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(localDetail != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + //window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + if (localDetail != null) { if (localDetails.localType === 'R004') { $scope.localTypeSuperAdmin = true; diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 5477b170..7a73d074 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -16,11 +16,11 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab const LOCALTYPE = localDetail.localType; if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { }else { - if(localDetail != null) { + if(localDetail != null && LOCALTYPE != 'R001') { $state.go('app.dashboard'); } else { ipCookie.remove('cookiechk'); - $window.localStorage.clear(); + window.localStorage.clear(); $state.go('login.signin'); } } diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js index 0f18e2ca..4544e1fd 100755 --- a/Apollo/assets/js/controllers/dayBookMasterCtrl.js +++ b/Apollo/assets/js/controllers/dayBookMasterCtrl.js @@ -119,6 +119,29 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + var getdetails = { method: 'POST', url: apiPoint.url + 'getDayBookMasterDetails/', diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 96825a27..27969230 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -76,7 +76,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ $scope.getRoleList(); $scope.getBranchDetails(); } else { - if(localDetail != null) { + if(localDetail != null && LOCALTYPE !='R001' ) { $state.go('app.dashboard'); } else { ipCookie.remove('cookiechk'); diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index 97ecdd1c..5ed1b20b 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -39,6 +39,30 @@ $scope.isLoaderTxt = "Loading..."; * created by kms * */ $scope.init = function () { + + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } + + + + + var getUniv = { method: 'POST', url: apiPoint.url + 'getUniversityCourseDetails/', diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index a06e4b34..c5230ee5 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -92,6 +92,32 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * created by kms * */ $scope.init = function () { + + + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } + + + + + + $scope.isTrainee = false; var localUserType = JSON.parse(localStorage.getItem('localObj')).localType; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 29d58d5a..705ec048 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -41,6 +41,27 @@ $scope.generateButtonStatus = false; * created by kms * */ $scope.init = function () { + + + + // var logcheck = JSON.parse(localStorage.getItem('localObj')); + + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != null && LOCALTYPE !='R001') { + // console.log("else if"); + // $state.go('app.dashboard'); + // } else { + + // console.log("else else"); + // //ipCookie.remove('cookiechk'); + // window.localStorage.clear(); + // $state.go('login.signin'); + // } + // } + var getUniv = { method: 'POST', diff --git a/Apollo/assets/js/controllers/incomeCtrl.js b/Apollo/assets/js/controllers/incomeCtrl.js index b6dd89c8..fbfc5941 100644 --- a/Apollo/assets/js/controllers/incomeCtrl.js +++ b/Apollo/assets/js/controllers/incomeCtrl.js @@ -132,6 +132,26 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.emptyData = ''; $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + var getStatus = { method: 'POST', url: apiPoint.url + 'getAccounttypes/', diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 9dac148e..8a4ef153 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -15,6 +15,41 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", }; + //console.log('out') + + + // $scope.initHead = function() { +//console.log('rfd'); + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + // } + + + $scope.init = function(){ + + console.log('gf'); + } + + + + + // $scope.filters = function () { // var filterlist = { // method: 'POST', diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index 4765e666..ea55df94 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -13,6 +13,21 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }; + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if((localDetail != null) && (LOCALTYPE !='R001')) { + $state.go('app.dashboard'); + } else { + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + $scope.filters = function () { var filterlist = { method: 'POST', diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index 601838c7..a2791194 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -22,6 +22,23 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A }; + + + $scope.init = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if((localDetail != null) && (LOCALTYPE !='R001')) { + $state.go('app.dashboard'); + } else { + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + //get current date $scope.hideDateSearch=true; $scope.modifyMinDate = moment(); diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index cba7b4ec..e93aba84 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -521,6 +521,26 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP * created by TamilBala * */ $scope.init = function () { + + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } var branchid=JSON.parse(localStorage.getItem('localObj')).localBranchID; diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js index e8fd023b..08fcdb3b 100755 --- a/Apollo/assets/js/controllers/semcoursemapCtrl.js +++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js @@ -64,6 +64,29 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + $scope.semDetailsLoadingStatus = true; $scope.semDetailsLoadingTxt = "Loading..."; diff --git a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js index 32b137b1..536b3465 100755 --- a/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js @@ -14,6 +14,28 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar "dateTo": "" } $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = localDetail.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + if (localDetail != null) { $scope.currentDate = new Date(); var formate = "dd-MM-yyyy"; diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 4081ab46..b0819b76 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -10,6 +10,32 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " var localDetails = ipCookie('cookiechk'); $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + if (localDetail != null) { // $scope.getBranchList(); $scope.getUniversityList(); diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 1ac9c770..2460393f 100755 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -194,6 +194,31 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.emptyData=''; $rootScope.init = function () { + + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + $scope.universityList = []; var getSession = { method: 'POST', diff --git a/Apollo/assets/js/controllers/sessionScheduleCtrl.js b/Apollo/assets/js/controllers/sessionScheduleCtrl.js index f87e3aa7..93b8d7f6 100755 --- a/Apollo/assets/js/controllers/sessionScheduleCtrl.js +++ b/Apollo/assets/js/controllers/sessionScheduleCtrl.js @@ -272,6 +272,31 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter $scope.emptyData=''; $rootScope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + $scope.getattendanceranges($scope.myModel.timingCounts); var getSession = { method: 'POST', diff --git a/Apollo/assets/js/controllers/statusCtrl.js b/Apollo/assets/js/controllers/statusCtrl.js index 48eb3940..67d63d9a 100755 --- a/Apollo/assets/js/controllers/statusCtrl.js +++ b/Apollo/assets/js/controllers/statusCtrl.js @@ -20,7 +20,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo const LOCALTYPE = localDetail.localType; if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { }else { - if(localDetail != null) { + if(localDetail != null && LOCALTYPE != 'R001') { $state.go('app.dashboard'); } else { ipCookie.remove('cookiechk'); @@ -132,6 +132,27 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo $scope.emptyData = ''; $scope.init = function () { + +var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + var getStatus = { method: 'POST', url: apiPoint.url + 'getStatusDetails/', diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 264da563..04bf8eba 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -51,6 +51,33 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", // 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' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + + $scope.localUserType = localDetails.localType; $scope.todayDate = new Date(); var nowInMS = new Date().getTime(), diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js index fab2b35f..bcb2cbe3 100755 --- a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js +++ b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js @@ -15,7 +15,7 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_ const LOCALTYPE = localDetail.localType; if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { }else { - if(localDetail != null) { + if(localDetail != null && LOCALTYPE !='R001') { $state.go('app.dashboard'); } else { ipCookie.remove('cookiechk'); diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index dccbed0f..839212f0 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -30,6 +30,32 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.localBranchDetails = ''; $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + + + if (localDetail != null) { if (localDetails.localType === 'R004') { $scope.localTypeSuperAdmin = true; diff --git a/Apollo/assets/js/controllers/subjectCtrl.js b/Apollo/assets/js/controllers/subjectCtrl.js index ce579b62..3e1fff9e 100755 --- a/Apollo/assets/js/controllers/subjectCtrl.js +++ b/Apollo/assets/js/controllers/subjectCtrl.js @@ -195,6 +195,28 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT $scope.init = function () { + + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + $scope.loader=''; diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index d9627339..74974cb9 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -34,11 +34,11 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { $scope.getUniversityList(); }else { - if(localDetail != null) { + if(localDetail != null && LOCALTYPE != 'R001') { $state.go('app.dashboard'); } else { ipCookie.remove('cookiechk'); - $window.localStorage.clear(); + window.localStorage.clear(); $state.go('login.signin'); } }