From 3a0dea116cb37a42b2d895be5a94c2c46769b9b4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Oct 2020 19:21:40 +0200 Subject: [PATCH 1/2] bug fix --- rowers/views/workoutviews.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 71d6a4cf..0e95a9b1 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4701,9 +4701,10 @@ def workout_upload_api(request): if post_data['useremail'] in rwr.emailalternatives: r = rwr break - if post_data['useremail'] not in r.emailalternatives: - message = {'status':'false','message':'could not find user'} - return JSONResponse(status=400,data=message) + if r is not None and r.emailalternatives is not None: + if post_data['useremail'] not in r.emailalternatives: + message = {'status':'false','message':'could not find user'} + return JSONResponse(status=400,data=message) if r is None: From ea5c99ad57b2194ab96102a94ac71b72f35ff923 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Oct 2020 20:33:00 +0200 Subject: [PATCH 2/2] a --- rowers/forms.py | 1 + rowers/views/analysisviews.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/forms.py b/rowers/forms.py index c4519a1d..02ded6af 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1036,6 +1036,7 @@ analysischoices = ( ('flexall','Cumulative Flex Chart'), ('stats','Statistics'), ('compare','Compare'), + ('cp','CP Chart') ) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 69a17863..8e780e81 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -725,6 +725,8 @@ def analysis_view_data(request,userid=0): script,div = statsdata(workouts,options) elif function == 'compare': script,div = comparisondata(workouts,options) + elif function == 'cp': + script, div = cpdata(workouts,options) else: script = '' div = 'Unknown analysis functions' @@ -4849,7 +4851,7 @@ def history_view_data(request,userid=0): typeselect = 'All' yaxis = request.GET.get('yaxis','duration') - + if yaxis.lower() not in ['duration','rscore','trimp']: yaxis = 'duration'