From eca2c68bdd07d06884d3e4a82f1f24ddf0dc9b91 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 4 Jun 2021 08:22:34 +0200 Subject: [PATCH] fix --- rowers/templates/trainingzones.html | 2 +- rowers/views/analysisviews.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rowers/templates/trainingzones.html b/rowers/templates/trainingzones.html index a1ee8163..1f214fd5 100644 --- a/rowers/templates/trainingzones.html +++ b/rowers/templates/trainingzones.html @@ -2,7 +2,7 @@ {% load static %} {% load rowerfilters %} -{% block title %}Rowsandall Training Plans{% endblock %} +{% block title %}Rowsandall Training Zones{% endblock %} {% block main %} diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index f80e114f..074eeffb 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1076,6 +1076,17 @@ def trainingzones_view(request,userid=0,mode='rower', zones = form.cleaned_data['zones'] date_agg = form.cleaned_data['dates'] + if date_agg == 'week': + startdate = startdate - datetime.timedelta(days = startdate.weekday()) + else: + startdate = startdate - datetime.timedelta(days = (startdate.day-1)) + + form = TrainingZonesForm(initial={ + 'startdate':startdate, + 'enddate':enddate, + 'zones':zones, + 'dates':date_agg, + }) script = '' div = get_call()