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

small improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-05 19:27:39 +02:00
parent d56167bb74
commit 2629a35eb1
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/history.html
View File

@@ -5,7 +5,7 @@
{% block title %}Rowsandall {% endblock %} {% block title %}Rowsandall {% endblock %}
{% block main %} {% block main %}
<h1>History</h1> <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<ul class="main-content"> <ul class="main-content">
<script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script> <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
<li class="grid_2"> <li class="grid_2">

1
rowers/urls.py
View File

@@ -752,6 +752,7 @@ urlpatterns = [
re_path(r'^workout/api/upload/',views.workout_upload_api,name='workout_upload_api'), re_path(r'^workout/api/upload/',views.workout_upload_api,name='workout_upload_api'),
re_path(r'^access/share/$',views.createShareURL, name="sharedURL"), re_path(r'^access/share/$',views.createShareURL, name="sharedURL"),
re_path(r'^access/(?P<key>\w+)/$', views.sharedPage, name="sharedPage"), re_path(r'^access/(?P<key>\w+)/$', views.sharedPage, name="sharedPage"),
re_path(r'^history/user/(?P<userid>\d+)/$',views.history_view,name="history_view"),
re_path(r'^history/$',views.history_view,name="history_view"), re_path(r'^history/$',views.history_view,name="history_view"),
] ]

7
rowers/views/analysisviews.py
View File

@@ -4651,7 +4651,10 @@ class AlertDelete(DeleteView):
return obj return obj
@login_required() @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_coach',fn=get_user_by_userid,raise_exception=True)
def history_view(request,userid=0): def history_view(request,userid=0):
r = getrequestrower(request,userid=userid) r = getrequestrower(request,userid=userid)
@@ -4757,7 +4760,7 @@ def history_view(request,userid=0):
except KeyError: except KeyError:
totalsdict['hrmean'] = 0 totalsdict['hrmean'] = 0
totalsdict['hrmax'] = 0 totalsdict['hrmax'] = 0
totalsdict['nrworkouts'] = g_workouts.count() totalsdict['nrworkouts'] = g_workouts.count()
breadcrumbs = [ breadcrumbs = [

1
rowers/views/workoutviews.py
View File

@@ -2010,6 +2010,7 @@ def workouts_view(request,message='',successmessage='',
stack=stack) stack=stack)
totalmeters,totalhours, totalminutes = get_totals(g_workouts) totalmeters,totalhours, totalminutes = get_totals(g_workouts)
totalminutes = '{totalminutes:02d}'.format(totalminutes=totalminutes)
messages.info(request,successmessage) messages.info(request,successmessage)