anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix UI search transactions

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-02 14:29:34 -03:00
commit 9c024aebf6
5 changed files with 83 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/js/controllers/modals/search.js
View file

@ -1,10 +1,77 @@
'use strict';
angular.module('copayApp.controllers').controller('searchController', function($scope) {
var self = $scope.self;
$scope.search = '';
angular.module('copayApp.controllers').controller('searchController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) {
$scope.cancel = function() {
$scope.searchModal.hide();
var HISTORY_SHOW_LIMIT = 10;
var currentTxHistoryPage = 0;
var wallet;
var isCordova = platformInfo.isCordova;
$scope.txHistorySearchResults = [];
$scope.filteredTxHistory = [];
$scope.updateSearchInput = function(search) {
if (isCordova)
window.plugins.toast.hide();
currentTxHistoryPage = 0;
throttleSearch(search);
$ionicScrollDelegate.resize();
}
var throttleSearch = lodash.throttle(function(search) {
function filter(search) {
$scope.filteredTxHistory = [];
function computeSearchableString(tx) {
var addrbook = '';
if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || '';
var searchableDate = computeSearchableDate(new Date(tx.time * 1000));
var message = tx.message ? tx.message : '';
var comment = tx.note ? tx.note.body : '';
var addressTo = tx.addressTo ? tx.addressTo : '';
return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment).toString()).toLowerCase();
}
function computeSearchableDate(date) {
var day = ('0' + date.getDate()).slice(-2).toString();
var month = ('0' + (date.getMonth() + 1)).slice(-2).toString();
var year = date.getFullYear();
return [month, day, year].join('/');
};
if (lodash.isEmpty(search)) {
$scope.txHistoryShowMore = false;
return [];
}
$scope.filteredTxHistory = lodash.filter($scope.completeTxHistory, function(tx) {
if (!tx.searcheableString) tx.searcheableString = computeSearchableString(tx);
return lodash.includes(tx.searcheableString, search.toLowerCase());
});
if ($scope.filteredTxHistory.length > HISTORY_SHOW_LIMIT) $scope.txHistoryShowMore = true;
else $scope.txHistoryShowMore = false;
return $scope.filteredTxHistory;
};
$scope.txHistorySearchResults = filter(search).slice(0, HISTORY_SHOW_LIMIT);
if (isCordova)
window.plugins.toast.showShortBottom(gettextCatalog.getString('Matches: ' + $scope.filteredTxHistory.length));
$timeout(function() {
$rootScope.$apply();
});
}, 1000);
$scope.moreSearchResults = function() {
currentTxHistoryPage++;
$scope.showHistory();
$scope.$broadcast('scroll.infiniteScrollComplete');
};
$scope.showHistory = function() {
$scope.txHistorySearchResults = $scope.filteredTxHistory ? $scope.filteredTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT) : [];
$scope.txHistoryShowMore = $scope.filteredTxHistory.length > $scope.txHistorySearchResults.length;
};
});

88
src/js/controllers/search.js
View file

@ -1,88 +0,0 @@
'use strict';
angular.module('copayApp.controllers').controller('searchController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, $ionicScrollDelegate, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) {
var HISTORY_SHOW_LIMIT = 10;
var currentTxHistoryPage = 0;
var wallet;
var isCordova = platformInfo.isCordova;
$scope.txHistorySearchResults = [];
$scope.filteredTxHistory = [];
$scope.cancel = function() {
$scope.searchModal.hide();
};
$scope.cancelSearch = function() {
$scope.txHistorySearchResults = [];
$scope.filteredTxHistory = [];
$scope.search = '';
$scope.currentTxHistoryPage = 0;
$ionicScrollDelegate.resize();
}
$scope.updateSearchInput = function(search) {
if (isCordova)
window.plugins.toast.hide();
throttleSearch(search);
$ionicScrollDelegate.resize();
}
var throttleSearch = lodash.throttle(function(search) {
function filter(search) {
$scope.filteredTxHistory = [];
function computeSearchableString(tx) {
var addrbook = '';
if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || '';
var searchableDate = computeSearchableDate(new Date(tx.time * 1000));
var message = tx.message ? tx.message : '';
var comment = tx.note ? tx.note.body : '';
var addressTo = tx.addressTo ? tx.addressTo : '';
return ((tx.amountStr + message + addressTo + addrbook + searchableDate + comment).toString()).toLowerCase();
}
function computeSearchableDate(date) {
var day = ('0' + date.getDate()).slice(-2).toString();
var month = ('0' + (date.getMonth() + 1)).slice(-2).toString();
var year = date.getFullYear();
return [month, day, year].join('/');
};
if (lodash.isEmpty(search)) {
$scope.txHistoryShowMore = false;
return [];
}
$scope.filteredTxHistory = lodash.filter($scope.completeTxHistory, function(tx) {
if (!tx.searcheableString) tx.searcheableString = computeSearchableString(tx);
return lodash.includes(tx.searcheableString, search.toLowerCase());
});
if ($scope.filteredTxHistory.length > HISTORY_SHOW_LIMIT) $scope.txHistoryShowMore = true;
else $scope.txHistoryShowMore = false;
return $scope.filteredTxHistory;
};
$scope.txHistorySearchResults = filter(search).slice(0, HISTORY_SHOW_LIMIT);
if (isCordova)
window.plugins.toast.showShortBottom(gettextCatalog.getString('Matches: ' + $scope.filteredTxHistory.length));
$timeout(function() {
$rootScope.$apply();
});
}, 1000);
$scope.moreSearchResults = function() {
currentTxHistoryPage++;
$scope.showHistory();
$scope.$broadcast('scroll.infiniteScrollComplete');
};
$scope.showHistory = function() {
$scope.txHistorySearchResults = $scope.filteredTxHistory ? $scope.filteredTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT) : [];
$scope.txHistoryShowMore = $scope.filteredTxHistory.length > $scope.txHistorySearchResults.length;
};
});

5
src/js/controllers/walletDetails.js
View file

@ -77,6 +77,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.searchModal = modal;
$scope.searchModal.show();
});
$scope.close = function() {
$scope.searchModal.hide();
}
};
$scope.openTxModal = function(btx) {