diff --git a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js index a4c0e6e7..601ec79a 100644 --- a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js +++ b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js @@ -16,10 +16,19 @@ app.controller('FeeCollected_reportCtrl', ["$scope","$rootScope","toaster", "$fi }; + var localDetails = JSON.parse(localStorage.getItem('localObj')); //var localDetails = ipCookie('cookiechk'); //console.log(localDetails); +$scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; + // $scope.initHead = function() { @@ -83,6 +92,7 @@ app.controller('FeeCollected_reportCtrl', ["$scope","$rootScope","toaster", "$fi //$scope.opinctotal=''; $scope.newreglist=''; $scope.isLoaderShow =''; +$scope.isLoaderShow1 =''; $scope.load = ''; $scope.isShow= ''; $scope.fromd=''; @@ -94,6 +104,10 @@ $scope.getDetails = function (form,myModel) // console.log(JSON.parse(localStorage.getItem('localObj')).localBranchID); // return false; +$scope.isLoaderShow1 =true; +$scope.isLoaderShow =false; + + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -178,6 +192,7 @@ $scope.tod = to_dt; $scope.newreglist = response.data.details; $scope.isShow=true; $scope.isLoaderShow=false; + $scope.isLoaderShow1 =false; $scope.Totalfee =0; console.log($scope.newreglist); @@ -196,6 +211,7 @@ $scope.tod = to_dt; else { $scope.isLoaderShow=true; + $scope.isLoaderShow1 =false; $scope.isShow=false; } diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 61dd963f..315f8d78 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -20,6 +20,13 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter", //var localDetails = ipCookie('cookiechk'); // console.log(localDetails); + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; // $scope.initHead = function() { @@ -90,6 +97,8 @@ $scope.tod=''; $scope.getDetails = function (form,myModel) { // alert('in') + $scope.isLoaderShow = false; +$scope.isLoaderShow1 =true; // console.log(myModel); var from = $scope.filters.from_date; @@ -165,6 +174,7 @@ $scope.tod = to_dt; $scope.newreglist = response.data.details; $scope.isShow=true; $scope.isLoaderShow=false; + $scope.isLoaderShow1 =false; for(var i=0;i<$scope.newreglist.length;i++) $scope.newreglist[i].SL_NO = i+1; @@ -173,6 +183,7 @@ $scope.tod = to_dt; else { $scope.isLoaderShow=true; + $scope.isLoaderShow1 =false; $scope.isShow=false; } diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index c10786b8..ae69ea78 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -7,6 +7,13 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -97,6 +104,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -134,11 +142,13 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod $http(response_data).then(function (response) { if (response.data.ans_bookletList == true) { + $scope.isLoaderShow1 =false; $scope.ans_book_data = response.data.ans_book_data; for(var i=0;i<$scope.ans_book_data.length;i++) $scope.ans_book_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index a5a39a16..36f4087f 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -7,6 +7,13 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -96,6 +103,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //Response data $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; $scope.filterUniv = angular.fromJson($scope.univModel.university); // if($scope.univModel.university !== null){ // $scope.filterUniv = angular.fromJson($scope.univModel.university); @@ -138,11 +146,13 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $http(response_data).then(function (response) { if (response.data.app_pendingList == true) { + $scope.isLoaderShow1 =false; $scope.app_pending_data = response.data.app_pending_data; for(var i=0;i<$scope.app_pending_data.length;i++) $scope.app_pending_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js index 7131e354..9aed01f5 100644 --- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js @@ -7,6 +7,13 @@ app.controller('report_app_pending_oldDataCtrl', ["$scope", "$filter","$rootScop * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -96,6 +103,7 @@ app.controller('report_app_pending_oldDataCtrl', ["$scope", "$filter","$rootScop //Response data $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; $scope.filterUniv = angular.fromJson($scope.univModel.university); // if($scope.univModel.university !== null){ // $scope.filterUniv = angular.fromJson($scope.univModel.university); @@ -138,11 +146,13 @@ app.controller('report_app_pending_oldDataCtrl', ["$scope", "$filter","$rootScop $http(response_data).then(function (response) { if (response.data.app_pendingList == true) { + $scope.isLoaderShow1 =false; $scope.app_pending_data = response.data.app_pending_oldData; for(var i=0;i<$scope.app_pending_data.length;i++) $scope.app_pending_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 003da88c..fdf1df59 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -7,6 +7,13 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -108,6 +115,8 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.show = false; $scope.returnResultData = []; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; + $scope.returnResultData.length=0; var firstError = null; if (form.$invalid) { @@ -146,6 +155,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $http(response_data).then(function (response) { var j =0; if (response.data.balfeeList == true) { + $scope.isLoaderShow1 =false; $scope.balfee_data = response.data.balfee_data; for(var i=0;i<$scope.balfee_data.length;i++) if($scope.balfee_data[i].bal !=0){ @@ -155,6 +165,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 2999989c..f9ceb380 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -6,6 +6,14 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; + $scope.myModel = { "date": new Date(), @@ -110,6 +118,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.onSubmit = function () { + $scope.isLoaderShow1 =true; if($scope.univModel.university !== null && $scope.univModel.university !== '' ){ $scope.filterUniv = angular.fromJson($scope.univModel.university); }else { @@ -136,11 +145,13 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod $http(response_data).then(function (response) { if (response.data.certList == true) { + $scope.isLoaderShow1 =false; $scope.cert_data = response.data.cert_data; for(var i=0;i<$scope.cert_data.length;i++) $scope.cert_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 70336b05..965d139f 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -7,6 +7,13 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -98,7 +105,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //Response data $scope.show = false; $scope.onSubmit = function (form) { - + $scope.isLoaderShow1 =true; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -136,11 +143,13 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $http(response_data).then(function (response) { if (response.data.doc_pendingList == true) { + $scope.isLoaderShow1 =false; $scope.doc_pending_data = response.data.doc_pending_data; for(var i=0;i<$scope.doc_pending_data.length;i++) $scope.doc_pending_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 8fbc5cb0..db6f9898 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -7,6 +7,13 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -98,6 +105,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; if($scope.univModel.university !== null && $scope.univModel.university !== '' ){ $scope.filterUniv = angular.fromJson($scope.univModel.university); }else { @@ -123,11 +131,13 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $http(response_data).then(function (response) { if (response.data.examfeeList == true) { + $scope.isLoaderShow1 =false; $scope.examfee_data = response.data.examfee_data; for(var i=0;i<$scope.examfee_data.length;i++) $scope.examfee_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index b6714971..973be18c 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -16,6 +16,15 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $scope.date = new Date(); var localDetail = JSON.parse(localStorage.getItem('localObj')); + + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; + const LOCALTYPE = localDetail.localType; //console.log(LOCALTYPE) if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004')) { @@ -71,6 +80,8 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $scope.Total = 0; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -107,12 +118,14 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $http(response_data).then(function (response) { if (response.data.expenseList == true) { + $scope.isLoaderShow1 =false; $scope.expense_data = response.data.expense_data; for (var i = 0; i < $scope.expense_data.length; i++) $scope.expense_data[i].SL_NO = i + 1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index 41fb1c89..61c76836 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -6,7 +6,14 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A /* * auto call tracking/ */ - $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -124,6 +131,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; console.log($scope.filtersList); @@ -160,11 +168,13 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A console.log($scope.filtersList.assigned); $http(response_data).then(function (response) { if (response.data.leadList == true) { + $scope.isLoaderShow1 =false; $scope.lead_data = response.data.lead_data; for(var i=0;i<$scope.lead_data.length;i++) $scope.lead_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 345e8b31..90a89680 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -7,6 +7,14 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; + $scope.myModel = { "date": new Date(), @@ -111,6 +119,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }); $scope.onSubmit = function () { + $scope.isLoaderShow1 =true; //alert($scope.univModel.from_date); // if(angular.isString($scope.univModel.university) && $scope.univModel.university !== null){ // $scope.filterUniv = angular.fromJson($scope.univModel.university); @@ -146,11 +155,13 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco $http(response_data).then(function (response) { if (response.data.mark_certList == true) { + $scope.isLoaderShow1 =false; $scope.mark_cert_data = response.data.mark_cert_data; for(var i=0;i<$scope.mark_cert_data.length;i++) $scope.mark_cert_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 1a8f5337..8f30d8e0 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -6,6 +6,13 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.myModel = { "date": new Date(), @@ -97,6 +104,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -133,11 +142,13 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $http(response_data).then(function (response) { if (response.data.markcardList == true) { + $scope.isLoaderShow1 =false; $scope.markcard_data = response.data.markcard_data; for(var i=0;i<$scope.markcard_data.length;i++) $scope.markcard_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 4d1718f1..5d133168 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -7,6 +7,15 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc * auto call tracking */ $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; + $scope.myModel = { "date": new Date(), @@ -89,6 +98,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; + if(angular.isString($scope.univModel.university)) { $scope.filterUniv = angular.fromJson($scope.univModel.university); } @@ -114,6 +125,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc //alert($scope.batch.name); $scope.study_mat_data = ''; $scope.message = ''; + $scope.message1 =''; var response_data = { method: 'POST', url: apiPoint.url + 'report_status/', @@ -131,11 +143,15 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $http(response_data).then(function (response) { if (response.data.statusList == true) { $scope.study_mat_data = response.data.statusr; + $scope.isLoaderShow1 =false; for(var i=0;i<$scope.study_mat_data.length;i++) $scope.study_mat_data[i].SL_NO = i+1; + } else { $scope.message = response.data.message; + $scope.isLoaderShow1 =false; + } }); diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index c50aed02..d265f21e 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -13,6 +13,14 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S }; + + $scope.isTblShow = false; +$scope.isLoader = false; +$scope.isLoaderShow = false; +$scope.isLoaderShow1 =false; +$scope.isLoaderTxt = "Loading..."; +$scope.generateButtonTxt = "GENERATE"; +$scope.generateButtonStatus = false; $scope.filters = function () { var filterlist = { @@ -64,6 +72,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S }); $scope.show = false; $scope.onSubmit = function (form) { + $scope.isLoaderShow1 =true; var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -102,10 +111,12 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S $http(response_data).then(function (response) { if (response.data.wav_refList == true) { + $scope.isLoaderShow1 =false; $scope.waiver_referal_data = response.data.wav_ref_data; for(var i=0;i<$scope.waiver_referal_data.length;i++) $scope.waiver_referal_data[i].SL_NO = i+1; } else { + $scope.isLoaderShow1 =false; $scope.message = response.data.message; } diff --git a/Apollo/assets/views/feecollected.html b/Apollo/assets/views/feecollected.html index f47f4ab7..e1ca0eec 100644 --- a/Apollo/assets/views/feecollected.html +++ b/Apollo/assets/views/feecollected.html @@ -153,6 +153,11 @@ +
+
+

{{isLoaderTxt}}

+
+
diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html index a1f595c0..123730e7 100644 --- a/Apollo/assets/views/newreg_report.html +++ b/Apollo/assets/views/newreg_report.html @@ -153,6 +153,11 @@
+
+
+

{{isLoaderTxt}}

+
+
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index dc8127d7..7919e7fa 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -134,6 +134,11 @@ td,th { +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index af216168..9109e3cc 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -142,6 +142,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_application_pending_oldData.html b/Apollo/assets/views/report_application_pending_oldData.html index 007b653f..9a52c0d0 100644 --- a/Apollo/assets/views/report_application_pending_oldData.html +++ b/Apollo/assets/views/report_application_pending_oldData.html @@ -131,6 +131,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 2c662dc3..8a3be074 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -72,6 +72,8 @@ + +
@@ -93,6 +95,11 @@
+ + + + +
@@ -261,6 +268,11 @@
+
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index f0d557ad..1c903fb6 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -173,6 +173,11 @@ td,th { +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index 1ba726f1..c16fa2d6 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -134,6 +134,11 @@ td,th { +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index b3819216..cb3ab087 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -150,6 +150,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index 169b4c45..7d63128a 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -143,6 +143,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html index 2ae4dcc9..d37e9b07 100644 --- a/Apollo/assets/views/report_lead.html +++ b/Apollo/assets/views/report_lead.html @@ -202,6 +202,11 @@ td,th { +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index a9de64fd..7399ae6e 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -177,6 +177,11 @@ td,th { +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index d4b26f2a..af11ce1a 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -136,6 +136,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 09f46ce0..3cab7faa 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -68,6 +68,7 @@ +
@@ -78,6 +79,8 @@
+ +
@@ -123,7 +126,15 @@
+ +
+
+

{{isLoaderTxt}}

+
+

{{message}}

+ +
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 7c97dc75..831ee7ae 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -152,6 +152,11 @@ +
+
+

{{isLoaderTxt}}

+
+

{{message}}