From 78db50a309f5a35c14e68c0242abf2d950f744cb Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Sat, 12 Sep 2020 16:49:16 +0700 Subject: [PATCH] Performance view: fix aggregation --- views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index 45f7e36..648b865 100644 --- a/views.py +++ b/views.py @@ -338,7 +338,7 @@ def performance(request): form = PerformanceFilterForm(request.GET) if form.is_valid(): d = form.cleaned_data - closed_trades = ClosedTrade.objects.all() + closed_trades = ClosedTrade.objects.all().order_by('exitTime') trades = Trade.objects.order_by('timestamp') if len(d['strategies']) > 0: closed_trades = closed_trades.filter(strategyId__in=list(d['strategies'])) @@ -358,7 +358,7 @@ def performance(request): else: now = datetime.date.today() - closed_trades = ClosedTrade.objects.all().filter(exitTime__gte=(now - datetime.timedelta(weeks=4))) + closed_trades = ClosedTrade.objects.all().filter(exitTime__gte=(now - datetime.timedelta(weeks=4))).order_by('exitTime') trades = Trade.objects.order_by('timestamp').filter(timestamp__gte=(now - datetime.timedelta(weeks=4))) form = PerformanceFilterForm() timeframe = 'daily'