diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py index dbe59c89755ebfbd79ab86a4745f60600d025fb0..aa2f4205482e22a79c4da5591e8c5bebe21ab71e 100644 --- a/src/cutecoin/core/account.py +++ b/src/cutecoin/core/account.py @@ -22,7 +22,7 @@ from ..tools.exceptions import NoPeerAvailable, ContactAlreadyExists def quantitative(units, community): - return units + return int(units) def relative(units, community): diff --git a/src/cutecoin/core/community.py b/src/cutecoin/core/community.py index 9cb2c1d9d0fb45f80f3030cfab469a2da6782afa..b1b1a9f98415482cee98ed1f54415b336510c64f 100644 --- a/src/cutecoin/core/community.py +++ b/src/cutecoin/core/community.py @@ -132,7 +132,7 @@ class Community(object): vowels = ('a', 'e', 'i', 'o', 'u', 'y') shortened = self.currency shortened = ''.join([c for c in shortened if c not in vowels]) - return shortened + return shortened.upper() @property def currency_symbol(self): diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py index 855c7b40920848e96fcea0a15c6503b7cc6043a8..969edad4ecf26af1f79899aa2f11703b919c2284 100644 --- a/src/cutecoin/models/txhistory.py +++ b/src/cutecoin/models/txhistory.py @@ -74,18 +74,19 @@ class TxFilterProxyModel(QSortFilterProxyModel): if source_index.column() == self.sourceModel().columns.index('Date'): date = QDateTime.fromTime_t(source_data) return date.date() - if source_index.column() == self.sourceModel().columns.index('Payment'): + if source_index.column() == self.sourceModel().columns.index('Payment') or \ + source_index.column() == self.sourceModel().columns.index('Deposit'): if source_data is not "": 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_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 type(amount_ref) is int: + formatter = "{0} {1}" + else: + formatter = "{0:.2f} {1}" + + return formatter.format(amount_ref, ref_name) if role == Qt.FontRole: font = QFont() @@ -152,10 +153,7 @@ class HistoryTableModel(QAbstractTableModel): date_ts = transfer.metadata['time'] - amount_ref = self.account.units_to_ref(amount, self.community) - ref_name = self.account.ref_name(self.community.short_currency) - - return (date_ts, sender, "", amount, "{0:.2f} {1}".format(amount_ref, ref_name), + return (date_ts, sender, "", amount, comment, transfer.state) def data_sent(self, transfer):