From 031bc670f2ca8bd14e78c8f39feabcd6455d3fc9 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Tue, 11 Jul 2017 11:12:07 +0700 Subject: [PATCH] Performance view: fix week display --- views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views.py b/views.py index e319462..f1ca78d 100644 --- a/views.py +++ b/views.py @@ -271,7 +271,7 @@ def closed_trades_index(request): closed_trades = ClosedTrade.objects.all().filter(exitTime__gte=(now - datetime.timedelta(weeks=4))) form = ClosedTradeFilterForm() - closed_trades = closed_trades.order_by('-entryTime') + closed_trades = closed_trades.order_by('-exitTime') closed_trades_prime = closed_trades.order_by('exitTime') @@ -321,13 +321,13 @@ def performance(request): columns[account].append(0) columns[trade.account][-1] += trade.profit elif timeframe == 'weekly': - epoch = datetime.date(1970, 1, 1) + epoch = datetime.date(1970, 1, 5) prev_week = None for trade in closed_trades: this_week = (trade.exitTime.date() - epoch).days // 7 if prev_week != this_week: prev_week = this_week - week_end = epoch + datetime.timedelta(weeks=prev_week + 1) + week_end = epoch + datetime.timedelta(weeks=prev_week, days=6) dates.append(week_end) for account in all_accounts: columns[account].append(0)