From 4ca64d5b6658ed609e4bec5a194c6e5289cbcb43 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 11:43:08 +0530 Subject: [PATCH] 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