Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

date filter alert

Browse Source
This commit is contained in:
sriramv 2018-12-07 11:17:28 +05:30
parent 66b535343a
commit e63d128540
12 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/assets/js/controllers/FeeCollected_reportCtrl.js
View File

@ -25,6 +25,8 @@ $scope.isTblShow = false;
$scope.isLoader = false; $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderShow2 =false;
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $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) { $http(getstudentdetails).then(function (response) {
if(response.data.status == 200 && response.data.searchst==true) if(response.data.status == 200 && response.data.searchst==true)

9
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -24,7 +24,9 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.isLoader = false; $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderShow2 =false;
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $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) { $http(getstudentdetails).then(function (response) {

7
Apollo/assets/js/controllers/report_certificateCtrl.js
View File

@ -11,6 +11,7 @@ $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $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) { $http(response_data).then(function (response) {
if (response.data.certList == true) { if (response.data.certList == true) {

6
Apollo/assets/js/controllers/report_expenseCtrl.js
View File

@ -22,6 +22,7 @@ $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $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) { $http(response_data).then(function (response) {
if (response.data.expenseList == true) { if (response.data.expenseList == true) {
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;

8
Apollo/assets/js/controllers/report_leadCtrl.js
View File

@ -12,6 +12,7 @@ $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $scope.generateButtonStatus = false;
$scope.myModel = { $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.filtersList.univ);
console.log($scope.filterActivity.activityID); console.log($scope.filterActivity.activityID);
console.log($scope.filtersList.status); console.log($scope.filtersList.status);

7
Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
View File

@ -12,6 +12,7 @@ $scope.isLoader = false;
$scope.isLoaderShow = false; $scope.isLoaderShow = false;
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt = "Loading...";
$scope.isLoaderTxt1 ="Selected Date Range is wrong";
$scope.generateButtonTxt = "GENERATE"; $scope.generateButtonTxt = "GENERATE";
$scope.generateButtonStatus = false; $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) { $http(response_data).then(function (response) {
if (response.data.mark_certList == true) { if (response.data.mark_certList == true) {

5
Apollo/assets/views/feecollected.html
View File

@ -153,6 +153,11 @@
<!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> --> <!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
</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="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>

8
Apollo/assets/views/newreg_report.html
View File

@ -44,6 +44,8 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle">New Registration Report</h1> <h1 class="mainTitle">New Registration Report</h1>
@ -153,6 +155,12 @@
<!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> --> <!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
</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="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>

6
Apollo/assets/views/report_certificate_status.html
View File

@ -173,6 +173,12 @@ td,th {
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="col-md-12" ng-if="isLoaderShow">
<center> <h3>{{isLoaderTxt1}}</h3> </center>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>

5
Apollo/assets/views/report_expense.html
View File

@ -143,6 +143,11 @@
</tfoot> </tfoot>
</table> </table>
<div class="row">
<div class="col-md-12" ng-if="isLoaderShow">
<center> <h3>{{isLoaderTxt1}}</h3> </center>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>

5
Apollo/assets/views/report_lead.html
View File

@ -202,6 +202,11 @@ td,th {
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="col-md-12" ng-if="isLoaderShow">
<center> <h3>{{isLoaderTxt1}}</h3> </center>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>

5
Apollo/assets/views/report_mark_certificate_status.html
View File

@ -177,6 +177,11 @@ td,th {
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="col-md-12" ng-if="isLoaderShow">
<center> <h3>{{isLoaderTxt1}}</h3> </center>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12" ng-if="isLoaderShow1"> <div class="col-md-12" ng-if="isLoaderShow1">
<center> <h1>{{isLoaderTxt}}</h1> </center> <center> <h1>{{isLoaderTxt}}</h1> </center>