From 4ca64d5b6658ed609e4bec5a194c6e5289cbcb43 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 11:43:08 +0530 Subject: [PATCH 01/18] file changes : nidila --- Apollo/assets/js/controllers/activityCtrl.js | 2 +- .../assets/js/controllers/announcementCtrl.js | 2 +- Apollo/assets/js/controllers/batchCtrl.js | 2 +- Apollo/assets/js/controllers/branchCtrl.js | 2 +- .../assets/js/controllers/callTrackingCtrl.js | 2 +- Apollo/assets/js/controllers/centerCtrl.js | 2 +- .../assets/js/controllers/certificateCtrl.js | 2 +- .../js/controllers/datacorrectionCtrl.js | 2 +- .../js/controllers/dayBookMasterCtrl.js | 2 +- Apollo/assets/js/controllers/daybookCtrl.js | 9 ++++- Apollo/assets/js/controllers/employeeCtrl.js | 2 +- Apollo/assets/js/controllers/incomeCtrl.js | 2 +- .../js/controllers/income_reportCtrl.js | 2 +- Apollo/assets/js/controllers/schCtrl.js | 2 +- .../assets/js/controllers/semcoursemapCtrl.js | 2 +- .../sendSMSDetailssuperadminCtrl.js | 2 +- .../js/controllers/sendSMSsuperadminCtrl.js | 2 +- Apollo/assets/js/controllers/sessionCtrl.js | 9 +++++ .../js/controllers/sessionMasterCtrl.js | 2 +- .../js/controllers/sessionScheduleCtrl.js | 4 +-- Apollo/assets/js/controllers/statusCtrl.js | 2 +- Apollo/assets/js/controllers/studentCtrl.js | 2 +- .../js/controllers/studyMaterialStatusCtrl.js | 2 +- Apollo/assets/js/controllers/subjectCtrl.js | 2 +- .../assets/js/controllers/universityCtrl.js | 2 +- .../assets/views/daybook/dayBookApproval.html | 4 ++- .../views/daybook/dayBookadminApproval.html | 4 ++- Apollo/assets/views/daybook/daybook.html | 33 ++++++++++++++++--- Apollo/assets/views/daybook/daybookadmin.html | 18 ++++++++-- 29 files changed, 92 insertions(+), 33 deletions(-) diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index fd2d9c0c..437dd18c 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' )) { 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 bf3239bd..31621f4f 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 18164da5..626e21b7 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 bae7ad09..aa4eb69d 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 ca3949fb..3c4deddb 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 9bd307b1..38904a52 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 071561ce..2c038ffe 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 1f67b36c..32c6a294 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 4544e1fd..6d3a92b6 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 a109edf7..24e57b6a 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -208,12 +208,19 @@ $scope.dayBookApprovalAccess = ''; } $scope.copyModel = function (p) { + + var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type); + console.log(inc); + $scope.incexp = inc[0]; + + console.log($scope.incexp.ID); + console.log(p); $scope.myModel = { "id": p.ID, "date": p.Date, "incomeExpense": p.Name, - "type": p.Type, + "type":$scope.incexp.ID, "amount": p.Amount, "status": p.Status, "description": p.Description, diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 27969230..28bef2ef 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' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) { $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 fbfc5941..a76ebe32 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' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { }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 8a4ef153..6a654cc6 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 e93aba84..acc29565 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 08fcdb3b..440bd164 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 536b3465..9b6e9886 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 b0819b76..0d7cd4f8 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/sessionCtrl.js b/Apollo/assets/js/controllers/sessionCtrl.js index 667d9ecc..181bb4f5 100755 --- a/Apollo/assets/js/controllers/sessionCtrl.js +++ b/Apollo/assets/js/controllers/sessionCtrl.js @@ -76,6 +76,8 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', if (inlocalDetails != null) { if (inlocalDetails.localType == 'R003' && inlocalDetailss.localType == 'R003') { + + // console.log('if') } else { if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') { ipCookie.remove('cookiechk'); @@ -100,15 +102,22 @@ 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'); diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index 2460393f..0d7e2704 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 93b8d7f6..7e046785 100755 --- a/Apollo/assets/js/controllers/sessionScheduleCtrl.js +++ b/Apollo/assets/js/controllers/sessionScheduleCtrl.js @@ -273,10 +273,10 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter $rootScope.init = function () { - var logcheck = JSON.parse(localStorage.getItem('localObj')); + var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) { 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 67d63d9a..ceeff45c 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' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) { }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 04bf8eba..78dbbe0d 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 839212f0..b9f3ef48 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' )) { 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 3e1fff9e..a31a8167 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { 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 74974cb9..01130bb8 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' )) { + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) { $scope.getUniversityList(); }else { if(localDetail != null && LOCALTYPE != 'R001') { diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 6c68ec50..6d05da34 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -76,7 +76,9 @@ Type is Required diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 657ea079..4a4a2241 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -83,7 +83,9 @@ Type is Required diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 4e6e0485..525a296b 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -255,12 +255,22 @@ - + + + + Type is Required @@ -344,7 +354,9 @@ Type is Required @@ -386,10 +398,23 @@ - + + + + + + + + + Type is Required diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 53f7f83f..f9e72a7f 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -358,7 +358,9 @@ Type is Required @@ -400,10 +402,22 @@ - + + + + + + + + Type is Required From 769180f577e25c74f613ae7e3e6d7d52a37ddb83 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 12:39:35 +0530 Subject: [PATCH 02/18] sms group reload- nidhila --- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 0d7cd4f8..6b66c459 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -540,7 +540,7 @@ $scope.disableSendButton = true; swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + //$state.go($state.current, {}, { reload: true }); } else { @@ -897,7 +897,7 @@ if(group == '') swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + // $state.go($state.current, {}, { reload: true }); } else { swal(" ", response.data.message, "error"); From 3141046a5a827ebed68f7605114d9525ead392f7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 12:46:13 +0530 Subject: [PATCH 03/18] group sms reload- nidhila --- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 6b66c459..c6e7df12 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -897,6 +897,7 @@ if(group == '') swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() + myModel.GroupName = ''; // $state.go($state.current, {}, { reload: true }); } else { From 575b372dd8460a31e83ea9a9c65521b35e5ed89f Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 13:03:54 +0530 Subject: [PATCH 04/18] mail credential changes: kdk --- Apollo/api/application/models/StatusUpdation_model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index e5fddb90..577808b2 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -590,11 +590,11 @@ class StatusUpdation_model extends CI_Model { $this->load->library('email'); //SMTP & mail configuration $config = array( - 'protocol' => 'ssmtp', - 'smtp_host' => 'ssl://smtp.example.com', - 'smtp_port' => 465, - 'smtp_user' => 'noreply@apollodec.com', - 'smtp_pass' => 'Apollo@123', + 'protocol' => 'smtp', + 'smtp_host' => 'smtp.sendgrid.net', + 'smtp_port' => 25, + 'smtp_user' => 'apikey', + 'smtp_pass' => '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', 'mailtype' => 'html', 'charset' => 'utf-8' ); From 13e1b672b47cca6c0ccb9f0d9f4639e839004028 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 13:05:40 +0530 Subject: [PATCH 05/18] sms trigger msg changes : kdk --- Apollo/api/application/models/StatusUpdation_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 577808b2..ac00c836 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -318,7 +318,8 @@ class StatusUpdation_model extends CI_Model { $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; - $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + $mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received."; $this->smssend($arr, $mesg); $this->mailsend($arr, $mesg, $cerNamtToMsg); $result['addStatus'] = true; From 43ccde14c6a5c92b80f1280a793dbc0d8513678c Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 13:20:20 +0530 Subject: [PATCH 06/18] phone number min length --- Apollo/assets/views/addcontact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/addcontact.html b/Apollo/assets/views/addcontact.html index 3328eb80..f62c6603 100644 --- a/Apollo/assets/views/addcontact.html +++ b/Apollo/assets/views/addcontact.html @@ -26,7 +26,7 @@ Phone Number - + Phone number required From d2852db2011789e9b2034baab4377561c8aca98f Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Sat, 18 Aug 2018 14:16:20 +0530 Subject: [PATCH 07/18] reregistrationform pdf --- .../reregistration/reregistrationformpdf.html | 22 +++++++++--------- ...jR7i1TZw2Ln.jpeg => Dri_2uO9l1c7eBrA.jpeg} | Bin 2 files changed, 11 insertions(+), 11 deletions(-) rename Apollo/images/university/{Dri_xjR7i1TZw2Ln.jpeg => Dri_2uO9l1c7eBrA.jpeg} (100%) diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html index 0bc3f675..9a748bff 100755 --- a/Apollo/assets/views/reregistration/reregistrationformpdf.html +++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html @@ -5,21 +5,21 @@ - - + - +
+
+ - + @@ -98,6 +103,7 @@ +
From 8045995d1a99d0dcc1f67b9f1bd842ffe45ef8b6 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 17:42:46 +0530 Subject: [PATCH 13/18] status updation new changes : kdk --- .../models/StatusUpdation_model.php | 2 +- Apollo/assets/i18n/en.json | 3 +- Apollo/assets/js/config.constant.js | 4 + Apollo/assets/js/config.router.js | 9 + .../js/controllers/applicationStatusCtrl.js | 610 +++++++++++++++ Apollo/assets/views/partials/nav.html | 5 + .../status-update/application_status.html | 693 ++++++++++++++++++ 7 files changed, 1324 insertions(+), 2 deletions(-) create mode 100644 Apollo/assets/js/controllers/applicationStatusCtrl.js create mode 100644 Apollo/assets/views/status-update/application_status.html diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 9022663c..ec992a9b 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -222,7 +222,7 @@ class StatusUpdation_model extends CI_Model { $results['preStatusDetails'] = false; $results['message'] = 'No record found'; } - } else if ($reqDetailsFor == 'APPICATION_STATUS') { + } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') { $searchFor = 'A001'; $searchTableFor = APPLICATION_STATUS; $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index a36e505b..aad81771 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -105,7 +105,8 @@ "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", "MARKCARD": "MARK CARD", - "CERTIFICATE" : "CERTIFICATE" + "CERTIFICATE" : "CERTIFICATE", + "APPLICATION": "APPLICATION" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 5fbe55ab..22c0a514 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -157,6 +157,10 @@ app.constant('JS_REQUIRES', { * student Certification status updation * */ 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', + /* + * student Application status updation + * */ + 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', /* * student Certification status updation * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 0760db6b..e74f2e4e 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -333,6 +333,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Certificate Status' }, // resolve: loadSequence('wizardCtrl') + }).state('app.student.status.application', { + url: '/application', + templateUrl: "assets/views/status-update/application_status.html", + title: 'Application Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + ncyBreadcrumb: { + label: 'Application Status' + }, + // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { url: '/application', templateUrl: "assets/views/form_elements.html", diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js new file mode 100644 index 00000000..1a46e68a --- /dev/null +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -0,0 +1,610 @@ +'use strict'; +/*** controller for Wizard Form example***/ +app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) { + + /** + * Application status update search / Document status update + * by : kdk + */ + + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.statusUpdationId = -1; + $scope.editId = P; + } + $scope.cancel = function () { + $scope.editId = -1; + } + + + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + const localUpdateStatus = 'APPLICATIONFORM_STATUS'; + $scope.localTypeSuperAdmin = false; + $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; + $scope.getUniversityList(); + $scope.getBranchList(); + getCertificateDetailsList(); + } else { + $scope.getUniversityList(); + getCertificateDetailsList(); + } + } else { + } + } + + $scope.getBranchList = function () { + $scope.loader = true; + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getBranchListDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.branDetailstatus) { + $scope.loader = false; + $scope.branchList_data = response.data.branch_details; + } else { + } + }); + } + + + + $scope.searchData = { + 'University': '', + 'Course': '', + 'Batch': '', + 'Mobile': '', + 'Name': '' + } + + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + + // get university list while page is loading + $scope.universityData = ''; + $scope.getUniversityList = function () { + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getUniveCourseBratch/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.univList) { + $scope.universityData = response.data.university_details; + } else { + } + }); + }; + + $scope.getUniveId = function (univ) { + let name = JSON.parse(univ); + $scope.searchData.University = name.UniversityID; + $scope.searchData.Course = ''; + $scope.searchData.Batch = ''; + $scope.courseData = name.Course; + $scope.batchData = name.Batch; + //call service for array list in desc order based on date + angular.forEach($scope.batchData,function (values,key) { + var parts = values.BatchDate.split("-"); + values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]); + }); + $scope.batchData=dateListDescService.getOrderByList($scope.batchData); + // end + $scope.OpenWindowStatus = false; + $scope.getSearch(); + }; + + $scope.getValueChange = function () { + $scope.getSearch(); + } + + $scope.searchResultDetails = ''; + $scope.searchLoading = false; + $scope.searchResultLength = 0; + // get student list From the searching data + $scope.getSearch = function () { + $scope.OpenWindowStatus = false; + $scope.searchLoading = true; + var getSearchDetails = { + method: 'POST', + url: apiPoint.url + 'getSearchAutoDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: $scope.searchData, + requestDetails: localDetails + } + }; + $http(getSearchDetails).then(function (response) { + if (response.data.searchResult) { + $scope.searchResultStatus = response.data.searchResult; + $scope.searchLoading = false; + let searchResultDetailsBef = response.data.search_result_details; + const filterAddSelect = searchResultDetailsBef.filter(val => { + val['Selected'] = false; + return val; + }); + $scope.searchResultDetails = filterAddSelect; + $scope.searchResultLength = Object.keys($scope.searchResultDetails).length; + } else { + $scope.searchLoading = false; + } + }); + } + + // mobile number search functionlity + $scope.mySearchChangeFunc = function (val) { + // if (val > 0) { + // $scope.allSelectedHide = true; + // $scope.allSelected('undefined'); + // $scope.OpenWindowStatus = false; + // } else { + // $scope.allSelected('undefined'); + // $scope.allSelectedHide = false; + // } + } + // End: mobile number search functionlity + + // select all or individual functionality + + // var getAllSelected = function () { + // var selectedItems = $scope.searchResultDetails.filter(function (item) { + // return item.Selected; + // }); + + // return selectedItems.length === $scope.searchResultDetails.length; + // } + + // var setAllSelected = function (value) { + // angular.forEach($scope.searchResultDetails, function (item) { + // item.Selected = value; + // }); + // } + + // $scope.allSelected = function (value) { + // if (value !== undefined) { + // return setAllSelected(value); + // } else { + // return getAllSelected(); + // } + // } + + // End: select all or individual functionality + + // Select one row in a table once + $scope.setOneSelect = function (value) { + // alert(); + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + $scope.editId = -1; + $scope.statusUpdationId = value.UNI_ID; + value.Selected = true; + $scope.OpenWindowStatus = true; + $scope.openUpdateWind(value); + } + + // unselect all the selected item + $scope.unSelect = function () { + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + $scope.statusUpdationId = -1; + $scope.openUpdateWind(); + } + + // open popup window onselct checkbox clicked or close popup window all the clicked items unchecked + $scope.OpenWindowStatus = false; + $scope.openUpdateWind = function (p) { + alert(JSON.stringify(p)); + var details = { + studId: p.StudentID, + courseId: p.CourseID + } + alert(JSON.stringify(details)); + var ItemsSelected = $scope.searchResultDetails.filter(function (item) { + if (item.Selected === true) { return true; } + }); + if (ItemsSelected.length !== 0) { + const courseLocal = $scope.searchData.Course; + $scope.getApplicationFromDetails(courseLocal); + $scope.getStatusList(); + $scope.OpenWindowStatus = true; + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + } else { + $scope.OpenWindowStatus = false; + } + } + + // get status list for this activity + $scope.getStatusList = function () { + var getStatusL = { + method: 'POST', + url: apiPoint.url + 'getStatusListForUpdate/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: 'studyMaterial', + data: localUpdateStatus, + reqBranch: localDetails.localBranchID + } + }; + $http(getStatusL).then(function (response) { + if (response.data.statusList) { + $scope.statusDetailsList = response.data.statusList_details; + } else { + // $scope.searchLoading = false; + } + }); + } + + // get Sem/Year based on the course select + $scope.getSemYearList = function (courseID) { + $scope.semYearList = ''; + if (courseID !== '' && courseID !== undefined) { + var getSemYear = { + method: 'POST', + url: apiPoint.url + 'getSemYearForCourse/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: courseID + } + }; + $http(getSemYear).then(function (response) { + if (response.data.semYearResult) { + $scope.semYearList = response.data.semYear_result_details; + } else { + $scope.semYearList = ''; + } + }); + + } else { + + } + } + + $scope.statusUpdate = { + submit: function (form, myStatusModel, localBranchDetails) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); + } else { + // alert(localDetail.localBranchID); + // alert(localBranchDetails); + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; + // alert(localDetail.localBranchID); + $scope.disableButton = true; + var studentForUpdate = []; + let formate = "dd-MM-yyyy"; + $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate); + var ItemsSelected = $scope.searchResultDetails.filter(function (item) { + if (item.Selected === true) { + let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.CourseID, item.BranchCode); + studentForUpdate.push(getStudentID); + return true; + } + }); + function getStudentForUpdateDetails(id, courseId, dCode) { + this.StudentID = id; + this.CourseID = courseId; + this.BranchCode = dCode; + this.ListCode = $scope.myStatusModel.staus; + this.SDate = $scope.myStatusModel.dateOn; + this.Coursedetail = id; + this.Comments = $scope.myStatusModel.comment; + this.CertificateType = $scope.myStatusModel.certificatetype; + this.CertificateNumber = $scope.myStatusModel.certificateNumber; + } + var updateStudyMaterial = { + method: 'POST', + url: apiPoint.url + 'updateApplicationStatus/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: studentForUpdate, + requestDetails: localDetails + } + }; + $http(updateStudyMaterial).then(function (response) { + if (response.data.addStatus) { + swal(" ","Updated successfully.", "success"); + $scope.disableButton = false; + // for success state + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + // $scope.OpenWindowStatus = false; + $scope.OpenWindowStatus = false; + } else { + swal(" ", response.data.message, "error"); + $scope.disableButton = false; + // for success state + angular.forEach($scope.searchResultDetails, function (item) { + item.Selected = false; + }); + // $scope.OpenWindowStatus = false; + $scope.OpenWindowStatus = false; + } + }); + } + }, + reset: function (form) { + form.$setPristine(true); + $scope.myStatusModel = { + 'semYear': '', + 'staus': '', + 'dateOn': '', + 'comment': '', + 'certificatetype': '', + 'certificateNumber': '' + } + } + } + + + // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function (p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID }, + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } +}]); +/*modal controller + * */ +app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :studentDetails.MobileNumber, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","WordsService", function ($scope, $modalInstance, items1,WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.filter('unique', function() { + return function(collection, primaryKey, secondaryKey) { //optional secondary key + var output = [], + keys = []; + + angular.forEach(collection, function(item) { + var key; + secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey]; + + if(keys.indexOf(key) === -1) { + keys.push(key); + output.push(item); + } + }); + + return output; + }; +}); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index b5a0d5e4..f1e44992 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -208,6 +208,11 @@ Certificate + diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html new file mode 100644 index 00000000..5bc63532 --- /dev/null +++ b/Apollo/assets/views/status-update/application_status.html @@ -0,0 +1,693 @@ + +
+
+
+

{{ mainTitle }}

+ Update application status. +
+
+
+
+ + +
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ + + +
+ +
+
+
+ +
+ +
+ +
+
+
+ + + + +
+
+
+
+
+
+
+
+ + + +
+ +
+ +
+

fetching...

+
+ +
+ +
+
+

No + records found...

+
+ +
+
+

No + records found...

+
+ +
+ +
+
+
+ + + + +

+
+
+
+
-

{{Course.UniversityName}}

+ 		+

{{Course.UniversityName}}
RE-REGISTRATION FORM
-

{{Course.Address}}  Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}, Website:-

+

{{Course.Address}}  Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}
-

The from should be complete in all respects and to be filled by Course in English CAPITAL letters in blue /black ink.

+

The from should be complete in all respects and to be filled by Student
in English CAPITAL letters in blue /black ink.

@@ -79,14 +79,14 @@

Pin Code: __________ Mobile No: {{Course.MobileNumber}} E-mail ID: {{Course.EmailID}}

- - - - + + + + - + @@ -96,7 +96,7 @@ - +
diff --git a/Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg b/Apollo/images/university/Dri_2uO9l1c7eBrA.jpeg similarity index 100% rename from Apollo/images/university/Dri_xjR7i1TZw2Ln.jpeg rename to Apollo/images/university/Dri_2uO9l1c7eBrA.jpeg From 6c9b31762d8eb24df191dda3eb8a8bd8ef590aab Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 14:59:48 +0530 Subject: [PATCH 08/18] trainee screen access --- Apollo/assets/js/controllers/activityCtrl.js | 2 +- Apollo/assets/js/controllers/announcementCtrl.js | 2 +- Apollo/assets/js/controllers/batchCtrl.js | 2 +- Apollo/assets/js/controllers/branchCtrl.js | 2 +- Apollo/assets/js/controllers/callTrackingCtrl.js | 2 +- Apollo/assets/js/controllers/centerCtrl.js | 2 +- Apollo/assets/js/controllers/certificateCtrl.js | 2 +- Apollo/assets/js/controllers/datacorrectionCtrl.js | 2 +- Apollo/assets/js/controllers/dayBookMasterCtrl.js | 2 +- Apollo/assets/js/controllers/daybookCtrl.js | 2 +- Apollo/assets/js/controllers/employeeCtrl.js | 2 +- Apollo/assets/js/controllers/incomeCtrl.js | 2 +- Apollo/assets/js/controllers/income_reportCtrl.js | 2 +- Apollo/assets/js/controllers/schCtrl.js | 2 +- Apollo/assets/js/controllers/semcoursemapCtrl.js | 2 +- Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js | 2 +- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 2 +- Apollo/assets/js/controllers/sessionMasterCtrl.js | 2 +- Apollo/assets/js/controllers/sessionScheduleCtrl.js | 2 +- Apollo/assets/js/controllers/statusCtrl.js | 2 +- Apollo/assets/js/controllers/studentCtrl.js | 2 +- Apollo/assets/js/controllers/studentStatusUpdateCtrl.js | 2 +- Apollo/assets/js/controllers/studyMaterialStatusCtrl.js | 2 +- Apollo/assets/js/controllers/subjectCtrl.js | 2 +- Apollo/assets/js/controllers/universityCtrl.js | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) 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') { From 19286a974c081ccaa72abe33854a674f9fba2931 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 15:11:28 +0530 Subject: [PATCH 09/18] access for trainee --- Apollo/assets/js/controllers/callTrackingCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index a5c2ee86..fdad1233 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -686,7 +686,7 @@ 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' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { @@ -889,7 +889,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; - if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002' )) { console.log("if"); }else { if(logcheck != null && LOCALTYPE !='R001') { From ac53d775287d9027e9ac4fbad02a5eb892576ca9 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 16:01:42 +0530 Subject: [PATCH 10/18] smtp port changes : kdk --- Apollo/api/application/models/StatusUpdation_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index ac00c836..9022663c 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -593,7 +593,7 @@ class StatusUpdation_model extends CI_Model { $config = array( 'protocol' => 'smtp', 'smtp_host' => 'smtp.sendgrid.net', - 'smtp_port' => 25, + 'smtp_port' => 465, 'smtp_user' => 'apikey', 'smtp_pass' => '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', 'mailtype' => 'html', @@ -612,7 +612,7 @@ class StatusUpdation_model extends CI_Model { $subj = $sub; $this->email->subject($subj); $this->email->message($htmlContent); - //Send email + //Send email 1 $result = $this->email->send(); // echo $this->email->print_debugger(); exit(); return $result; From 1c72a57fe985561a63902ae919d645012e164456 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Sat, 18 Aug 2018 16:56:18 +0530 Subject: [PATCH 11/18] reason for delete --- Apollo/assets/js/controllers/daybookCtrl.js | 2 +- Apollo/assets/js/controllers/daybookadminCtrl.js | 2 +- Apollo/assets/js/controllers/daybooksuperadminCtrl.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 24e57b6a..ef9c6743 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -236,7 +236,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } //delete the income entry From the fees payable diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 8fd032e9..b607258e 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -232,7 +232,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason For Delete!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 7959cb62..2400ee6c 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -339,7 +339,7 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted1 = function (id) { var id=id; - var reason=prompt("Enter Reason!",""); + var reason=prompt("Reason For Deletion!",""); $scope.deleteFeePayableEntry(reason,id); } //delete the income entry From the fees payable From 0b3c85b6a78036b12bf6d184bbe1e85a43f69396 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Sat, 18 Aug 2018 17:35:36 +0530 Subject: [PATCH 12/18] reregistration alignment issues --- .../reregistration/reregistrationformpdf.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html index 9a748bff..a0dcbf3a 100755 --- a/Apollo/assets/views/reregistration/reregistrationformpdf.html +++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html @@ -5,15 +5,16 @@
 SUBJECT / PAPER IN WHICH CANDIDATE APPEARING 
 SUBJECT / PAPER IN WHICH CANDIDATE APPEARING 
 SR.NO SL.NO  Subject Code  Subject / Paper Code
{{sub.SubjectCode}} {{sub.SubjectName}}
- + @@ -77,15 +78,19 @@
-

{{Course.UniversityName}}

+

{{Course.UniversityName}}

+

{{Course.Address}}
RE-REGISTRATION FORM
-

{{Course.Address}}  Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}

+

 Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}

Pin Code: __________ Mobile No: {{Course.MobileNumber}} E-mail ID: {{Course.EmailID}}

+
+
 SUBJECT / PAPER IN WHICH CANDIDATE APPEARING 
 SL.NO  Subject Code  Subject / Paper Code
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + First Name + + Last Name + + MobileNumber + + Email ID + + Course + +
+ + {{p.Firstname}}{{p.Lastname}}{{p.MobileNumber}}{{p.EmailID}}{{p.CourseName}}({{p.CourseCode}}) + +
+ +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + + + + +
StatusCommentsDocument NameDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.CertificateName}}{{s.AppDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + Update Status + +
+ + + +
+
+
+ + + + Certificate Type is Required + +
+
+ + + Certificate Number is Required +
+
+
+
+ + + + Status is Required + +
+
+
+ + + Date is required. + Enter a Valid Date +
+
+
+
+
+ + +