From a99507a90f60df3a48d4ff38c9a297c00fa151d1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 28 Oct 2018 20:57:34 +0100 Subject: [PATCH] time period select on planned sessions view --- rowers/views.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 6efd954c..49cf2eb4 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -14623,14 +14623,6 @@ def plannedsessions_view(request, r = getrequestrower(request,userid=userid) - when = request.GET.get('when') - if when: - timeperiod = when - else: - timeperiod = 'thisweek' - - startdate,enddate = get_dates_timeperiod(timeperiod) - if startdatestring: try: startdate = iso8601.parse_date(startdatestring) @@ -14643,6 +14635,21 @@ def plannedsessions_view(request, except ParseError: pass + + when = request.GET.get('when') + if when: + timeperiod = when + startdate,enddate = get_dates_timeperiod(timeperiod) + else: + timeperiod = 'thisweek' + startdate1,enddate1 = get_dates_timeperiod(timeperiod) + + if not startdatestring: + startdate = startdate1 + + if not enddatestring: + enddate = enddate1 + try: trainingplan = TrainingPlan.objects.filter( startdate__lte = startdate,