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

adding percentages

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-05 11:13:08 +02:00
parent 388dac317c
commit a2bf968f2a
4 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rowers/views/analysisviews.py
View File

@@ -1064,6 +1064,7 @@ def trainingzones_view(request,userid=0):
startdate = enddate-datetime.timedelta(days=42)
zones = 'hr'
date_agg = 'week'
yaxis = 'time'
form = TrainingZonesForm({
@@ -1071,6 +1072,7 @@ def trainingzones_view(request,userid=0):
'enddate':enddate,
'zones':zones,
'dates':date_agg,
'yaxis':yaxis,
})
@@ -1082,7 +1084,7 @@ def trainingzones_view(request,userid=0):
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())
@@ -1094,6 +1096,7 @@ def trainingzones_view(request,userid=0):
'enddate':enddate,
'zones':zones,
'dates':date_agg,
'yaxis':yaxis,
})
script = ''
@@ -1122,6 +1125,7 @@ def trainingzones_view(request,userid=0):
'enddate':enddate,
'zones':zones,
'dates': date_agg,
'yaxis': yaxis,
}
)
@@ -1133,12 +1137,13 @@ def trainingzones_view_data(request,userid=0):
enddate = timezone.now()
zones = 'hr'
date_agg = 'week'
yaxis = 'time'
if request.GET.get('zones'):
zones = request.GET.get('zones')
zones = request.GET.get('zones',zones)
if request.GET.get('dates'):
date_agg = request.GET.get('dates')
date_agg = request.GET.get('dates',date_agg)
yaxis = request.GET.get('yaxis',yaxis)
if request.GET.get('startdate'):
startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d")
@@ -1148,9 +1153,10 @@ 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,date_agg=date_agg)
script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones,date_agg=date_agg)
data = get_zones_report(r,startdate,enddate,trainingzones=zones,date_agg=date_agg,yaxis=yaxis)
script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones,date_agg=date_agg,yaxis=yaxis)
return JSONResponse({
'script': script,