passing a few more tests

rowers/tests/.~lock.viewnames.csv#

@@ -0,0 +1 @@
+,sander,sander-pc,25.01.2020 16:35,file:///home/sander/.config/libreoffice/4;

rowers/urls.py

@@ -248,13 +248,13 @@ urlpatterns = [
     re_path(r'^list-graphs/$',views.graphs_view,name='graphs_view'),
     re_path(r'^list-graphs/user/(?P<userid>\d+)/$',views.graphs_view,name='graphs_view'),
     re_path(r'^fitness-progress/$',views.fitnessmetric_view,name='fitnessmetric_view'),
-    re_path(r'^fitness-progress/user/(?P<id>\d+)/$',views.fitnessmetric_view,name='fitnessmetric_view'),
-    re_path(r'^fitness-progress/user/(?P<id>\d+)/(?P<mode>\w+.*)/$',views.fitnessmetric_view,name='fitnessmetric_view'),
+    re_path(r'^fitness-progress/user/(?P<userid>\d+)/$',views.fitnessmetric_view,name='fitnessmetric_view'),
+    re_path(r'^fitness-progress/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.fitnessmetric_view,name='fitnessmetric_view'),
 #    re_path(r'^ote-bests/user/(?P<theuser>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'),
     re_path(r'^ote-bests/user/(?P<theuser>\d+)/$',views.rankings_view,name='rankings_view'),
 #    re_path(r'^ote-bests/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'),
     re_path(r'^ote-bests/$',views.rankings_view,name='rankings_view'),
-    re_path(r'^(?P<theuser>\d+)/ote-bests/$',views.rankings_view,name='rankings_view'),
+    re_path(r'^(?P<userid>\d+)/ote-bests/$',views.rankings_view,name='rankings_view'),
 #    re_path(r'^(?P<theuser>\d+)/ote-bests2/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'),
     re_path(r'^ote-bests2/user/(?P<userid>\d+)/$',views.rankings_view2,name='rankings_view2'),
 #    re_path(r'^ote-bests2/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'),

rowers/views/analysisviews.py

@@ -1335,13 +1335,13 @@ def planrequired_view(request):
 @user_passes_test(isplanmember,login_url="/rowers/paidplans",
                   message="This functionality requires a Coach or Self-Coach plan",
                   redirect_field_name=None)
-@permission_required('rower.is_coach',fn=get_user_by_id,raise_exception=True)
-def fitnessmetric_view(request,id=0,mode='rower',
+@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
+def fitnessmetric_view(request,userid=0,mode='rower',
                        startdate=timezone.now()-timezone.timedelta(days=365),
                        enddate=timezone.now()):
 
 
-    therower = getrequestrower(request,userid=id)
+    therower = getrequestrower(request,userid=userid)
     theuser = therower.user
 
 
@@ -1391,7 +1391,8 @@ def fitnessmetric_view(request,id=0,mode='rower',
 
 # Show ranking distances including predicted paces
 @login_required()
-def rankings_view(request,theuser=0,
+@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
+def rankings_view(request,userid=0,
           startdate=timezone.now()-datetime.timedelta(days=365),
           enddate=timezone.now(),
           deltadays=-1,
@@ -1412,25 +1413,25 @@ def rankings_view(request,theuser=0,
         enddate = startdate
         startdate = s
 
-    if theuser == 0:
-        theuser = request.user.id
+
 
     promember=0
-    if not request.user.is_anonymous:
-        r = getrower(request.user)
-        if r.birthdate:
-            age = calculate_age(r.birthdate)
-            worldclasspower = int(metrics.getagegrouprecord(
-                age,
-                sex=r.sex,
-                weightcategory=r.weightcategory,
-            ))
-        else:
-            worldclasspower = None
+    r = getrequestrower(request,userid=userid)
+    theuser = r.user.id
 
-        result = request.user.is_authenticated and ispromember(request.user)
-        if result:
-            promember=1
+    if r.birthdate:
+        age = calculate_age(r.birthdate)
+        worldclasspower = int(c2stuff.getagegrouprecord(
+            age,
+            sex=r.sex,
+            weightcategory=r.weightcategory,
+        ))
+    else:
+        worldclasspower = None
+
+    result = request.user.is_authenticated and ispromember(request.user)
+    if result:
+        promember=1
 
     # get all indoor rows in date range
 
@@ -1741,6 +1742,7 @@ def ajax_agegrouprecords(request,
 
 # Show ranking distances including predicted paces
 @login_required()
+@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
 def rankings_view2(request,userid=0,
           startdate=timezone.now()-datetime.timedelta(days=365),
           enddate=timezone.now(),