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

small impr

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-03 08:50:55 +02:00
parent bb227919a3
commit 8a42be2d71
4 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/views/analysisviews.py
View File

@@ -1073,6 +1073,7 @@ def trainingzones_view(request,userid=0,mode='rower',
startdate = form.cleaned_data['startdate']
enddate = form.cleaned_data['enddate']
zones = form.cleaned_data['zones']
date_agg = form.cleaned_data['dates']
script = ''
@@ -1100,6 +1101,7 @@ def trainingzones_view(request,userid=0,mode='rower',
'startdate':startdate,
'enddate':enddate,
'zones':zones,
'dates': date_agg,
}
)
@@ -1110,10 +1112,14 @@ def trainingzones_view_data(request,userid=0):
startdate = timezone.now()-datetime.timedelta(days=365)
enddate = timezone.now()
zones = 'hr'
date_agg = 'week'
if request.GET.get('zones'):
zones = request.GET.get('zones')
if request.GET.get('dates'):
date_agg = request.GET.get('dates')
if request.GET.get('startdate'):
startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d")
startdate = arrow.get(startdate).datetime
@@ -1122,9 +1128,9 @@ def trainingzones_view_data(request,userid=0):
enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d")
enddate = arrow.get(enddate).datetime
data = get_zones_report(r,startdate,enddate,trainingzones=zones)
data = get_zones_report(r,startdate,enddate,trainingzones=zones,date_agg=date_agg)
script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones)
script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones,date_agg=date_agg)
return JSONResponse({
'script': script,