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

Merge branch 'develop' into feature/redesign2

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-06 22:36:28 +02:00
parent 979cf48618 6e1268fd31
commit d5353caab7
3 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/dataprep.py
View File

@@ -667,6 +667,7 @@ def new_workout_from_df(r,df,
starttimeunix = mktime(startdatetime.utctimetuple()) starttimeunix = mktime(startdatetime.utctimetuple())
df[' ElapsedTime (sec)'] = df['TimeStamp (sec)'] df[' ElapsedTime (sec)'] = df['TimeStamp (sec)']
df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix
print df.info()
row = rrdata(df=df) row = rrdata(df=df)
row.write_csv(csvfilename,gzip=True) row.write_csv(csvfilename,gzip=True)

14
rowers/templates/base.html
View File

@@ -128,7 +128,19 @@
{% endif %} {% endif %}
</div> </div>
<div class="grid_1 tooltip"> <div class="grid_1 tooltip">
{% if user.is_authenticated and user.rower.team.all %} {% if user.is_authenticated and teams %}
<div class="grid_1 alpha dropdown">
<button class="grid_1 alpha button gray small dropbtn">
Teams
</button>
<div class="dropdown-content">
{% for t in teams %}
<a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
{% endfor %}
</div>
</div>
<span class="tooltiptext">See recent workouts for your team</span>
{% elif user.is_authenticated and user.rower.team.all %}
<div class="grid_1 alpha dropdown"> <div class="grid_1 alpha dropdown">
<button class="grid_1 alpha button gray small dropbtn"> <button class="grid_1 alpha button gray small dropbtn">
Teams Teams

95
rowers/views.py
View File

@@ -171,6 +171,15 @@ def rdata(file,rower=rrower()):
return res return res
# Query to get teams managed and member of
def get_my_teams(user):
therower = Rower.objects.get(user=user)
teams1 = therower.team.all()
teams2 = Team.objects.filter(manager=user)
teams = list(set(teams1).union(set(teams2)))
return teams
# Used for the interval editor - translates seconds to a time object # Used for the interval editor - translates seconds to a time object
def get_time(second): def get_time(second):
if (second<=0) or (second>1e9): if (second<=0) or (second>1e9):
@@ -1213,7 +1222,7 @@ def workout_runkeeper_upload_view(request,id=0):
kwargs = { kwargs = {
'message':str(message), 'message':str(message),
'id':str(w.id), 'id':str(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -1433,6 +1442,7 @@ def imports_view(request,successmessage="",message=""):
return render(request,"imports.html", return render(request,"imports.html",
{'successmessage': successmessage, {'successmessage': successmessage,
'message': message, 'message': message,
'teams':get_my_teams(request.user),
}) })
# Just for testing purposes # Just for testing purposes
@@ -1577,6 +1587,7 @@ def histo_all(request,theuser=0):
'the_div':div, 'the_div':div,
'id':theuser, 'id':theuser,
'theuser':u, 'theuser':u,
'teams':get_my_teams(request.user),
}) })
# The Flex plot for a large selection of workouts # The Flex plot for a large selection of workouts
@@ -1700,6 +1711,7 @@ def cum_flex(request,theuser=0,
'yparam1':yparam1, 'yparam1':yparam1,
'yparam2':yparam2, 'yparam2':yparam2,
'promember':promember, 'promember':promember,
'teams':get_my_teams(request.user),
}) })
# Show the EMpower Oarlock generated Stroke Profile # Show the EMpower Oarlock generated Stroke Profile
@@ -1743,6 +1755,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
'id':id, 'id':id,
'mayedit':mayedit, 'mayedit':mayedit,
'workstrokesonly': not workstrokesonly, 'workstrokesonly': not workstrokesonly,
'teams':get_my_teams(request.user),
}) })
# Show Stroke power histogram for a workout # Show Stroke power histogram for a workout
@@ -1776,6 +1789,7 @@ def workout_histo_view(request,id=0):
'the_div':div, 'the_div':div,
'id':id, 'id':id,
'mayedit':mayedit, 'mayedit':mayedit,
'teams':get_my_teams(request.user),
}) })
@@ -1888,6 +1902,7 @@ def histo(request,theuser=0,
'enddate':enddate, 'enddate':enddate,
'form':form, 'form':form,
'deltaform':deltaform, 'deltaform':deltaform,
'teams':get_my_teams(request.user),
}) })
# Show ranking distances including predicted paces # Show ranking distances including predicted paces
@@ -2189,6 +2204,7 @@ def rankings_view(request,theuser=0,
'message':message, 'message':message,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
'teams':get_my_teams(request.user),
}) })
# Reload the workout and calculate the summary from the stroke data (lapIDx) # Reload the workout and calculate the summary from the stroke data (lapIDx)
@@ -2376,6 +2392,7 @@ def team_comparison_select(request,
'team':theteam, 'team':theteam,
'form':form, 'form':form,
'chartform':chartform, 'chartform':chartform,
'teams':get_my_teams(request.user),
}) })
@login_required() @login_required()
@@ -2418,6 +2435,7 @@ def multi_compare_view(request):
'promember':promember, 'promember':promember,
'teamid':teamid, 'teamid':teamid,
'chartform':chartform, 'chartform':chartform,
'teams':get_my_teams(request.user),
}) })
else: else:
return HttpResponse("Form is not valid") return HttpResponse("Form is not valid")
@@ -2449,6 +2467,7 @@ def multi_compare_view(request):
'promember':promember, 'promember':promember,
'teamid':teamid, 'teamid':teamid,
'chartform':chartform, 'chartform':chartform,
'teams':get_my_teams(request.user),
}) })
else: else:
@@ -2551,6 +2570,7 @@ def workouts_view(request,message='',successmessage='',
'enddate':enddate, 'enddate':enddate,
'announcements':announcements[0:4], 'announcements':announcements[0:4],
'team':theteam, 'team':theteam,
'teams':get_my_teams(request.user),
}) })
@@ -2629,7 +2649,8 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
'dateform':dateform, 'dateform':dateform,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
}) 'teams':get_my_teams(request.user),
})
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("User has no rower instance") raise Http404("User has no rower instance")
@@ -2708,7 +2729,8 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
'dateform':dateform, 'dateform':dateform,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
}) 'teams':get_my_teams(request.user),
})
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("User has no rower instance") raise Http404("User has no rower instance")
@@ -2739,7 +2761,8 @@ def workout_view(request,id=0):
'last_name':u.last_name, 'last_name':u.last_name,
'first_name':u.first_name, 'first_name':u.first_name,
'interactiveplot':script, 'interactiveplot':script,
'the_div':div}) 'teams':get_my_teams(request.user),
'the_div':div})
else: else:
return render(request, 'workout_view.html', return render(request, 'workout_view.html',
{'workout':row, {'workout':row,
@@ -2747,6 +2770,7 @@ def workout_view(request,id=0):
'graphs2':g[3:6], 'graphs2':g[3:6],
'last_name':u.last_name, 'last_name':u.last_name,
'first_name':u.first_name, 'first_name':u.first_name,
'teams':get_my_teams(request.user),
'interactiveplot':script, 'interactiveplot':script,
'the_div':div}) 'the_div':div})
@@ -2865,6 +2889,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
"cn_form.html", "cn_form.html",
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'id':row.id}) 'id':row.id})
else: else:
form = CNsummaryForm() form = CNsummaryForm()
@@ -2872,6 +2897,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
"cn_form.html", "cn_form.html",
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'id':row.id}) 'id':row.id})
# Get weather for given location and date/time # Get weather for given location and date/time
@@ -3108,6 +3134,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
{'workout':row, {'workout':row,
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'teams':get_my_teams(request.user),
'interactiveplot':script, 'interactiveplot':script,
'form':form, 'form':form,
'airport':airportcode, 'airport':airportcode,
@@ -3178,6 +3205,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
'streamedit.html', 'streamedit.html',
{'workout':row, {'workout':row,
'message': message, 'message': message,
'teams':get_my_teams(request.user),
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
'form':form, 'form':form,
@@ -3268,6 +3296,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'otwsetpower.html', 'otwsetpower.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'form':form, 'form':form,
@@ -3309,6 +3338,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'otwgeeky.html', 'otwgeeky.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -3317,6 +3347,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'advancededit.html', 'advancededit.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -3508,6 +3539,7 @@ def cumstats(request,theuser=0,
'cumstats.html', 'cumstats.html',
{ {
'stats':stats, 'stats':stats,
'teams':get_my_teams(request.user),
'options':options, 'options':options,
'id':theuser, 'id':theuser,
'theuser':u, 'theuser':u,
@@ -3586,6 +3618,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
'workoutstats.html', 'workoutstats.html',
{ {
'stats':stats, 'stats':stats,
'teams':get_my_teams(request.user),
'workout':row, 'workout':row,
'workstrokesonly':workstrokesonly, 'workstrokesonly':workstrokesonly,
'cordict':cordict, 'cordict':cordict,
@@ -3626,6 +3659,7 @@ def workout_advanced_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'advancedotw.html', 'advancedotw.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -3634,6 +3668,7 @@ def workout_advanced_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'advancededit.html', 'advancededit.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -3663,6 +3698,7 @@ def workout_comparison_view(request,id1=0,id2=0,xparam='distance',yparam='spm'):
'comparisonchart.html', 'comparisonchart.html',
{'interactiveplot':script, {'interactiveplot':script,
'the_div':div, 'the_div':div,
'teams':get_my_teams(request.user),
'id1':id1, 'id1':id1,
'id2':id2, 'id2':id2,
'axchoicesbasic':axchoicesbasic, 'axchoicesbasic':axchoicesbasic,
@@ -3713,6 +3749,7 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance',
'comparisonchart2.html', 'comparisonchart2.html',
{'interactiveplot':script, {'interactiveplot':script,
'the_div':div, 'the_div':div,
'teams':get_my_teams(request.user),
'id1':id1, 'id1':id1,
'id2':id2, 'id2':id2,
'axchoicesbasic':axchoicesbasic, 'axchoicesbasic':axchoicesbasic,
@@ -3873,6 +3910,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
'js_res': js_resources, 'js_res': js_resources,
'css_res':css_resources, 'css_res':css_resources,
'id':id, 'id':id,
'teams':get_my_teams(request.user),
'xparam':xparam, 'xparam':xparam,
'yparam1':yparam1, 'yparam1':yparam1,
'yparam2':yparam2, 'yparam2':yparam2,
@@ -3902,7 +3940,8 @@ def workout_flexchart3_view(request,*args,**kwargs):
'the_div':div, 'the_div':div,
'js_res': js_resources, 'js_res': js_resources,
'css_res':css_resources, 'css_res':css_resources,
'css_res':css_resources, 'teams':get_my_teams(request.user),
'id':id,
'xparam':xparam, 'xparam':xparam,
'yparam1':yparam1, 'yparam1':yparam1,
'yparam2':yparam2, 'yparam2':yparam2,
@@ -3952,6 +3991,7 @@ def workout_biginteractive_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'biginteractive1.html', 'biginteractive1.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -3993,6 +4033,7 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""):
return render(request, return render(request,
'otwinteractive.html', 'otwinteractive.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
'interactiveplot':script, 'interactiveplot':script,
@@ -4043,6 +4084,7 @@ def workout_export_view(request,id=0, message="", successmessage=""):
return render(request, return render(request,
'export.html', 'export.html',
{'workout':row, {'workout':row,
'teams':get_my_teams(request.user),
'message':message, 'message':message,
'successmessage':successmessage, 'successmessage':successmessage,
'c2userid':c2userid, 'c2userid':c2userid,
@@ -4074,6 +4116,7 @@ def workout_unsubscribe_view(request,id=0):
return render(request, return render(request,
'workout_comments.html', 'workout_comments.html',
{'workout':w, {'workout':w,
'teams':get_my_teams(request.user),
'comments':comments, 'comments':comments,
'successmessage':message, 'successmessage':message,
'form':form, 'form':form,
@@ -4158,6 +4201,7 @@ def workout_comment_view(request,id=0):
return render(request, return render(request,
'workout_comments.html', 'workout_comments.html',
{'workout':w, {'workout':w,
'teams':get_my_teams(request.user),
'graphs1':g[0:3], 'graphs1':g[0:3],
'comments':comments, 'comments':comments,
'form':form, 'form':form,
@@ -4166,6 +4210,7 @@ def workout_comment_view(request,id=0):
return render(request, return render(request,
'workout_comments.html', 'workout_comments.html',
{'workout':w, {'workout':w,
'teams':get_my_teams(request.user),
'graphs1':g[0:3], 'graphs1':g[0:3],
'graphs1':g[3:6], 'graphs1':g[3:6],
'comments':comments, 'comments':comments,
@@ -4292,6 +4337,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
return render(request, 'workout_form.html', return render(request, 'workout_form.html',
{'form':form, {'form':form,
'workout':row, 'workout':row,
'teams':get_my_teams(request.user),
'graphs1':g[0:3], 'graphs1':g[0:3],
'message': message, 'message': message,
'successmessage': successmessage, 'successmessage': successmessage,
@@ -4302,6 +4348,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
else: else:
return render(request, 'workout_form.html', return render(request, 'workout_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'workout':row, 'workout':row,
'graphs1':g[0:3], 'graphs1':g[0:3],
'graphs2':g[3:6], 'graphs2':g[3:6],
@@ -4734,6 +4781,7 @@ def workout_stravaimport_view(request,message=""):
return render(request,'strava_list_import.html', return render(request,'strava_list_import.html',
{'data':data, {'data':data,
'teams':get_my_teams(request.user),
'message':message, 'message':message,
}) })
@@ -4772,6 +4820,7 @@ def workout_runkeeperimport_view(request,message=""):
workouts.append(res) workouts.append(res)
return render(request,'runkeeper_list_import.html', return render(request,'runkeeper_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'teams':get_my_teams(request.user),
'message':message, 'message':message,
}) })
@@ -4811,6 +4860,7 @@ def workout_sporttracksimport_view(request,message=""):
workouts.append(res) workouts.append(res)
return render(request,'sporttracks_list_import.html', return render(request,'sporttracks_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'teams':get_my_teams(request.user),
'message':message, 'message':message,
}) })
@@ -4857,6 +4907,7 @@ def c2listdebug_view(request,message=""):
return render(request, return render(request,
'c2_list_import2.html', 'c2_list_import2.html',
{'workouts':workouts, {'workouts':workouts,
'teams':get_my_teams(request.user),
'message':message}) 'message':message})
# List of workouts available on Concept2 logbook - for import # List of workouts available on Concept2 logbook - for import
@@ -4898,6 +4949,7 @@ def workout_c2import_view(request,message=""):
return render(request, return render(request,
'c2_list_import2.html', 'c2_list_import2.html',
{'workouts':workouts, {'workouts':workouts,
'teams':get_my_teams(request.user),
'message':message}) 'message':message})
# Import a workout from Strava # Import a workout from Strava
@@ -5281,6 +5333,7 @@ def workout_upload_view(request,message="",
response = render(request, response = render(request,
'document_form.html', 'document_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'optionsform': optionsform, 'optionsform': optionsform,
'message':message}) 'message':message})
@@ -5290,6 +5343,7 @@ def workout_upload_view(request,message="",
optionsform = UploadOptionsForm(initial=uploadoptions) optionsform = UploadOptionsForm(initial=uploadoptions)
return render(request, 'document_form.html', return render(request, 'document_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'optionsform': optionsform, 'optionsform': optionsform,
'message':message}) 'message':message})
@@ -5305,6 +5359,7 @@ def workout_delete_confirm_view(request, id=0):
else: else:
return render(request,'workout_delete_confirm.html', return render(request,'workout_delete_confirm.html',
{'id':id, {'id':id,
'teams':get_my_teams(request.user),
'workout':row}) 'workout':row})
except Workout.DoesNotExist: except Workout.DoesNotExist:
@@ -5341,6 +5396,7 @@ def graph_delete_confirm_view(request, id=0):
else: else:
return render(request,'graphimage_delete_confirm.html', return render(request,'graphimage_delete_confirm.html',
{'id':id, {'id':id,
'teams':get_my_teams(request.user),
'graph':img}) 'graph':img})
except Workout.DoesNotExist: except Workout.DoesNotExist:
@@ -5390,10 +5446,13 @@ def graphs_view(request):
g = GraphImage.objects.filter(workout__in=workouts).order_by("-creationdatetime") g = GraphImage.objects.filter(workout__in=workouts).order_by("-creationdatetime")
if (len(g)<=5): if (len(g)<=5):
return render(request, 'list_graphs.html', return render(request, 'list_graphs.html',
return render(request, 'list_graphs.html', {'graphs1': g[0:4],
'teams':get_my_teams(request.user),
})
else: else:
return render(request, 'list_graphs.html', return render(request, 'list_graphs.html',
{'graphs1': g[0:5], {'graphs1': g[0:5],
'teams':get_my_teams(request.user),
'graphs2': g[5:10]}) 'graphs2': g[5:10]})
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("User has no rower instance") raise Http404("User has no rower instance")
@@ -5407,6 +5466,7 @@ def graph_show_view(request,id):
return render(request,'show_graph.html', return render(request,'show_graph.html',
{'graph':g, {'graph':g,
'teams':get_my_teams(request.user),
'workout':w, 'workout':w,
'rower':r,}) 'rower':r,})
@@ -5512,6 +5572,7 @@ def workout_fusion_view(request,id1=0,id2=1):
else: else:
return render(request, 'fusion.html', return render(request, 'fusion.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'workout1':w1, 'workout1':w1,
'workout2':w2, 'workout2':w2,
}) })
@@ -5521,6 +5582,7 @@ def workout_fusion_view(request,id1=0,id2=1):
return render(request, 'fusion.html', return render(request, 'fusion.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'workout1':w1, 'workout1':w1,
'workout2':w2, 'workout2':w2,
}) })
@@ -5718,6 +5780,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
{'form':form, {'form':form,
'detailform':detailform, 'detailform':detailform,
'workout':row, 'workout':row,
'teams':get_my_teams(request.user),
'intervalstats':intervalstats, 'intervalstats':intervalstats,
'nrintervals':nrintervals, 'nrintervals':nrintervals,
'message': message, 'message': message,
@@ -5785,6 +5848,7 @@ def rower_favoritecharts_view(request):
context = { context = {
'favorites_formset':favorites_formset, 'favorites_formset':favorites_formset,
'message':message, 'message':message,
'teams':get_my_teams(request.user),
'successmessage':successmessage, 'successmessage':successmessage,
} }
@@ -5828,6 +5892,7 @@ def rower_edit_view(request,message=""):
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'rower':r, 'rower':r,
'accountform':accountform, 'accountform':accountform,
@@ -5847,6 +5912,7 @@ def rower_edit_view(request,message=""):
accountform = AccountRowerForm(instance=r) accountform = AccountRowerForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'userform':userform, 'userform':userform,
'accountform':accountform, 'accountform':accountform,
@@ -5893,6 +5959,7 @@ def rower_edit_view(request,message=""):
accountform = AccountRowerForm(instance=r) accountform = AccountRowerForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'rower':r, 'rower':r,
'userform':userform, 'userform':userform,
@@ -5934,6 +6001,7 @@ def rower_edit_view(request,message=""):
powerzonesform = RowerPowerZonesForm(instance=r) powerzonesform = RowerPowerZonesForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'powerform':powerform, 'powerform':powerform,
'userform':userform, 'userform':userform,
@@ -5955,6 +6023,7 @@ def rower_edit_view(request,message=""):
message = HttpResponse("invalid form") message = HttpResponse("invalid form")
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'accountform':accountform, 'accountform':accountform,
@@ -5990,6 +6059,7 @@ def rower_edit_view(request,message=""):
successmessage = 'Account Information changed' successmessage = 'Account Information changed'
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'powerform':powerform, 'powerform':powerform,
'accountform':accountform, 'accountform':accountform,
@@ -6003,6 +6073,7 @@ def rower_edit_view(request,message=""):
powerzonesform = RowerPowerZonesForm(instance=r) powerzonesform = RowerPowerZonesForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'teams':get_my_teams(request.user),
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'powerform':powerform, 'powerform':powerform,
'accountform':accountform, 'accountform':accountform,
@@ -6024,6 +6095,7 @@ def rower_edit_view(request,message=""):
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'userform':userform, 'userform':userform,
@@ -6054,6 +6126,7 @@ def rower_revokeapp_view(request,id=0):
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'grants':grants, 'grants':grants,
}) })
@@ -6096,6 +6169,7 @@ def strokedataform(request,id=0):
return render(request, 'strokedata_form.html', return render(request, 'strokedata_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user),
'id':id, 'id':id,
}) })
elif request.method == 'POST': elif request.method == 'POST':
@@ -6104,6 +6178,7 @@ def strokedataform(request,id=0):
return render(request, 'strokedata_form.html', return render(request, 'strokedata_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user),
'id':id, 'id':id,
}) })
@@ -6281,6 +6356,7 @@ def team_view(request,id=0,message='',successmessage=''):
return render(request, 'team.html', return render(request, 'team.html',
{ {
'team':t, 'team':t,
'teams':get_my_teams(request.user),
'members':members, 'members':members,
'inviteform':inviteform, 'inviteform':inviteform,
'message':message, 'message':message,
@@ -6298,7 +6374,8 @@ def team_leaveconfirm_view(request,id=0):
return render(request,'teamleaveconfirm.html', return render(request,'teamleaveconfirm.html',
{ {
{ 'team':t,
'teams':get_my_teams(request.user),
}) })
@login_required() @login_required()
@@ -6340,6 +6417,7 @@ def rower_teams_view(request,message='',successmessage=''):
return render(request, 'teams.html', return render(request, 'teams.html',
{ {
'teams':ts, 'teams':ts,
'teams':get_my_teams(request.user),
'myteams':myteams, 'myteams':myteams,
'invites':invites, 'invites':invites,
'otherteams':otherteams, 'otherteams':otherteams,
@@ -6543,6 +6621,7 @@ def team_edit_view(request,id=0):
return render(request,'teamedit.html', return render(request,'teamedit.html',
{ {
'form':teamcreateform, 'form':teamcreateform,
'teams':get_my_teams(request.user),
'team':t, 'team':t,
}) })
@@ -6568,6 +6647,7 @@ def team_create_view(request):
return render(request,'teamcreate.html', return render(request,'teamcreate.html',
{ {
'teams':get_my_teams(request.user),
'form':teamcreateform, 'form':teamcreateform,
}) })
@@ -6583,6 +6663,7 @@ def team_deleteconfirm_view(request,id):
return render(request,'teamdeleteconfirm.html', return render(request,'teamdeleteconfirm.html',
{ {
'teams':get_my_teams(request.user),
'team':t 'team':t
}) })