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

Merge branch 'release/v14.09' into master

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-20 07:41:27 +02:00
parent febe86a1b4 31f078f60e
commit 85c32d2fc3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/tasks.py
View File

@@ -2711,7 +2711,10 @@ def handle_setcp(strokesdf,filename,workoutid,debug=False,**kwargs):
except FileNotFoundError: except FileNotFoundError:
pass pass
if not strokesdf.empty: if not strokesdf.empty:
totaltime = strokesdf['time'].max() try:
totaltime = strokesdf['time'].max()
except KeyError:
return 0
try: try:
powermean = strokesdf['power'].mean() powermean = strokesdf['power'].mean()
except KeyError: except KeyError:

2
rowers/views/apiviews.py
View File

@@ -81,7 +81,7 @@ from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer
@csrf_exempt @csrf_exempt
@login_required() @login_required()
@api_view(["GET","POST"]) @api_view(["GET","POST"])
@permission_classes([IsAuthenticated]) #@permission_classes([IsAuthenticated])
def strokedatajson_v2(request,id): def strokedatajson_v2(request,id):
""" """
POST: Add Stroke data to workout POST: Add Stroke data to workout