sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

zones chart

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-17 12:30:48 +02:00
parent eec03965c8
commit b008773a7e
4 changed files with 228 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/views/analysisviews.py
View File

@@ -1144,9 +1144,6 @@ def trainingzones_view(request, userid=0):
form = TrainingZonesForm({
'startdate': startdate,
'enddate': enddate,
'zones': zones,
'dates': date_agg,
'yaxis': yaxis,
})
if request.method == 'POST': # pragma: no cover
@@ -1155,9 +1152,6 @@ def trainingzones_view(request, userid=0):
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']
yaxis = form.cleaned_data['yaxis']
if date_agg == 'week':
startdate = startdate - datetime.timedelta(days=startdate.weekday())
@@ -1229,12 +1223,16 @@ def trainingzones_view_data(request, userid=0):
request.GET.get('enddate'), "%Y-%m-%d")
enddate = arrow.get(enddate).datetime
data = get_zones_report(r, startdate, enddate,
trainingzones=zones, date_agg=date_agg, yaxis=yaxis)
if (enddate-startdate).days > 200:
date_agg = "month"
script, div = interactive_zoneschart(
data = get_zones_report_pl(r, startdate, enddate,
trainingzones=zones, date_agg=date_agg, yaxis=yaxis)
script, div = interactive_zoneschart2(
r, data, startdate, enddate, trainingzones=zones, date_agg=date_agg, yaxis=yaxis)
return JSONResponse({
'script': script,
'div': div,