Skip to content
Snippets Groups Projects
Commit 85654bf5 authored by inso's avatar inso
Browse files

Fixed issue #60

parent 12e835b7
No related branches found
No related tags found
No related merge requests found
......@@ -51,10 +51,12 @@ class Account(object):
Each account has only one key, and a key can
be locally referenced by only one account.
'''
referentials = {'Units': (quantitative, '{0}'),
'UD': (relative, 'ud {0}'),
'Quant Z-sum': (quantitative_zerosum, 'q0 {0}'),
'Relat Z-sum': (relative_zerosum, 'r0 {0}')
referentials = {'Units': (quantitative, '{0}', quantitative, '{0}'),
'UD': (relative, 'ud {0}', relative, 'ud {0}'),
'Quant Z-sum': (quantitative_zerosum, 'q0 {0}',
quantitative, '{0}'),
'Relat Z-sum': (relative_zerosum, 'r0 {0}',
relative, 'ud {0}')
}
def __init__(self, salt, pubkey, name, communities, wallets, contacts,
......@@ -143,9 +145,16 @@ class Account(object):
def units_to_ref(self):
return Account.referentials[self.referential][0]
@property
def units_to_diff_ref(self):
return Account.referentials[self.referential][2]
def ref_name(self, currency):
return Account.referentials[self.referential][1].format(currency)
def diff_ref_name(self, currency):
return Account.referentials[self.referential][3].format(currency)
def set_walletpool_size(self, size, password):
logging.debug("Defining wallet pool size")
if len(self.wallets) < size:
......
......@@ -72,13 +72,15 @@ class TxFilterProxyModel(QSortFilterProxyModel):
return date.date()
if source_index.column() == self.sourceModel().columns.index('Payment'):
if source_data is not "":
amount_ref = self.account.units_to_ref(source_data, self.community)
ref_name = self.account.ref_name(self.community.short_currency)
amount_ref = self.account.units_to_diff_ref(source_data,
self.community)
ref_name = self.account.diff_ref_name(self.community.short_currency)
return "{0:.2f} {1}".format(amount_ref, ref_name)
if source_index.column() == self.sourceModel().columns.index('Deposit'):
if source_data is not "":
amount_ref = self.account.units_to_ref(source_data, self.community)
ref_name = self.account.ref_name(self.community.short_currency)
amount_ref = self.account.units_to_diff_ref(source_data,
self.community)
ref_name = self.account.diff_ref_name(self.community.short_currency)
return "{0:.2f} {1}".format(amount_ref, ref_name)
if role == Qt.FontRole:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment