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

passing a few more tests

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-25 16:46:25 +01:00
parent 5e8701792f
commit 1ff5ce827f
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/tests/.~lock.viewnames.csv# Normal file
View File

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

6
rowers/urls.py
View File

@@ -248,13 +248,13 @@ urlpatterns = [
re_path(r'^list-graphs/$',views.graphs_view,name='graphs_view'), 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'^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/$',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<userid>\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+)/(?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+)/(?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/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/(?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'^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'^(?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/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'), # re_path(r'^ote-bests2/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'),

42
rowers/views/analysisviews.py
View File

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