From 773adeed2bcece6a6bb347e0409afadf47103e16 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 3 Dec 2020 19:39:34 +0100 Subject: [PATCH 1/2] fix --- rowers/views/analysisviews.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 757444a5..0cc5fb3c 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1576,7 +1576,10 @@ def performancemanager_view(request,userid=0,mode='rower', therower.showfatigue = dofatigue therower.save() else: - form = PerformanceManagerForm() + form = PerformanceManagerForm(initial={ + 'doform':doform, + 'dofatigue':dofatigue, + }) script, thediv, endfitness, endfatigue, endform = performance_chart( theuser,startdate=startdate,enddate=enddate, From 3b5615f29bf8731e84fbbcd957ee8076d98afca8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 3 Dec 2020 19:44:26 +0100 Subject: [PATCH 2/2] fix --- rowers/tests/test_urls.py | 2 +- rowers/views/analysisviews.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index 812816ee..b18df532 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -11,7 +11,7 @@ nu = datetime.datetime.now() tested = [ '/rowers/me/delete/', - '/rowers/performancemanager/' +# '/rowers/performancemanager/' ] diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 0cc5fb3c..5ccc4562 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1543,7 +1543,7 @@ def fitnessmetric_view(request,userid=0,mode='rower', @user_passes_test(ispromember, login_url="/rowers/paidplans", message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality", redirect_field_name=None) -@permission_required('rower.is_promember',fn=get_user_by_userid,raise_exception=True) +@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True) def performancemanager_view(request,userid=0,mode='rower', startdate=timezone.now()-timezone.timedelta(days=365), enddate=timezone.now()): @@ -1552,6 +1552,7 @@ def performancemanager_view(request,userid=0,mode='rower', if request.is_ajax(): is_ajax = True + therower = getrequestrower(request,userid=userid) theuser = therower.user