From aefc3a200bf99e752a1110de4b352ee0b6c86975 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 4 Jun 2021 08:43:24 +0200 Subject: [PATCH] better form initialization --- rowers/views/analysisviews.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index c1cc7eb8..4667b736 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1062,17 +1062,27 @@ def trainingzones_view(request,userid=0): enddate = timezone.now() startdate = enddate-datetime.timedelta(days=42) - - form = TrainingZonesForm() zones = 'hr' - date_agg = 'month' + date_agg = 'week' + + + form = TrainingZonesForm({ + 'startdate':startdate, + 'enddate':enddate, + 'zones':zones, + 'dates':date_agg, + }) + + if request.method == 'POST': # pragma: no cover form = TrainingZonesForm(request.POST) - if form.is_valid(): - startdate = form.cleaned_data['startdate'] - enddate = form.cleaned_data['enddate'] - zones = form.cleaned_data['zones'] - date_agg = form.cleaned_data['dates'] + + if form.is_valid(): + startdate = form.cleaned_data['startdate'] + enddate = form.cleaned_data['enddate'] + zones = form.cleaned_data['zones'] + date_agg = form.cleaned_data['dates'] + if date_agg == 'week': startdate = startdate - datetime.timedelta(days = startdate.weekday())