diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 4913c900..4aa97460 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -61,6 +61,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.Subtypes = ''; $scope.Total_expense = ''; $scope.Total_income = ''; + $scope.load = ''; + $scope.isLoaderShow = ''; var response_data = { @@ -84,6 +86,17 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.expense_data = response.data.expense_data; + if($scope.expense_data.length>0) + { + $scope.isLoaderShow =false; + $scope.load = 'Loading....'; + } + else + { + $scope.isLoaderShow = true; + $scope.load = "No Records Found"; + } + console.log($scope.expense_data); if(($scope.expense_data.length)==2) { @@ -132,6 +145,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", } else { $scope.message = response.data.message; + } }); diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index ab9c2bb7..9c2db54a 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -134,8 +134,13 @@
+
+

{{load}}

+
+ +
- +
@@ -226,9 +231,9 @@
-
+