From 6404a1ee4fbae44f1171121543b54f59e098c9e4 Mon Sep 17 00:00:00 2001 From: Tilman Liero Date: Fri, 29 Apr 2016 22:50:49 +0200 Subject: [PATCH] transaction details (using code copied from TransactionListCtrl) --- src/main/resources/static/js/controllers.js | 57 ++++++++++++++++--- .../static/partials/transaction-details.html | 43 ++++++++++++++ 2 files changed, 93 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/js/controllers.js b/src/main/resources/static/js/controllers.js index 5202ff7..78e7614 100644 --- a/src/main/resources/static/js/controllers.js +++ b/src/main/resources/static/js/controllers.js @@ -211,14 +211,55 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location' } ]); transactionControllers.controller('TransactionDetailCtrl', [ '$scope', '$routeParams', '$resource', '$location', function($scope, $routeParams, $resource, $location) { - var transaction = $resource($routeParams.transactionURI).get(); - transaction.$promise.then(function(data) { - transaction.category = $resource(transaction._links.category.href).get(); - transaction.creditor = $resource(transaction._links.creditor.href).get(); - transaction.account = $resource(transaction._links.account.href).get(); - }); - $scope.transaction = transaction; + $scope.initDetails = function() { + console.log('initDetails()'); + + var transaction = $resource($routeParams.transactionURI).get(); + transaction.$promise.then(function(data) { + transaction.date = new Date(transaction.date); + transaction.category = $resource(transaction._links.category.href).get(); + transaction.creditor = $resource(transaction._links.creditor.href).get(); + transaction.account = $resource(transaction._links.account.href).get(); + + }); + + $scope.transaction = transaction; + + // FIXME + // TODO The rest of this function is *copied code* from TransactionListCtrl and desperately needs to be moved into a service + + var userinfo = $resource('/user').get(); + userinfo.$promise.then(function(data) { + $scope.userid = userinfo.name; + + userinfo = $resource('/users/search/findByUsername', { username: $scope.userid }).get(); + userinfo.$promise.then(function(data) { + $scope.userinfo = userinfo; + }); + + var accountInfo = $resource('/accounts/search/findByUserName', { username: $scope.userid }).get(); + accountInfo.$promise.then(function(data) { + $scope.accounts = accountInfo._embedded.accounts; + $scope.account = $scope.accounts[0]; + + var categories = $resource('/categories/search/listForAccount', { accountId: $scope.accounts[0].id }).get(); + categories.$promise.then(function(data) { + $scope.categories = categories._embedded.categories; + + //$scope.categories.push({id: -1, name: '────────────────', position: 9999, disabled: true}); + $scope.categories.push({id: -1, name: 'private Entnahme', position: 10000, _links: { self: {href: 'withdrawal'}}}); + + // FIXME Code from TransactionListCtrl.refreshList() + var accountUsers = $resource($scope.account._links.users.href).get(); + accountUsers.$promise.then(function(data) { + $scope.accountUsers = accountUsers._embedded.users; + }); + }); + }); + }); + + } $scope.deleteTransaction = function(transaction) { /*console.log(angular.toJson(transaction, false));*/ @@ -228,6 +269,8 @@ transactionControllers.controller('TransactionDetailCtrl', [ '$scope', '$routePa $location.path('/'); }); } + + $scope.initDetails(); } ]); diff --git a/src/main/resources/static/partials/transaction-details.html b/src/main/resources/static/partials/transaction-details.html index 4d173ac..693384d 100644 --- a/src/main/resources/static/partials/transaction-details.html +++ b/src/main/resources/static/partials/transaction-details.html @@ -1,3 +1,44 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Betrag:
The value + is not valid!
Kategorie:
Datum:
Notiz:
Auslage: + + + + + +
+
+ + + +
Delete