From f093d98a93ed65d7d93ddb8d765717b237ab71a7 Mon Sep 17 00:00:00 2001 From: Ihor Brazhnichenko Date: Wed, 9 Nov 2022 09:26:39 +0200 Subject: [PATCH] #23 Replace account operations by operations-table --- app/sections/accounts/account.html | 38 +++--------- app/sections/accounts/accounts.controller.js | 63 -------------------- 2 files changed, 9 insertions(+), 92 deletions(-) diff --git a/app/sections/accounts/account.html b/app/sections/accounts/account.html index 847a165..6edf234 100644 --- a/app/sections/accounts/account.html +++ b/app/sections/accounts/account.html @@ -510,6 +510,7 @@

+

@@ -526,34 +527,13 @@

-
- - - -
-
-
-
-
-
    -
    -
    -
    -
    + + + diff --git a/app/sections/accounts/accounts.controller.js b/app/sections/accounts/accounts.controller.js index f86dd53..a2c3ba1 100644 --- a/app/sections/accounts/accounts.controller.js +++ b/app/sections/accounts/accounts.controller.js @@ -77,69 +77,6 @@ import {sha256} from "js-sha256"; $scope.account = new_account; } - $scope.operationsColumns = [ - { - title: $filter('translate')('Operation'), - index: 'operation_text', - }, - { - title: $filter('translate')('ID'), - index: 'operation_id', - }, - { - title: $filter('translate')('Date and time'), - index: 'time', - hidden: ['xs'] - }, - { - title: $filter('translate')('Block'), - index: 'block_num', - hidden: ['xs', 'sm'] - }, - { - title: $filter('translate')('Type'), - index: 'type', - hidden: ['xs', 'sm', 'md'] - } - ]; - $scope.select = function(page_operations) { - const page = page_operations - 1; - const limit = 20; - const from = page * limit; - - $scope.operationsLoading = true; - $scope.operationsLoadingError = false; - accountService.getAccountHistory(fullAccount.account.id, limit, from, function (returnData) { - $scope.operationsLoading = false; - $scope.operations = returnData; - $scope.currentPage = page_operations; - if (page_operations == 1) { - let new_account = { - total_ops: 0 - }; - if (returnData.length > 0) { - new_account.total_ops = returnData[0].sequence; - } - if ($scope.account) { - $scope.account = Object.assign(new_account, $scope.account); - } else { - $scope.account = new_account; - } - } - }).catch(err => { - $scope.operationsLoadingError = true; - let new_account = { - total_ops: -1, - }; - if ($scope.account) { - $scope.account = Object.assign(new_account, $scope.account); - } else { - $scope.account = new_account; - } - throw err; - }); - } - $scope.select(1); // initial sort of fullAccount.balances by balance fullAccount.balances = $filter("orderBy")(fullAccount.balances, 'float_balance', true);