diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index bd7831c9..6391ca73 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -79,7 +79,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", if (response.data.status == '200') { $scope.expense_data = response.data.expense_data; - //console.log($scope.expense_data) + console.log($scope.expense_data) } else { @@ -248,22 +248,22 @@ var Total_exp = 0; { //Total_inc === incomeexpenselist[1].Total - if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) + if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null) { Total_exp=0; } else { - Total_exp = incomeexpenselist[1].Total; + Total_exp = incomeexpenselist[0].Total; } - if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null) + if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) { Total_inc=0; } else { - Total_inc = incomeexpenselist[0].Total; + Total_inc = incomeexpenselist[1].Total; } //console.log(incomeexpenselist[1]); diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 92c59f15..f46ede82 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -214,7 +214,7 @@
- {{expense_data[0].Total - expense_data[1].Total}} + {{expense_data[1].Total - expense_data[0].Total}}