From e63d1285402c27d0b2587f2b24e5c2a690789288 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Fri, 7 Dec 2018 11:17:28 +0530
Subject: [PATCH] date filter alert

---
 Apollo/assets/js/controllers/FeeCollected_reportCtrl.js  | 8 ++++++++
 Apollo/assets/js/controllers/newreg_reportCtrl.js        | 9 +++++++++
 Apollo/assets/js/controllers/report_certificateCtrl.js   | 7 +++++++
 Apollo/assets/js/controllers/report_expenseCtrl.js       | 6 ++++++
 Apollo/assets/js/controllers/report_leadCtrl.js          | 8 ++++++++
 .../js/controllers/report_markcard_certificateCtrl.js    | 7 +++++++
 Apollo/assets/views/feecollected.html                    | 5 +++++
 Apollo/assets/views/newreg_report.html                   | 8 ++++++++
 Apollo/assets/views/report_certificate_status.html       | 6 ++++++
 Apollo/assets/views/report_expense.html                  | 5 +++++
 Apollo/assets/views/report_lead.html                     | 5 +++++
 Apollo/assets/views/report_mark_certificate_status.html  | 5 +++++
 12 files changed, 79 insertions(+)

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 @@
                 <!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
             
         </div>
+		<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow2">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 		<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>
diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html
index 123730e7..d6792949 100644
--- a/Apollo/assets/views/newreg_report.html
+++ b/Apollo/assets/views/newreg_report.html
@@ -44,6 +44,8 @@
 
 
 <section id="page-title">
+
+
     <div class="row">
         <div class="col-sm-8">
             <h1 class="mainTitle">New Registration Report</h1>
@@ -153,6 +155,12 @@
                 <!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
             
         </div>
+		
+		<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow2">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 		<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 1c903fb6..0ed43d67 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -173,6 +173,12 @@ td,th {
                 </tbody>
 
             </table>
+			
+			<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 			<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>
diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html
index 7d63128a..64a77399 100755
--- a/Apollo/assets/views/report_expense.html
+++ b/Apollo/assets/views/report_expense.html
@@ -143,6 +143,11 @@
                 </tfoot>
 
             </table>
+			<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 			<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>
diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html
index d37e9b07..6c5466ae 100644
--- a/Apollo/assets/views/report_lead.html
+++ b/Apollo/assets/views/report_lead.html
@@ -202,6 +202,11 @@ td,th {
                 </tbody>
 
             </table>
+			<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 			<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 7399ae6e..a011cdb1 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 {
                 </tbody>
 
             </table>
+			<div class="row">
+				<div class="col-md-12" ng-if="isLoaderShow">
+					<center> <h3>{{isLoaderTxt1}}</h3> </center>
+				</div>
+			</div>
 			<div class="row">
 				<div class="col-md-12" ng-if="isLoaderShow1">
 					<center> <h1>{{isLoaderTxt}}</h1> </center>