LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-06 02:29:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #3963

Browse source
This commit is contained in:
ThomasV 2018-02-27 16:00:56 +01:00
parent 51630416fc
commit a3554dc2b7
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gui/qt/history_list.py
View file

@ -143,18 +143,16 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
h = self.summary h = self.summary
start_date = h.get('start_date') start_date = h.get('start_date')
end_date = h.get('end_date') end_date = h.get('end_date')
if start_date is None or end_date is None:
self.parent.show_message(_("Nothing to summarize."))
return
format_amount = lambda x: self.parent.format_amount(x.value) + ' ' + self.parent.base_unit() format_amount = lambda x: self.parent.format_amount(x.value) + ' ' + self.parent.base_unit()
format_date = lambda x: x.isoformat(' ')[:-3] if x else _("None")
d = WindowModalDialog(self, _("Summary")) d = WindowModalDialog(self, _("Summary"))
d.setMinimumSize(600, 150) d.setMinimumSize(600, 150)
vbox = QVBoxLayout() vbox = QVBoxLayout()
grid = QGridLayout() grid = QGridLayout()
grid.addWidget(QLabel(_("Start")), 0, 0) grid.addWidget(QLabel(_("Start")), 0, 0)
grid.addWidget(QLabel(start_date.isoformat(' ')), 0, 1) grid.addWidget(QLabel(format_date(start_date)), 0, 1)
grid.addWidget(QLabel(_("End")), 1, 0) grid.addWidget(QLabel(_("End")), 1, 0)
grid.addWidget(QLabel(end_date.isoformat(' ')), 1, 1) grid.addWidget(QLabel(format_date(end_date)), 1, 1)
grid.addWidget(QLabel(_("Initial balance")), 2, 0) grid.addWidget(QLabel(_("Initial balance")), 2, 0)
grid.addWidget(QLabel(format_amount(h['start_balance'])), 2, 1) grid.addWidget(QLabel(format_amount(h['start_balance'])), 2, 1)
grid.addWidget(QLabel(str(h.get('start_fiat_balance'))), 2, 2) grid.addWidget(QLabel(str(h.get('start_fiat_balance'))), 2, 2)

2
lib/exchange_rate.py
View file

@ -520,6 +520,8 @@ class FxThread(ThreadJob):
return "%s" % (self.ccy_amount_str(value, True)) return "%s" % (self.ccy_amount_str(value, True))
def history_rate(self, d_t): def history_rate(self, d_t):
if d_t is None:
return Decimal('NaN')
rate = self.exchange.historical_rate(self.ccy, d_t) rate = self.exchange.historical_rate(self.ccy, d_t)
# Frequently there is no rate for today, until tomorrow :) # Frequently there is no rate for today, until tomorrow :)
# Use spot quotes in that case # Use spot quotes in that case

6
lib/wallet.py
View file

@ -1055,8 +1055,8 @@ class Abstract_Wallet(PrintError):
start_date = timestamp_to_datetime(from_timestamp) start_date = timestamp_to_datetime(from_timestamp)
end_date = timestamp_to_datetime(to_timestamp) end_date = timestamp_to_datetime(to_timestamp)
else: else:
start_date = out[0]['date'] start_date = None
end_date = out[-1]['date'] end_date = None
summary = { summary = {
'start_date': start_date, 'start_date': start_date,
'end_date': end_date, 'end_date': end_date,
@ -1071,9 +1071,7 @@ class Abstract_Wallet(PrintError):
summary['fiat_income'] = Fiat(fiat_income, fx.ccy) summary['fiat_income'] = Fiat(fiat_income, fx.ccy)
summary['fiat_expenditures'] = Fiat(fiat_expenditures, fx.ccy) summary['fiat_expenditures'] = Fiat(fiat_expenditures, fx.ccy)
summary['unrealized_gains'] = Fiat(unrealized, fx.ccy) summary['unrealized_gains'] = Fiat(unrealized, fx.ccy)
if start_date:
summary['start_fiat_balance'] = Fiat(fx.historical_value(start_balance, start_date), fx.ccy) summary['start_fiat_balance'] = Fiat(fx.historical_value(start_balance, start_date), fx.ccy)
if end_date:
summary['end_fiat_balance'] = Fiat(fx.historical_value(end_balance, end_date), fx.ccy) summary['end_fiat_balance'] = Fiat(fx.historical_value(end_balance, end_date), fx.ccy)
else: else:
summary = {} summary = {}