s3lph/matemat
s3lph/matemat
1
0
Fork 2
Code Issues Pull requests 2 Projects Releases Packages 2 Wiki Activity Actions

Added fallback handling for transactions with unknown dates.

Browse source
This commit is contained in:
s3lph 2018-09-09 04:12:11 +02:00
parent b55ad25f58
commit 6fcea8e2b3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matemat/db/facade.py
View file

@ -619,7 +619,9 @@ class MatematDatabase(object):
fromdate, min_id = row fromdate, min_id = row
created: datetime = datetime.fromtimestamp(fromdate) created: datetime = datetime.fromtimestamp(fromdate)
cursor.execute(''' cursor.execute('''
SELECT t.ta_id, t.value, t.old_balance, t.date, c.ta_id, d.ta_id, m.ta_id, c.product, m.agent, m.reason SELECT
t.ta_id, t.value, t.old_balance, COALESCE(t.date, 0),
c.ta_id, d.ta_id, m.ta_id, c.product, m.agent, m.reason
FROM transactions AS t FROM transactions AS t
LEFT JOIN consumptions AS c LEFT JOIN consumptions AS c
ON t.ta_id = c.ta_id ON t.ta_id = c.ta_id

2
matemat/db/primitives/Transaction.py
View file

@ -19,6 +19,8 @@ class Transaction:
@property @property
def receipt_date(self) -> str: def receipt_date(self) -> str:
if self.date == datetime.fromtimestamp(0):
return '<unknown> '
date: str = self.date.strftime('%d.%m.%Y, %H:%M') date: str = self.date.strftime('%d.%m.%Y, %H:%M')
return date return date