mdsfred/investment
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diagram: simplify queries

Browse source
This commit is contained in:
Frederik Jaeckel 2023-06-23 16:41:39 +02:00
parent 6e77058946
commit ff5893b451
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
diagram.py
View file

@ -60,16 +60,16 @@ class GraphDef(metaclass=PoolMeta):
return None return None
if self.scaling == 'alldata': if self.scaling == 'alldata':
query = [('asset.id', '=', self.asset.id)] query = [('asset', '=', self.asset.id)]
elif self.scaling == 'view': elif self.scaling == 'view':
query = [ query = [
('asset.id', '=', self.asset.id), ('asset', '=', self.asset.id),
('date', '>=', self.chart.used_start_date()), ('date', '>=', self.chart.used_start_date()),
('date', '<=', self.chart.used_end_date()), ('date', '<=', self.chart.used_end_date()),
] ]
elif self.scaling == 'six': elif self.scaling == 'six':
query = [ query = [
('asset.id', '=', self.asset.id), ('asset', '=', self.asset.id),
('date', '>=', self.chart.used_start_date() - ('date', '>=', self.chart.used_start_date() -
timedelta(days=180)), timedelta(days=180)),
('date', '<=', self.chart.used_end_date()), ('date', '<=', self.chart.used_end_date()),
@ -104,12 +104,12 @@ class ChartPoint(metaclass=PoolMeta):
before = Rate.search([ before = Rate.search([
('date', '<', query_date), ('date', '<', query_date),
('asset.id', '=', asset_id), ('asset', '=', asset_id),
], limit=1, order=[('date', 'DESC')]) ], limit=1, order=[('date', 'DESC')])
after = Rate.search([ after = Rate.search([
('date', '>', query_date), ('date', '>', query_date),
('asset.id', '=', asset_id), ('asset', '=', asset_id),
], limit=1, order=[('date', 'ASC')]) ], limit=1, order=[('date', 'ASC')])
if (len(before) == 1) and (len(after) == 1): if (len(before) == 1) and (len(after) == 1):