added link to generate marker workouts
This commit is contained in:
33541
coverage.xml
Normal file
33541
coverage.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1787,11 +1787,6 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
|
|||||||
|
|
||||||
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
|
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
|
||||||
|
|
||||||
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
|
|
||||||
date__lte=enddate,
|
|
||||||
workouttype__in=mytypes.rowtypes,
|
|
||||||
duplicate=False)
|
|
||||||
|
|
||||||
# marker workouts
|
# marker workouts
|
||||||
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
|
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
|
||||||
date__lte=enddate,
|
date__lte=enddate,
|
||||||
|
|||||||
@@ -129,6 +129,9 @@
|
|||||||
</table>
|
</table>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<li class="grid_4">
|
||||||
|
<a href="/rowers/createmarkerworkouts/user/{{ rower.user.id }}/">Automatically generate marker workouts</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -182,6 +182,9 @@
|
|||||||
</table>
|
</table>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<li class="grid_4">
|
||||||
|
<a href="/rowers/createmarkerworkouts/user/{{ rower.user.id }}/">Automatically generate marker workouts</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -355,6 +355,10 @@ urlpatterns = [
|
|||||||
re_path(r'^fitness-fit/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
re_path(r'^fitness-fit/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
||||||
re_path(r'^fitness-fit/user/(?P<userid>\d+)/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
re_path(r'^fitness-fit/user/(?P<userid>\d+)/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
||||||
re_path(r'^fitness-fit/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
re_path(r'^fitness-fit/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.fitness_from_cp_view,name='fitness_from_cp_view'),
|
||||||
|
re_path(r'^createmarkerworkouts/user/(?P<userid>\d+)/$',views.create_marker_workouts_view,
|
||||||
|
name='create_marker_workouts_view'),
|
||||||
|
re_path(r'^createmarkerworkouts/$',views.create_marker_workouts_view,
|
||||||
|
name='create_marker_workouts_view'),
|
||||||
re_path(r'^goldmedalscores/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
re_path(r'^goldmedalscores/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
||||||
re_path(r'^goldmedalscores/user/(?P<userid>\d+)/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
re_path(r'^goldmedalscores/user/(?P<userid>\d+)/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
||||||
re_path(r'^goldmedalscores/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
re_path(r'^goldmedalscores/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.goldmedalscores_view,name='goldmedalscores_view'),
|
||||||
|
|||||||
@@ -1543,6 +1543,29 @@ def fitnessmetric_view(request,userid=0,mode='rower',
|
|||||||
'form':form,
|
'form':form,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@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)
|
||||||
|
def create_marker_workouts_view(request,userid=0,
|
||||||
|
startdate=timezone.now()-timezone.timedelta(days=365),
|
||||||
|
enddate=timezone.now()):
|
||||||
|
therower = getrequestrower(request,userid=userid)
|
||||||
|
theuser = therower.user
|
||||||
|
|
||||||
|
workouts = Workout.objects.filter(user=theuser.rower,date__gte=startdate,
|
||||||
|
date__lte=enddate,
|
||||||
|
workouttype__in=mytypes.rowtypes,
|
||||||
|
duplicate=False).order_by('date')
|
||||||
|
|
||||||
|
for workout in workouts:
|
||||||
|
w2 = dataprep.check_marker(workout)
|
||||||
|
|
||||||
|
url = reverse('goldmedalscores_view',
|
||||||
|
kwargs={
|
||||||
|
'userid':userid,
|
||||||
|
})
|
||||||
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
@user_passes_test(ispromember, login_url="/rowers/paidplans",
|
@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",
|
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)
|
redirect_field_name=None)
|
||||||
|
|||||||
Reference in New Issue
Block a user