tilman/next-transactions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

about to remove Withdrawal entity

Browse Source
This commit is contained in:
Tilman Liero
2016-07-13 21:32:42 +02:00
parent dc99f7fc5b
commit 2c92dd00fe
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/js/controllers.js
+15 -5
View File
@@ -10,7 +10,7 @@ function amountToNumber(amount) {
function numberToAmount(number) {
var amount = number.toFixed(2).toString().replace('.', ',');
if (amount.charAt(0) !== '-') {
if (amount.charAt(0) !== '-' && amount !== '0,00') {
amount = "+" + amount;
}
return amount;
@@ -40,11 +40,15 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
$scope.accountUsers[i].expenses = new Array(data[i]._embedded.transactions.length);
var expenseSum = 0;
for (j = 0; j < data[i]._embedded.transactions.length; j++) {
$scope.accountUsers[i].expenses[j] = data[i]._embedded.transactions[j];
// XXX $scope.accountUsers[i].expenses[j].amount = numberToAmount(data[i]._embedded.transactions[j].amount);
$scope.accountUsers[i].expenses[j] = new Object();
$scope.accountUsers[i].expenses[j].date = data[i]._embedded.transactions[j].date;
$scope.accountUsers[i].expenses[j].category = data[i]._embedded.transactions[j].category.name;
$scope.accountUsers[i].expenses[j].amount = numberToAmount(data[i]._embedded.transactions[j].amount);
$scope.accountUsers[i].expenses[j].description = data[i]._embedded.transactions[j].description;
expenseSum = expenseSum + data[i]._embedded.transactions[j].amount;
}
$scope.accountUsers[i].outstandingSum -= expenseSum;
$scope.accountUsers[i].outstandingAmount = numberToAmount($scope.accountUsers[i].outstandingSum);
}
});
@@ -60,10 +64,13 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
$scope.accountUsers[i].withdrawals = new Array(data[i]._embedded.withdrawals.length);
var withdrawnSum = 0;
for (j = 0; j < data[i]._embedded.withdrawals.length; j++) {
$scope.accountUsers[i].withdrawals[j] = data[i]._embedded.withdrawals[j];
$scope.accountUsers[i].withdrawals[j] = new Object();
$scope.accountUsers[i].withdrawals[j].date = data[i]._embedded.withdrawals[j].date;
$scope.accountUsers[i].withdrawals[j].amount = numberToAmount(data[i]._embedded.withdrawals[j].amount);
withdrawnSum = withdrawnSum + data[i]._embedded.withdrawals[j].amount;
}
$scope.accountUsers[i].outstandingSum -= withdrawnSum;
$scope.accountUsers[i].outstandingAmount = numberToAmount($scope.accountUsers[i].outstandingSum);
}
});
});
@@ -356,7 +363,6 @@ transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$resource', '
transactionControllers.controller('ExpensesModalCtrl', [ '$scope', '$uibModalInstance', 'accountUser', function($scope, $uibModalInstance, accountUser) {
$scope.accountUser = accountUser;
console.log($scope.accountUser);
$scope.ok = function () {
$uibModalInstance.close();
@@ -365,4 +371,8 @@ transactionControllers.controller('ExpensesModalCtrl', [ '$scope', '$uibModalIns
$scope.close = function () {
$uibModalInstance.dismiss('close');
};
$scope.clearOutstandings = function() {
// TODO
}
} ]);