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

Favoritecharts

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-07 21:22:30 +01:00
parent 25191f28b8
commit 49be534e95
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/templates/analysis.html
View File

@@ -44,7 +44,7 @@
{% if user.rower.rowerplan == 'pro' %} {% if user.rower.rowerplan == 'pro' %}
<a class="button blue small" href="/rowers/histo">Power Histogram</a> <a class="button blue small" href="/rowers/histo">Power Histogram</a>
{% else %} {% else %}
<a class="button blue small" href="/rowers/about">Power Histogram</a> <a class="button blue small" href="/rowers/promembership">Power Histogram</a>
{% endif %} {% endif %}
</p> </p>
<p> <p>
@@ -73,4 +73,4 @@
</div> </div>
{% endblock %} {% endblock %}

4
rowers/templates/flexchart3.html
View File

@@ -176,7 +176,7 @@
{% if favoritenr > 0 %} {% if favoritenr > 0 %}
<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:-1 }}">&lt</a> <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:-1 }}">&lt</a>
{% else %} {% else %}
<p>&nbsp;</p> <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ maxfav }}">&lt</a>
{% endif %} {% endif %}
</div> </div>
<div class="grid_2"> <div class="grid_2">
@@ -190,7 +190,7 @@
{% if favoritenr < maxfav %} {% if favoritenr < maxfav %}
<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:1 }}">&gt</a> <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:1 }}">&gt</a>
{% else %} {% else %}
<p>&nbsp;</p> <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart=0">&gt</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>

30
rowers/views.py
View File

@@ -1449,7 +1449,7 @@ def histo(request,theuser=0,
promember=1 promember=1
if not promember: if not promember:
return HttpResponseRedirect("/rowers/about/") return HttpResponseRedirect("/rowers/promembership/")
# get all indoor rows of in date range # get all indoor rows of in date range
@@ -1912,7 +1912,7 @@ def workouts_view(request,message='',successmessage='',
except Rower.DoesNotExist: except Rower.DoesNotExist:
return HttpResponse("User has no rower instance") return HttpResponse("User has no rower instance")
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_comparison_list(request,id=0,message='',successmessage='', def workout_comparison_list(request,id=0,message='',successmessage='',
startdatestring="",enddatestring="", startdatestring="",enddatestring="",
startdate=timezone.now()-datetime.timedelta(days=365), startdate=timezone.now()-datetime.timedelta(days=365),
@@ -2026,7 +2026,7 @@ def workout_view(request,id=0):
return HttpResponse("Workout doesn't exist") return HttpResponse("Workout doesn't exist")
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""): def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
@@ -2053,7 +2053,7 @@ def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_smoothenpace_view(request,id=0,message="",successmessage=""): def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
@@ -2088,7 +2088,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""): def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if request.method == 'POST': if request.method == 'POST':
@@ -2132,7 +2132,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
{'form':form, {'form':form,
'id':row.id}) 'id':row.id})
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_downloadwind_view(request,id=0,message="",successmessage=""): def workout_downloadwind_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
f1 = row.csvfilename f1 = row.csvfilename
@@ -2189,7 +2189,7 @@ def workout_downloadwind_view(request,id=0,message="",successmessage=""):
return response return response
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_wind_view(request,id=0,message="",successmessage=""): def workout_wind_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
@@ -2285,7 +2285,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
'gmapdiv':gmdiv}) 'gmapdiv':gmdiv})
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_stream_view(request,id=0,message="",successmessage=""): def workout_stream_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
@@ -2347,7 +2347,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
'the_div':div}) 'the_div':div})
@user_passes_test(promember, login_url="/login") @user_passes_test(promember, login_url="/",redirect_field_name=None)
def workout_otwsetpower_view(request,id=0,message="",successmessage=""): def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
@@ -2477,7 +2477,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
'interactiveplot':script, 'interactiveplot':script,
'the_div':div}) 'the_div':div})
#@user_passes_test(promember,login_url="/login") #@user_passes_test(promember,login_url="/",redirect_field_name=None)
@login_required() @login_required()
def workout_advanced_view(request,id=0,message="",successmessage=""): def workout_advanced_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
@@ -2809,7 +2809,7 @@ def testbokeh(request):
'css_res':css_resources, 'css_res':css_resources,
}) })
#@user_passes_test(promember,login_url="/login") #@user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_biginteractive_view(request,id=0,message="",successmessage=""): def workout_biginteractive_view(request,id=0,message="",successmessage=""):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
# check if user is owner of this workout # check if user is owner of this workout
@@ -3051,7 +3051,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
'workout_form.html', 'workout_form.html',
{'form':form}) {'form':form})
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_add_otw_powerplot_view(request,id): def workout_add_otw_powerplot_view(request,id):
w = Workout.objects.get(id=id) w = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,w)==False): if (checkworkoutuser(request.user,w)==False):
@@ -3273,7 +3273,7 @@ def workout_add_distanceplot_view(request,id):
url = "/rowers/workout/"+str(w.id)+"/edit" url = "/rowers/workout/"+str(w.id)+"/edit"
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_add_distanceplot2_view(request,id): def workout_add_distanceplot2_view(request,id):
w = Workout.objects.get(id=id) w = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,w)==False): if (checkworkoutuser(request.user,w)==False):
@@ -3317,7 +3317,7 @@ def workout_add_distanceplot2_view(request,id):
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/",redirect_field_name=None)
def workout_add_timeplot2_view(request,id): def workout_add_timeplot2_view(request,id):
w = Workout.objects.get(id=id) w = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,w)==False): if (checkworkoutuser(request.user,w)==False):
@@ -4502,7 +4502,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
}) })
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/rowers/me/edit",redirect_field_name=None)
def rower_favoritecharts_view(request): def rower_favoritecharts_view(request):
message = '' message = ''
successmessage = '' successmessage = ''