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

total amount

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-02 12:05:21 +05:30
parent abd5049db0
commit 6b1a0765d7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollo/assets/js/controllers/income_reportCtrl.js
View File

@ -79,7 +79,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
if (response.data.status == '200') { if (response.data.status == '200') {
$scope.expense_data = response.data.expense_data; $scope.expense_data = response.data.expense_data;
//console.log($scope.expense_data) console.log($scope.expense_data)
} else { } else {
@ -248,22 +248,22 @@ var Total_exp = 0;
{ {
//Total_inc === incomeexpenselist[1].Total //Total_inc === incomeexpenselist[1].Total
if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null)
{ {
Total_exp=0; Total_exp=0;
} }
else 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; Total_inc=0;
} }
else else
{ {
Total_inc = incomeexpenselist[0].Total; Total_inc = incomeexpenselist[1].Total;
} }
//console.log(incomeexpenselist[1]); //console.log(incomeexpenselist[1]);

2
Apollo/assets/views/income_expense_report.html
View File

@ -214,7 +214,7 @@
<label style="color: black; font-size: 17px">Net Profit/Loss</label></b> <label style="color: black; font-size: 17px">Net Profit/Loss</label></b>
</div> </div>
<div class="col-md-offset-10" style="color: black; font-size: 17px"><b> <div class="col-md-offset-10" style="color: black; font-size: 17px"><b>
{{expense_data[0].Total - expense_data[1].Total}} {{expense_data[1].Total - expense_data[0].Total}}
</b></div> </b></div>