From 0a9a225e40e02b9b21e8f576a24e13ea6ae76064 Mon Sep 17 00:00:00 2001 From: Tilman Liero Date: Wed, 6 Jul 2016 22:18:17 +0200 Subject: [PATCH] modal instead of partial for transaction details --- src/main/resources/static/js/app.js | 3 - src/main/resources/static/js/controllers.js | 23 ++----- .../static/partials/transaction-details.html | 63 ------------------- .../static/partials/transaction-list.html | 12 +--- 4 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 src/main/resources/static/partials/transaction-details.html diff --git a/src/main/resources/static/js/app.js b/src/main/resources/static/js/app.js index af1c908..3dde252 100644 --- a/src/main/resources/static/js/app.js +++ b/src/main/resources/static/js/app.js @@ -4,9 +4,6 @@ transactionsApp.config([ '$routeProvider', function($routeProvider) { $routeProvider.when('/list', { templateUrl : 'partials/transaction-list.html', controller : 'TransactionListCtrl' - }).when('/transaction/:transactionURI*', { - templateUrl : 'partials/transaction-details.html', - controller : 'TransactionDetailCtrl' }).otherwise({ redirectTo : '/list' }); diff --git a/src/main/resources/static/js/controllers.js b/src/main/resources/static/js/controllers.js index ee48014..eabfb87 100644 --- a/src/main/resources/static/js/controllers.js +++ b/src/main/resources/static/js/controllers.js @@ -201,10 +201,6 @@ transactionControllers.controller('TransactionListCtrl', [ '$http', '$scope', '$ }); }; - $scope.showTransaction = function(transaction) { - $location.path('/transaction/' + transaction._links.self.href); - }; - $scope.moreTransactions = function() { if ($scope.nextPageAvailable) { $scope.pageNumber++; @@ -229,20 +225,16 @@ transactionControllers.controller('TransactionListCtrl', [ '$http', '$scope', '$ }); }; - $scope.items = ['item1', 'item2', 'item3']; - - $scope.openDetails = function() { + $scope.openDetails = function(transaction) { var modalInstance = $uibModal.open({ templateUrl: 'detailsTemplate.html', controller: 'DetailsModalCtrl', resolve: { - items: function () { - return $scope.items; - } + transaction: transaction } }); - modalInstance.result.then(function (selectedItem) { + modalInstance.result.then(function(selectedItem) { $scope.selected = selectedItem; }, function () { $log.info('Modal dismissed at: ' + new Date()); @@ -254,12 +246,9 @@ transactionControllers.controller('TransactionListCtrl', [ '$http', '$scope', '$ } ]); -transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$uibModalInstance', 'items', function($scope, $uibModalInstance, items) { +transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$uibModalInstance', 'transaction', function($scope, $uibModalInstance, transaction) { - $scope.items = items; - $scope.selected = { - item: $scope.items[0] - }; + $scope.transaction = transaction; $scope.ok = function () { $uibModalInstance.close($scope.selected.item); @@ -272,7 +261,7 @@ transactionControllers.controller('DetailsModalCtrl', [ '$scope', '$uibModalInst - +// TODO to be removed transactionControllers.controller('TransactionDetailCtrl', [ '$scope', '$routeParams', '$resource', '$location', function($scope, $routeParams, $resource, $location) { $scope.initDetails = function() { diff --git a/src/main/resources/static/partials/transaction-details.html b/src/main/resources/static/partials/transaction-details.html deleted file mode 100644 index 693384d..0000000 --- a/src/main/resources/static/partials/transaction-details.html +++ /dev/null @@ -1,63 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Betrag:
The value - is not valid!
Kategorie:
Datum:
Notiz:
Auslage: - - - - - -
-
- - - - - -
- Delete -
\ No newline at end of file diff --git a/src/main/resources/static/partials/transaction-list.html b/src/main/resources/static/partials/transaction-list.html index 413838e..5ae5115 100644 --- a/src/main/resources/static/partials/transaction-list.html +++ b/src/main/resources/static/partials/transaction-list.html @@ -88,7 +88,7 @@ Betrag Beschreibung - + {{transaction.date | date:'dd.MM.yyyy'}} {{transaction.category.name}} {{transaction.amount | number : 2}} € @@ -104,12 +104,7 @@ - - - - -
Selection from a modal: {{ selected }}
- + - -