diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css index 12d7dff..34494c2 100644 --- a/src/main/resources/static/css/app.css +++ b/src/main/resources/static/css/app.css @@ -10,12 +10,18 @@ label { color: #eee; } +.userLabel { + font-family: "Open Sans", sans-serif; + color: white; +} + .modal-body label { color: #aaa; } -.userLabel { - color: white; +.modal-body .userLabel { + font-family: "Open Sans", sans-serif; + color: #303030; } .row-margin { diff --git a/src/main/resources/static/js/controllers.js b/src/main/resources/static/js/controllers.js index ca5a5bf..6cbdae9 100644 --- a/src/main/resources/static/js/controllers.js +++ b/src/main/resources/static/js/controllers.js @@ -253,8 +253,8 @@ transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$resource', ' transaction = Transaction.get({ id: transactionId }); 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.category = $resource(transaction._links.category.href).get(); transaction.category.$promise.then(function(data) { $scope.transaction = transaction; @@ -266,6 +266,15 @@ transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$resource', ' break; } } + + // FIXME can't wait for the promise since most transactions return HTTP 404 for the creditor + if (transaction.creditor.name != undefined) { + $scope.transaction.creditor = $scope.transaction.creditor._links.user.href; + console.log('creditor: ' + transaction.creditor.name); + } + else { + $scope.transaction.creditor = ""; + } }); }); diff --git a/src/main/resources/static/partials/transaction-list.html b/src/main/resources/static/partials/transaction-list.html index 5084e80..d281ae5 100644 --- a/src/main/resources/static/partials/transaction-list.html +++ b/src/main/resources/static/partials/transaction-list.html @@ -170,7 +170,7 @@ -
{{transaction | json}}
+
{{transaction | json}}