From 45ffeb76eeef47e77e42b6186e65188c72bc98b8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 May 2020 13:35:27 +0200 Subject: [PATCH] adding past 12 months --- rowers/templates/history.html | 2 ++ rowers/views/analysisviews.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/rowers/templates/history.html b/rowers/templates/history.html index 657b2ab9..b9539700 100644 --- a/rowers/templates/history.html +++ b/rowers/templates/history.html @@ -37,6 +37,8 @@ Past 28 days   Current Concept2 Season +   + Past 12 months
  • diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index ff527cef..04927008 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -4763,8 +4763,11 @@ def history_view(request,userid=0): lastseven = timezone.now()-datetime.timedelta(days=7) lastfourteen = timezone.now()-datetime.timedelta(days=14) last28 = timezone.now()-datetime.timedelta(days=28) + today = timezone.now() + lastyear = datetime.datetime(year=today.year-1,month=today.month,day=today.day) + firstmay = datetime.datetime(year=today.year,month=5,day=1).astimezone(usertimezone) if firstmay>today: firstmay = datetime.datetime(year=today.year-1,month=5,day=1) @@ -4786,6 +4789,7 @@ def history_view(request,userid=0): 'lastseven':lastseven, 'lastfourteen':lastfourteen, 'last28':last28, + 'lastyear':lastyear, 'today':today, 'workouttype':typeselect, 'firstmay':firstmay,