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

Merge branch 'hotfix/v5.46'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-01-05 11:09:42 +01:00
parent e73e0aaf9c 81408aca34
commit 223f9557e8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/templates/analysis.html
View File

@@ -91,9 +91,9 @@
<div class="grid_2 alpha">
<p>
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<a class="button blue small" href="/rowers/otw-bests">OTW Ranking Pieces</a>
<a class="button blue small" href="/rowers/otw-bests">OTW Critical Power</a>
{% else %}
<a class="button blue small" href="/rowers/promembership">OTW Ranking Pieces</a>
<a class="button blue small" href="/rowers/promembership">OTW Critical Power</a>
{% endif %}
</p>
<p>
@@ -129,9 +129,9 @@
<div class="grid_2 suffix_4 alpha">
<p>
{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
<a class="button blue small" href="/rowers/ote-ranking">OTE Ranking Pieces</a>
<a class="button blue small" href="/rowers/ote-ranking">OTE Critical Power</a>
{% else %}
<a class="button blue small" href="/rowers/promembership">OTE Ranking Pieces</a>
<a class="button blue small" href="/rowers/promembership">OTE Critical Power</a>
{% endif %}
</p>
<p>

1
rowers/views.py
View File

@@ -3162,6 +3162,7 @@ def addmanual_view(request):
)
print duration,'aap'
id,message = dataprep.create_row_df(r,
distance,
duration,startdatetime,