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

added link to generate marker workouts

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-08 08:45:46 +01:00
parent 149df24059
commit 882c0cbf6b
6 changed files with 33574 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33541
coverage.xml Normal file
View File

File diff suppressed because it is too large Load Diff

5
rowers/interactiveplots.py
View File

@@ -1787,11 +1787,6 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
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
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
date__lte=enddate,

3
rowers/templates/goldmedalscores.html
View File

@@ -129,6 +129,9 @@
</table>
</li>
{% endif %}
<li class="grid_4">
<a href="/rowers/createmarkerworkouts/user/{{ rower.user.id }}/">Automatically generate marker workouts</a>
</li>
</ul>

3
rowers/templates/performancemanager.html
View File

@@ -182,6 +182,9 @@
</table>
</li>
{% endif %}
<li class="grid_4">
<a href="/rowers/createmarkerworkouts/user/{{ rower.user.id }}/">Automatically generate marker workouts</a>
</li>
</ul>

4
rowers/urls.py
View File

@@ -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/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'^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/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'),

23
rowers/views/analysisviews.py
View File

@@ -1543,6 +1543,29 @@ def fitnessmetric_view(request,userid=0,mode='rower',
'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",
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)