diff --git a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js index 601ec79a..532b7061 100644 --- a/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js +++ b/Apollo/assets/js/controllers/FeeCollected_reportCtrl.js @@ -25,6 +25,8 @@ $scope.isTblShow = false; $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; +$scope.isLoaderShow2 =false; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; @@ -183,6 +185,12 @@ $scope.tod = to_dt; } } + + if($scope.filters.from_date > $scope.filters.to_date){ + $scope.isLoaderShow2 =true; + }else{ + $scope.isLoaderShow2 =false; + } $http(getstudentdetails).then(function (response) { if(response.data.status == 200 && response.data.searchst==true) diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 315f8d78..1740e9c9 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -24,7 +24,9 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; +$scope.isLoaderShow2 =false; $scope.isLoaderTxt = "Loading..."; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; @@ -164,6 +166,13 @@ $scope.tod = to_dt; } } + + + if($scope.filters.from_date > $scope.filters.to_date){ + $scope.isLoaderShow2 =true; + }else{ + $scope.isLoaderShow2 =false; + } $http(getstudentdetails).then(function (response) { diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index f9ceb380..4d71a22c 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -11,6 +11,7 @@ $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; @@ -142,6 +143,12 @@ $scope.generateButtonStatus = false; } }; + + if($scope.univModel.from_date > $scope.univModel.to_date){ + $scope.isLoaderShow =true; + }else{ + $scope.isLoaderShow =false; + } $http(response_data).then(function (response) { if (response.data.certList == true) { diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index 973be18c..48c4673e 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -22,6 +22,7 @@ $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; @@ -116,6 +117,11 @@ $scope.generateButtonStatus = false; }; + if($scope.filters.from_date > $scope.filters.to_date){ + $scope.isLoaderShow =true; + }else{ + $scope.isLoaderShow =false; + } $http(response_data).then(function (response) { if (response.data.expenseList == true) { $scope.isLoaderShow1 =false; diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index 61c76836..c52ee6be 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -12,6 +12,7 @@ $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; $scope.myModel = { @@ -162,6 +163,13 @@ $scope.generateButtonStatus = false; } }; + + if($scope.filters.from_date > $scope.filters.to_date){ + $scope.isLoaderShow =true; + }else{ + $scope.isLoaderShow =false; + } + console.log($scope.filtersList.univ); console.log($scope.filterActivity.activityID); console.log($scope.filtersList.status); diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 90a89680..6b29f02f 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -12,6 +12,7 @@ $scope.isLoader = false; $scope.isLoaderShow = false; $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; +$scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; @@ -152,6 +153,12 @@ $scope.generateButtonStatus = false; } }; + + if($scope.univModel.from_date > $scope.univModel.to_date){ + $scope.isLoaderShow =true; + }else{ + $scope.isLoaderShow =false; + } $http(response_data).then(function (response) { if (response.data.mark_certList == true) { diff --git a/Apollo/assets/views/feecollected.html b/Apollo/assets/views/feecollected.html index e1ca0eec..b4bd7b8d 100644 --- a/Apollo/assets/views/feecollected.html +++ b/Apollo/assets/views/feecollected.html @@ -153,6 +153,11 @@ +