From 2c92dd00fe564e90130060826eb5573e988a08a9 Mon Sep 17 00:00:00 2001 From: Tilman Liero Date: Wed, 13 Jul 2016 21:32:42 +0200 Subject: [PATCH] about to remove Withdrawal entity --- src/main/resources/data-h2.sql | 4 ++-- src/main/resources/static/css/app.css | 17 --------------- src/main/resources/static/js/controllers.js | 20 +++++++++++++----- .../static/partials/transaction-list.html | 21 +++++++++++++------ 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/main/resources/data-h2.sql b/src/main/resources/data-h2.sql index 6e57c95..7f96524 100644 --- a/src/main/resources/data-h2.sql +++ b/src/main/resources/data-h2.sql @@ -1,4 +1,4 @@ -INSERT INTO User (id, name, username) VALUES (1, 'Adam', 'adam@mail.com'), (2, 'Betty', 'betty@mail.com'); +INSERT INTO User (id, name, username) VALUES (1, 'Adam', 'adam@mail.com'), (2, 'Betty', 'betty@mail.com'), (3, 'Curt', 'curt@mail.com'); INSERT INTO Account (id, name, owner_id) VALUES (1, 'Gemeinschaftskonto', 1), (2, 'Konto Adam', 1); INSERT INTO Withdrawal(id, account_id, amount, user_id, date) VALUES (1, 1, 20.00, 2, '2016-04-12 18:20:15'); @@ -6,7 +6,7 @@ INSERT INTO Withdrawal(id, account_id, amount, user_id, date) VALUES (2, 1, 10.0 INSERT INTO Category (id, name, account_id, position) VALUES (1, 'Essen - Lebensmittel', 1, 2), (2, 'Einnahmen - Gehalt', 1, 1), (3, 'Essen - Arbeit', 1, 3), (4, 'Einnahmen - Gehalt', 2, 1), (5, 'Technik - Server und Hosting', 2, 2); -INSERT INTO Account_User (account_id, user_id) VALUES (1, 1), (1, 2), (2, 1); +INSERT INTO Account_User (account_id, user_id) VALUES (1, 1), (1, 2), (1, 3), (2, 1); INSERT INTO Transaction (id, amount, account_id, category_id, date, description, creditor_id) VALUES (NULL, 1280.81, 1, 2, '2016-04-01 14:14:14', 'Gehalt', null), diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css index a0ea5d8..dc5725b 100644 --- a/src/main/resources/static/css/app.css +++ b/src/main/resources/static/css/app.css @@ -52,23 +52,6 @@ label { background-color: #D9DBC9; } -/* -.creditor-1 { background-color: #8dcfe3; } -.creditor-2 { background-color: #b3e0e6; } -.creditor-3 { background-color: #e4f3ef; } -.creditor-4 { background-color: #accdb9; } -.creditor-5 { background-color: #c8d5b9; } -.creditor-6 { background-color: #d9d0b2; } -*/ -/* -.creditor-1 { background-color: #4a98b0; } -.creditor-2 { background-color: #67aab3; } -.creditor-3 { background-color: #8ec0b5; } -.creditor-4 { background-color: #accdb9; } -.creditor-5 { background-color: #c8d5b9; } -.creditor-6 { background-color: #d9d0b2; } -*/ - .creditor-1 { background-color: #a4d4e3; } .creditor-2 { background-color: #cfe6e1; } .creditor-3 { background-color: #a4d4e3; } diff --git a/src/main/resources/static/js/controllers.js b/src/main/resources/static/js/controllers.js index 51956c2..c37f72f 100644 --- a/src/main/resources/static/js/controllers.js +++ b/src/main/resources/static/js/controllers.js @@ -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 + } } ]); diff --git a/src/main/resources/static/partials/transaction-list.html b/src/main/resources/static/partials/transaction-list.html index c7d9860..73e9e63 100644 --- a/src/main/resources/static/partials/transaction-list.html +++ b/src/main/resources/static/partials/transaction-list.html @@ -100,7 +100,7 @@
- {{user.name}} {{user.outstandingSum | number : 2}} €
 + {{user.name}} {{user.outstandingAmount}} €
@@ -178,10 +178,10 @@