Merge branch 'release/v5.82'
This commit is contained in:
Sander Roosendaal
+68
-12
@@ -16,7 +16,7 @@ queuelow = django_rq.get_queue('low')
|
||||
queuehigh = django_rq.get_queue('low')
|
||||
|
||||
from rowers.models import (
|
||||
Rower, Workout,
|
||||
Rower, Workout,Team,
|
||||
GeoCourse, TrainingMicroCycle,TrainingMesoCycle,TrainingMacroCycle,
|
||||
TrainingPlan,PlannedSession,
|
||||
)
|
||||
@@ -71,9 +71,57 @@ def timefield_to_seconds_duration(t):
|
||||
|
||||
return duration
|
||||
|
||||
def get_session_metrics(ps):
|
||||
rowers = ps.rower.all()
|
||||
rscore = []
|
||||
trimp = []
|
||||
duration = []
|
||||
distance = []
|
||||
firstname = []
|
||||
lastname = []
|
||||
|
||||
for r in rowers:
|
||||
rscorev = 0
|
||||
trimpv = 0
|
||||
durationv = 0
|
||||
distancev = 0
|
||||
|
||||
|
||||
ws = Workout.objects.filter(user=r,plannedsession=ps)
|
||||
if len(ws) != 0:
|
||||
for w in ws:
|
||||
distancev += w.distance
|
||||
durationv += timefield_to_seconds_duration(w.duration)
|
||||
trimpv += dataprep.workout_trimp(w)
|
||||
rscorev += dataprep.workout_rscore(w)
|
||||
|
||||
|
||||
durationv /= 60.
|
||||
|
||||
trimp.append(int(trimpv))
|
||||
duration.append(int(durationv))
|
||||
distance.append(int(distancev))
|
||||
rscore.append(int(rscorev))
|
||||
firstname.append(r.user.first_name)
|
||||
lastname.append(r.user.last_name)
|
||||
|
||||
thedict = {
|
||||
'first_name':firstname,
|
||||
'last_name':lastname,
|
||||
'duration':duration,
|
||||
'distance':distance,
|
||||
'rscore':rscore,
|
||||
'trimp':trimp
|
||||
}
|
||||
|
||||
return thedict
|
||||
|
||||
def is_session_complete(r,ps):
|
||||
status = 'not done'
|
||||
|
||||
if r not in ps.rower.all():
|
||||
return 0,'not assigned'
|
||||
|
||||
ws = Workout.objects.filter(user=r,plannedsession=ps)
|
||||
|
||||
if len(ws)==0:
|
||||
@@ -208,6 +256,25 @@ def get_dates_timeperiod(timeperiod):
|
||||
|
||||
return startdate,enddate
|
||||
|
||||
def get_sessions_manager(m,teamid=0,startdate=date.today(),
|
||||
enddate=date.today()+timezone.timedelta(+1000)):
|
||||
if teamid:
|
||||
t = Team.objects.get(id=teamid)
|
||||
sps = PlannedSession.objects.filter(
|
||||
team__in=[t],
|
||||
manager=m,
|
||||
startdate__lte=enddate,
|
||||
enddate__gte=startdate,
|
||||
).order_by("startdate","enddate")
|
||||
else:
|
||||
sps = PlannedSession.objects.filter(
|
||||
manager=m,
|
||||
startdate__lte=enddate,
|
||||
enddate__gte=startdate,
|
||||
).order_by("startdate","enddate")
|
||||
|
||||
return sps
|
||||
|
||||
def get_sessions(r,startdate=date.today(),
|
||||
enddate=date.today()+timezone.timedelta(+1000)):
|
||||
|
||||
@@ -219,17 +286,6 @@ def get_sessions(r,startdate=date.today(),
|
||||
|
||||
return sps
|
||||
|
||||
def get_sessions_manager(manager,startdate=date.today(),
|
||||
enddate=date.today()+timezone.timedelta(+1000)):
|
||||
|
||||
sps = PlannedSession.objects.filter(
|
||||
manager=manager,
|
||||
startdate__lte=enddate,
|
||||
enddate__gte=startdate,
|
||||
).order_by("startdate","enddate").exclude(team__isnull=True)
|
||||
|
||||
return sps
|
||||
|
||||
def get_workouts_session(r,ps):
|
||||
ws = Workout.objects.filter(user=r,plannedsession=ps)
|
||||
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
{% extends "base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
|
||||
{% block title %}Planned Sessions{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="grid_12 alpha">
|
||||
{% include "planningbuttons.html" %}
|
||||
</div>
|
||||
<div class="grid_4 alpha">
|
||||
{% if theteam %}
|
||||
<h1>Coach Overview. Team {{ theteam.name }}</h1>
|
||||
{% else %}
|
||||
<h1>Coach Overview</h1>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div id="timeperiod" class="grid_2 dropdown">
|
||||
<button class="grid_2 alpha button gray small dropbtn">Select Time Period ({{ timeperiod|verbosetimeperiod }})</button>
|
||||
<div class="dropdown-content">
|
||||
<a class="button gray small alpha"
|
||||
href="/rowers/sessions/coach/today">
|
||||
Today
|
||||
</a>
|
||||
<a class="button gray small alpha"
|
||||
href="/rowers/sessions/coach/thisweek">
|
||||
This Week
|
||||
</a>
|
||||
<a class="button gray small alpha"
|
||||
href="/rowers/sessions/coach/thismonth">
|
||||
This Month
|
||||
</a>
|
||||
<a class="button gray small alpha"
|
||||
href="/rowers/sessions/coach/lastweek">
|
||||
Last Week
|
||||
</a>
|
||||
<a class="button gray small alpha"
|
||||
href="/rowers/sessions/coach/lastmonth/">
|
||||
Last Month
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% if user.is_authenticated and user|is_manager %}
|
||||
<div class="grid_2 dropdown">
|
||||
<button class="grid_2 alpha button green small dropbtn">
|
||||
Select Rower Individual Plan
|
||||
</button>
|
||||
<div class="dropdown-content">
|
||||
{% for member in user|team_rowers %}
|
||||
<a class="button green small" href="/rowers/sessions/{{ timeperiod }}/rower/{{ member.id }}">{{ member.user.first_name }} {{ member.user.last_name }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_2 dropdown">
|
||||
<button class="grid_2 alpha button green small dropbtn">
|
||||
Select Team
|
||||
</button>
|
||||
<div class="dropdown-content">
|
||||
<a class="button green small" href="/rowers/sessions/coach/{{ timeperiod }}">
|
||||
All Teams
|
||||
</a>
|
||||
|
||||
{% for team in myteams %}
|
||||
<a class="button green small" href="/rowers/sessions/coach/{{ timeperiod }}/team/{{ team.id }}">{{ team.name }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid_12 alpha">
|
||||
<table width="90%" class="listtable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>On or after</th>
|
||||
<th>On or before</th>
|
||||
<th>Name</th>
|
||||
{% for r in rowers %}
|
||||
<th class="rotate"><div><span>
|
||||
{{ r.user.first_name }} {{ r.user.last_name }}
|
||||
</span></div></th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for key, thedict in statusdict.items %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ thedict|lookup:'startdate'|date:"Y-m-d" }}
|
||||
</td>
|
||||
<td>
|
||||
{{ thedict|lookup:'enddate'|date:"Y-m-d" }}
|
||||
</td>
|
||||
<td>
|
||||
<a href="/rowers/sessions/{{ key }}">
|
||||
{{ thedict|lookup:'name' }}
|
||||
</a>
|
||||
</td>
|
||||
{% for r in rowers %}
|
||||
<td>
|
||||
{% if thedict|lookup:'results'|lookup:r.id == 'completed' %}
|
||||
<a class="green dot"
|
||||
href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}"> </a>
|
||||
{% elif thedict|lookup:'results'|lookup:r.id == 'partial' %}
|
||||
<a class="orange dot"
|
||||
href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}"> </a>
|
||||
{% elif thedict|lookup:'results'|lookup:r.id == 'not done' %}
|
||||
<a class="white dot"
|
||||
href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}"> </a>
|
||||
{% elif thedict|lookup:'results'|lookup:r.id == 'not assigned' %}
|
||||
|
||||
{% else %}
|
||||
<a class="red dot"
|
||||
href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}"> </a>
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% if unmatchedworkouts %}
|
||||
<h1>Workouts that are not linked to any session</h1>
|
||||
<table width="90%" class="listtable shortpadded">
|
||||
<thead>
|
||||
<tr>
|
||||
<th> Rower</th>
|
||||
<th style="width:80"> Date</th>
|
||||
<th> Time</th>
|
||||
<th> Name</th>
|
||||
<th> Type</th>
|
||||
<th> Distance </th>
|
||||
<th> Duration </th>
|
||||
<th> Avg HR </th>
|
||||
<th> Max HR </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for workout in unmatchedworkouts %}
|
||||
<tr>
|
||||
<td> {{ workout.user.user.first_name }} {{ workout.user.user.last_name }} </td>
|
||||
<td> {{ workout.date|date:"Y-m-d" }} </td>
|
||||
<td> {{ workout.starttime|date:"H:i" }} </td>
|
||||
{% if workout.user.user == user or user == team.manager %}
|
||||
{% if workout.name != '' %}
|
||||
<td>
|
||||
<a href={% url rower.defaultlandingpage id=workout.id %}>
|
||||
{{ workout.name }}
|
||||
</a>
|
||||
</td>
|
||||
{% else %}
|
||||
<td>
|
||||
<a href={% url rower.defaultlandingpage id=workout.id %}>No Name
|
||||
</a></td>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% if workout.name != '' %}
|
||||
<td><a href="/rowers/workout/{{ workout.id }}/">{{ workout.name }}</a></td>
|
||||
{% else %}
|
||||
<td><a href="/rowers/workout/{{ workout.id }}/">No Name</a> </td>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<td> {{ workout.workouttype }} </td>
|
||||
<td> {{ workout.distance }}m</td>
|
||||
<td> {{ workout.duration |durationprint:"%H:%M:%S.%f" }} </td>
|
||||
<td> {{ workout.averagehr }} </td>
|
||||
<td> {{ workout.maxhr }} </td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
{% endblock %}
|
||||
@@ -9,6 +9,17 @@
|
||||
{% include "planningbuttons.html" %}
|
||||
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
<div class="grid_2 alpha">
|
||||
{% if user.is_authenticated and psdict.id.1|is_session_manager:user %}
|
||||
<a class="button small gray" href="/rowers/sessions/{{ psdict.id.1 }}/edit">
|
||||
Edit Session</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
<div id="left" class="grid_6 alpha">
|
||||
<h1>Session {{ psdict.name.1 }}</h1>
|
||||
<table class="listtable shortpadded" width="80%">
|
||||
@@ -22,9 +33,6 @@
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
<h1>Result</h1>
|
||||
<p>Status: {{ status }}</p>
|
||||
<p>Percentage complete: {{ ratio }} </p>
|
||||
</div>
|
||||
<div id="right" class="grid_6 omega">
|
||||
<h1>Workouts attached</h1>
|
||||
@@ -53,7 +61,38 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
<div id="left" class="grid_6 alpha">
|
||||
<h1>Result</h1>
|
||||
<p>Status: {{ status }}</p>
|
||||
<p>Percentage complete: {{ ratio }} </p>
|
||||
</div>
|
||||
<div id="right" class="grid_6 omega">
|
||||
<h1>Stats</h1>
|
||||
<table class="listtable shortpadded" width="80%">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Minutes</th>
|
||||
<th>Meters</th>
|
||||
<th>rScore</th>
|
||||
<th>TRIMP</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for id, value in results.items %}
|
||||
<tr>
|
||||
<td>{{ value|lookup:'first_name' }} {{ value|lookup:'last_name' }}</td>
|
||||
<td>{{ value|lookup:'duration' }}</td>
|
||||
<td>{{ value|lookup:'distance' }}</td>
|
||||
<td>{{ value|lookup:'rscore' }}</td>
|
||||
<td>{{ value|lookup:'trimp' }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -32,12 +32,23 @@
|
||||
{% endif %}
|
||||
</p>
|
||||
</div>
|
||||
<div class="grid_2 omega">
|
||||
<div class="grid_2">
|
||||
{% if user.is_authenticated and user|is_manager %}
|
||||
{% if timeperiod %}
|
||||
<a class="button gray small" href="/rowers/sessions/teamcreate/{{ timeperiod }}">Add Team Session</a>
|
||||
{% else %}
|
||||
<a class="button gray small" href="/rowers/session/teamcreate">Add Team Session</a>
|
||||
<a class="button gray small" href="/rowers/sessions/teamcreate">Add Team Session</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2 omega">
|
||||
{% if user.is_authenticated and user|is_manager %}
|
||||
{% if timeperiod %}
|
||||
<a class="button gray small" href="/rowers/sessions/coach/{{ timeperiod }}">Coach Overview</a>
|
||||
{% else %}
|
||||
<a class="button gray small" href="/rowers/sessions/coach">Coach Overview</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
|
||||
|
||||
@@ -100,6 +100,16 @@ def ualookup(dict, key):
|
||||
|
||||
return s
|
||||
|
||||
from rowers.models import PlannedSession
|
||||
@register.filter
|
||||
def is_session_manager(id,user):
|
||||
try:
|
||||
ps = PlannedSession.objects.get(id=id)
|
||||
except PlannedSession.DoesNotExist:
|
||||
return False
|
||||
|
||||
return ps.manager == user
|
||||
|
||||
@register.filter(name='times')
|
||||
def times(number):
|
||||
return range(number)
|
||||
|
||||
@@ -448,6 +448,11 @@ urlpatterns = [
|
||||
views.plannedsessions_manage_view),
|
||||
url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)$',
|
||||
views.plannedsessions_manage_view),
|
||||
url(r'^sessions/coach$',views.plannedsessions_coach_view),
|
||||
url(r'^sessions/coach/(?P<timeperiod>[\w\ ]+.*)/team/(?P<teamid>\d+)$',
|
||||
views.plannedsessions_coach_view),
|
||||
url(r'^sessions/coach/(?P<timeperiod>[\w\ ]+.*)$',
|
||||
views.plannedsessions_coach_view),
|
||||
url(r'^sessions/?$',views.plannedsessions_view),
|
||||
url(r'^sessions/rower/(?P<rowerid>\d+)$',views.plannedsessions_view),
|
||||
url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsessions_view),
|
||||
|
||||
@@ -294,6 +294,7 @@ def calculate_age(born):
|
||||
|
||||
def my_dict_from_instance(instance,model):
|
||||
thedict = {}
|
||||
thedict['id'] = instance.id
|
||||
|
||||
for attr, value in instance.__dict__.iteritems():
|
||||
try:
|
||||
|
||||
+158
-248
@@ -166,6 +166,8 @@ class JSONResponse(HttpResponse):
|
||||
super(JSONResponse, self).__init__(content, **kwargs)
|
||||
|
||||
|
||||
|
||||
|
||||
def getrower(user):
|
||||
try:
|
||||
r = Rower.objects.get(user=user)
|
||||
@@ -176,8 +178,21 @@ def getrower(user):
|
||||
return r
|
||||
|
||||
|
||||
def get_workout(id):
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
return w
|
||||
|
||||
def get_workout_permitted(user,id):
|
||||
w = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(user,w)==False):
|
||||
raise PermissionDenied("Access denied")
|
||||
|
||||
return w
|
||||
|
||||
def getvalue(data):
|
||||
perc = 0
|
||||
@@ -513,12 +528,8 @@ def get_stored_tasks_status(request):
|
||||
|
||||
@login_required()
|
||||
def get_thumbnails(request,id):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
raise PermissionDenied("Access denied")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
|
||||
r = getrower(request.user)
|
||||
result = request.user.is_authenticated() and ispromember(request.user)
|
||||
@@ -557,13 +568,7 @@ def get_thumbnails(request,id):
|
||||
|
||||
@login_required()
|
||||
def get_testscript(request,id):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
raise PermissionDenied("Access denied")
|
||||
|
||||
row = get_workout_permitted(request.user,id)
|
||||
r = getrower(request.user)
|
||||
|
||||
object = {
|
||||
@@ -780,17 +785,6 @@ def hasplannedsessions(user):
|
||||
|
||||
return result
|
||||
|
||||
def getrower(user):
|
||||
try:
|
||||
r = Rower.objects.get(user=user)
|
||||
except Rower.DoesNotExist:
|
||||
r = Rower(user=user)
|
||||
r.save()
|
||||
|
||||
return r
|
||||
|
||||
|
||||
|
||||
# Check if a user is a Pro member
|
||||
def ispromember(user):
|
||||
if not user.is_anonymous():
|
||||
@@ -1627,10 +1621,7 @@ def workout_tcxemail_view(request,id=0):
|
||||
message = ""
|
||||
successmessage = ""
|
||||
r = getrower(request.user)
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
if (checkworkoutuser(request.user,w)):
|
||||
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False)
|
||||
if tcxfile == 0:
|
||||
@@ -1674,10 +1665,8 @@ def workout_gpxemail_view(request,id=0):
|
||||
message = ""
|
||||
successmessage = ""
|
||||
r = Rower.objects.get(user=request.user)
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,w)):
|
||||
filename = w.csvfilename
|
||||
row = rdata(filename)
|
||||
@@ -1714,10 +1703,8 @@ def workout_gpxemail_view(request,id=0):
|
||||
def workout_csvemail_view(request,id=0):
|
||||
message = ""
|
||||
r = getrower(request.user)
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,w)):
|
||||
csvfile = w.csvfilename
|
||||
res = myqueue(queuehigh,handle_sendemailcsv,r.user.first_name,
|
||||
@@ -1748,10 +1735,8 @@ def workout_csvemail_view(request,id=0):
|
||||
def workout_csvtoadmin_view(request,id=0):
|
||||
message = ""
|
||||
r = getrower(request.user)
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
|
||||
csvfile = w.csvfilename
|
||||
res = myqueue(queuehigh,
|
||||
@@ -1784,11 +1769,9 @@ def workout_tp_upload_view(request,id=0):
|
||||
return HttpResponseRedirect("/rowers/me/tpauthorize/")
|
||||
|
||||
# ready to upload. Hurray
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout_permitted(request.user,id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
if (checkworkoutuser(request.user,w)):
|
||||
tcxfile = tpstuff.createtpworkoutdata(w)
|
||||
if tcxfile:
|
||||
@@ -1841,11 +1824,8 @@ def workout_strava_upload_view(request,id=0):
|
||||
return HttpResponseRedirect("/rowers/me/stravaauthorize/")
|
||||
else:
|
||||
# ready to upload. Hurray
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout_permitted(request.user,id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
if (checkworkoutuser(request.user,w)):
|
||||
try:
|
||||
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w)
|
||||
@@ -1931,11 +1911,9 @@ def workout_strava_upload_view(request,id=0):
|
||||
def workout_c2_upload_view(request,id=0):
|
||||
message = ""
|
||||
# ready to upload. Hurray
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout(id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
|
||||
try:
|
||||
message,c2id = c2stuff.workout_c2_upload(request.user,w)
|
||||
@@ -1959,11 +1937,8 @@ def workout_c2_upload_view(request,id=0):
|
||||
@login_required()
|
||||
def workout_runkeeper_upload_view(request,id=0):
|
||||
message = ""
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout(id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
try:
|
||||
thetoken = runkeeper_open(r.user)
|
||||
@@ -2024,11 +1999,8 @@ def workout_runkeeper_upload_view(request,id=0):
|
||||
@login_required()
|
||||
def workout_underarmour_upload_view(request,id=0):
|
||||
message = ""
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout(id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
try:
|
||||
thetoken = underarmour_open(r.user)
|
||||
@@ -2091,11 +2063,8 @@ def workout_underarmour_upload_view(request,id=0):
|
||||
def workout_sporttracks_upload_view(request,id=0):
|
||||
message = ""
|
||||
# ready to upload. Hurray
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
w = get_workout(id)
|
||||
r = w.user
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
try:
|
||||
thetoken = sporttracks_open(r.user)
|
||||
@@ -2932,10 +2901,7 @@ def cum_flex(request,theuser=0,
|
||||
# Show the EMpower Oarlock generated Stroke Profile
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_forcecurve_view(request,id=0,workstrokesonly=False):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
promember=0
|
||||
mayedit=0
|
||||
@@ -2989,10 +2955,7 @@ def workout_test_task_view(request,id=0):
|
||||
# Show Stroke power histogram for a workout
|
||||
@login_required()
|
||||
def workout_histo_view(request,id=0):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
promember=0
|
||||
mayedit=0
|
||||
@@ -4081,10 +4044,7 @@ def rankings_view2(request,theuser=0,
|
||||
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_update_cp_view(request,id=0):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -4691,10 +4651,7 @@ def oterankings_view(request,theuser=0,
|
||||
# Reload the workout and calculate the summary from the stroke data (lapIDx)
|
||||
@login_required()
|
||||
def workout_recalcsummary_view(request,id=0):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -4728,10 +4685,8 @@ def workout_recalcsummary_view(request,id=0):
|
||||
def workout_makepublic_view(request,id,
|
||||
message='',
|
||||
successmessage=''):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -4762,10 +4717,7 @@ def workout_makepublic_view(request,id,
|
||||
def workout_setprivate_view(request,id,
|
||||
message='',
|
||||
successmessage=''):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -5498,10 +5450,18 @@ def multiflex_data(request,userid=0,
|
||||
datadf['days ago'] = map(lambda x : x.days, datadf.date - today)
|
||||
|
||||
if groupby != 'date':
|
||||
try:
|
||||
bins = np.arange(datadf[groupby].min()-binsize,
|
||||
datadf[groupby].max()+binsize,
|
||||
binsize)
|
||||
groups = datadf.groupby(pd.cut(datadf[groupby],bins,labels=False))
|
||||
except ValueError:
|
||||
messages.error(
|
||||
request,
|
||||
"Unable to compete. Probably not enough data selected"
|
||||
)
|
||||
url = reverse(user_multiflex_select)
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
bins = np.arange(datadf['days ago'].min()-binsize,
|
||||
datadf['days ago'].max()+binsize,
|
||||
@@ -6291,10 +6251,8 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
|
||||
workouts = paginator.page(1)
|
||||
except EmptyPage:
|
||||
workouts = paginator.page(paginator.num_pages)
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
row = get_workout(id)
|
||||
|
||||
messages.error(request,message)
|
||||
messages.info(request,successmessage)
|
||||
@@ -6371,11 +6329,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
|
||||
workouts = paginator.page(1)
|
||||
except EmptyPage:
|
||||
workouts = paginator.page(paginator.num_pages)
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
row = get_workout(id)
|
||||
|
||||
messages.info(request,successmessage)
|
||||
messages.error(request,message)
|
||||
@@ -6490,11 +6444,10 @@ def workout_view(request,id=0):
|
||||
|
||||
# Resets stroke data to raw data (pace)
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
def workout_undo_smoothenpace_view(
|
||||
request,id=0,message="",successmessage=""
|
||||
):
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -6523,10 +6476,7 @@ def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
|
||||
# Data smoothing of pace data
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -6564,10 +6514,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
|
||||
# Process CrewNerd Summary CSV and update summary
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if request.method == 'POST':
|
||||
form = CNsummaryForm(request.POST,request.FILES)
|
||||
@@ -6620,10 +6567,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
|
||||
def workout_downloadwind_view(request,id=0,
|
||||
airportcode=None,
|
||||
message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
f1 = row.csvfilename
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
@@ -6689,10 +6633,7 @@ def workout_downloadwind_view(request,id=0,
|
||||
def workout_downloadmetar_view(request,id=0,
|
||||
airportcode=None,
|
||||
message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
f1 = row.csvfilename
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
@@ -6757,10 +6698,7 @@ def workout_downloadmetar_view(request,id=0,
|
||||
# Show form to update wind data
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_wind_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -6877,10 +6815,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
|
||||
# Show form to update River stream data (for river dwellers)
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_stream_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -6946,10 +6881,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
|
||||
# Form to set average crew weight and boat type, then run power calcs
|
||||
@user_passes_test(ispromember, login_url="/",redirect_field_name=None)
|
||||
def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -7052,10 +6984,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
|
||||
|
||||
@login_required()
|
||||
def instroke_view(request,id=0):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
form = WorkoutForm(instance=row)
|
||||
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
|
||||
@@ -7085,10 +7014,7 @@ def instroke_view(request,id=0):
|
||||
# A special Edit page with all the Geeky functionality for the workout
|
||||
@login_required()
|
||||
def workout_geeky_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
form = WorkoutForm(instance=row)
|
||||
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
|
||||
@@ -7150,10 +7076,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
|
||||
# generate instroke chart
|
||||
@login_required()
|
||||
def instroke_chart(request,id=0,metric=''):
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if (checkworkoutuser(request.user,w)==False):
|
||||
message = "You are not allowed to edit this workout"
|
||||
@@ -7475,10 +7398,7 @@ def cumstats(request,theuser=0,
|
||||
def workout_stats_view(request,id=0,message="",successmessage=""):
|
||||
|
||||
r = getrower(request.user)
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
workstrokesonly = True
|
||||
if request.method == 'POST' and 'workstrokesonly' in request.POST:
|
||||
@@ -7624,10 +7544,8 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
|
||||
# The Advanced edit page
|
||||
@login_required()
|
||||
def workout_advanced_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
form = WorkoutForm(instance=row)
|
||||
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
|
||||
for i in g:
|
||||
@@ -7909,12 +7827,7 @@ def workout_workflow_view(request,id):
|
||||
request.session['referer'] = absolute(request)['PATH']
|
||||
request.session['lastworkout'] = id
|
||||
request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
raise PermissionDenied("Access denied")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
r = getrower(request.user)
|
||||
result = request.user.is_authenticated() and ispromember(request.user)
|
||||
@@ -8005,11 +7918,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
||||
except:
|
||||
favoritenr = -1
|
||||
|
||||
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
promember=0
|
||||
mayedit=0
|
||||
@@ -8228,10 +8137,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
||||
|
||||
# The interactive plot with the colored Heart rate zones
|
||||
def workout_biginteractive_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
# check if user is owner of this workout
|
||||
|
||||
@@ -8272,10 +8178,7 @@ def workout_biginteractive_view(request,id=0,message="",successmessage=""):
|
||||
|
||||
# The interactive plot with wind corrected pace for OTW outings
|
||||
def workout_otwpowerplot_view(request,id=0,message="",successmessage=""):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
# check if user is owner of this workout
|
||||
|
||||
@@ -8315,10 +8218,7 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""):
|
||||
@login_required()
|
||||
def workout_export_view(request,id=0, message="", successmessage=""):
|
||||
request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
try:
|
||||
thetoken = c2_open(request.user)
|
||||
@@ -8375,10 +8275,7 @@ def workout_export_view(request,id=0, message="", successmessage=""):
|
||||
#
|
||||
@login_required()
|
||||
def workout_unsubscribe_view(request,id=0):
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if w.privacy == 'private' and w.user.user != request.user:
|
||||
return HttpResponseForbidden("Permission error")
|
||||
@@ -8408,10 +8305,7 @@ def workout_unsubscribe_view(request,id=0):
|
||||
# list of comments to a workout
|
||||
@login_required()
|
||||
def workout_comment_view(request,id=0):
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if w.privacy == 'private' and w.user.user != request.user:
|
||||
return HttpResponseForbidden("Permission error")
|
||||
@@ -8511,12 +8405,9 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
request.session['referer'] = absolute(request)['PATH']
|
||||
|
||||
|
||||
try:
|
||||
# check if valid ID exists (workout exists)
|
||||
row = Workout.objects.get(id=id)
|
||||
row = get_workout(id)
|
||||
|
||||
form = WorkoutForm(instance=row)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
if request.method == 'POST':
|
||||
# Form was submitted
|
||||
@@ -8598,11 +8489,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
#else: # form not POSTed
|
||||
form = WorkoutForm(instance=row)
|
||||
|
||||
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
|
||||
for i in g:
|
||||
@@ -8690,12 +8577,7 @@ def workout_map_view(request,id=0):
|
||||
request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
|
||||
request.session['referer'] = absolute(request)['PATH']
|
||||
|
||||
|
||||
try:
|
||||
# check if valid ID exists (workout exists)
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
# create interactive plot
|
||||
f1 = row.csvfilename
|
||||
@@ -8745,13 +8627,8 @@ def workout_edit_view_navionics(request,id=0,message="",successmessage=""):
|
||||
request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
|
||||
request.session['referer'] = absolute(request)['PATH']
|
||||
|
||||
|
||||
try:
|
||||
# check if valid ID exists (workout exists)
|
||||
row = Workout.objects.get(id=id)
|
||||
row = get_workout(id)
|
||||
form = WorkoutForm(instance=row)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
if request.method == 'POST':
|
||||
# Form was submitted
|
||||
@@ -8829,11 +8706,7 @@ def workout_edit_view_navionics(request,id=0,message="",successmessage=""):
|
||||
#else: # form not POSTed
|
||||
form = WorkoutForm(instance=row)
|
||||
|
||||
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout(id)
|
||||
|
||||
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
|
||||
for i in g:
|
||||
@@ -8918,10 +8791,7 @@ def workout_uploadimage_view(request,id):
|
||||
|
||||
r = getrower(request.user)
|
||||
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
if not checkworkoutuser(request.user,w):
|
||||
raise PermissionDenied("You are not allowed to edit this workout")
|
||||
@@ -9002,10 +8872,8 @@ def workout_uploadimage_view(request,id):
|
||||
# Generic chart creation
|
||||
@login_required()
|
||||
def workout_add_chart_view(request,id,plotnr=1):
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
|
||||
w = get_workout(id)
|
||||
|
||||
plotnr = int(plotnr)
|
||||
|
||||
@@ -9360,10 +9228,7 @@ def workout_getstravaworkout_view(request,stravaid):
|
||||
id,message = add_workout_from_strokedata(request.user,stravaid,data,strokedata,
|
||||
source='strava',
|
||||
workoutsource='strava')
|
||||
try:
|
||||
w = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
w = get_workout(id)
|
||||
|
||||
w.uploadedtostrava=stravaid
|
||||
w.save()
|
||||
@@ -9664,16 +9529,8 @@ def workout_toggle_ranking(request,id=0):
|
||||
if request.is_ajax():
|
||||
is_ajax = True
|
||||
|
||||
try:
|
||||
# check if valid ID exists (workout exists)
|
||||
row = Workout.objects.get(id=id)
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
if not checkworkoutuser(request.user,row):
|
||||
raise PermissionDenied("You are not allowed to change this workout")
|
||||
|
||||
# we are still here - we own the workout
|
||||
row.rankingpiece = not row.rankingpiece
|
||||
row.save()
|
||||
|
||||
@@ -10398,12 +10255,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
|
||||
# Split a workout
|
||||
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
|
||||
def workout_split_view(request,id=id):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
raise PermissionDenied("You are not allowed to edit this workout")
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
r = row.user
|
||||
|
||||
@@ -10533,12 +10385,7 @@ def workout_fusion_view(request,id1=0,id2=1):
|
||||
@login_required()
|
||||
def workout_summary_edit_view(request,id,message="",successmessage=""
|
||||
):
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
raise PermissionDenied("You are not allowed to edit this workout")
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
s = ""
|
||||
# still here - this is a workout we may edit
|
||||
@@ -11175,12 +11022,8 @@ def strokedatajson(request,id):
|
||||
POST: Add Stroke data to workout
|
||||
GET: Get stroke data of workout
|
||||
"""
|
||||
try:
|
||||
row = Workout.objects.get(id=id)
|
||||
if (checkworkoutuser(request.user,row)==False):
|
||||
return HttpResponseForbidden("Permission error")
|
||||
except Workout.DoesNotExist:
|
||||
raise Http404("Workout doesn't exist")
|
||||
row = get_workout_permitted(request.user,id)
|
||||
|
||||
try:
|
||||
id = int(id)
|
||||
except ValueError:
|
||||
@@ -12011,6 +11854,68 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
|
||||
'plannedsessions':sps,
|
||||
})
|
||||
|
||||
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
|
||||
redirect_field_name=None)
|
||||
def plannedsessions_coach_view(request,timeperiod='thisweek',
|
||||
teamid=0):
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(timeperiod)
|
||||
|
||||
if teamid != 0:
|
||||
try:
|
||||
theteam = Team.objects.get(id=teamid)
|
||||
except Team.DoesNotExist:
|
||||
theteam = False
|
||||
else:
|
||||
theteam = False
|
||||
|
||||
sps = get_sessions_manager(request.user,teamid=teamid,
|
||||
enddate=enddate,
|
||||
startdate=startdate)
|
||||
|
||||
rowers = []
|
||||
for ps in sps:
|
||||
rowers += ps.rower.all()
|
||||
|
||||
rowers = list(set(rowers))
|
||||
|
||||
statusdict = {}
|
||||
|
||||
for ps in sps:
|
||||
rowerstatus = {}
|
||||
for r in rowers:
|
||||
ratio, status = is_session_complete(r,ps)
|
||||
rowerstatus[r.id] = status
|
||||
sessiondict = {
|
||||
'results':rowerstatus,
|
||||
'name': ps.name,
|
||||
'startdate': ps.startdate,
|
||||
'enddate': ps.enddate,
|
||||
}
|
||||
statusdict[ps.id] = sessiondict
|
||||
|
||||
unmatchedworkouts = []
|
||||
for r in rowers:
|
||||
unmatchedworkouts += Workout.objects.filter(
|
||||
user=r,
|
||||
plannedsession=None,
|
||||
date__gte=startdate,date__lte=enddate)
|
||||
|
||||
|
||||
myteams = Team.objects.filter(manager=request.user)
|
||||
|
||||
return render(request,'plannedsessionscoach.html',
|
||||
{
|
||||
'myteams':myteams,
|
||||
'plannedsessions':sps,
|
||||
'statusdict':statusdict,
|
||||
'timeperiod':timeperiod,
|
||||
'rowers':rowers,
|
||||
'theteam':theteam,
|
||||
'unmatchedworkouts':unmatchedworkouts,
|
||||
'rower':getrower(request.user)
|
||||
}
|
||||
)
|
||||
|
||||
@login_required()
|
||||
def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
|
||||
@@ -12319,6 +12224,7 @@ def plannedsession_view(request,id=0,rowerid=0):
|
||||
|
||||
m = getrower(request.user)
|
||||
|
||||
|
||||
if not rowerid:
|
||||
r = m
|
||||
else:
|
||||
@@ -12333,8 +12239,11 @@ def plannedsession_view(request,id=0,rowerid=0):
|
||||
if ps.manager != request.user and r not in ps.rower.all():
|
||||
raise PermissionDenied("You do not have access to this session")
|
||||
|
||||
resultsdict = get_session_metrics(ps)
|
||||
resultsdict = pd.DataFrame(resultsdict).transpose().to_dict()
|
||||
|
||||
psdict = my_dict_from_instance(ps,PlannedSession)
|
||||
print psdict
|
||||
|
||||
ws = get_workouts_session(r,ps)
|
||||
|
||||
@@ -12353,7 +12262,8 @@ def plannedsession_view(request,id=0,rowerid=0):
|
||||
'manager':m,
|
||||
'rower':r,
|
||||
'ratio':ratio,
|
||||
'status':status
|
||||
'status':status,
|
||||
'results':resultsdict,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -142,6 +142,7 @@ cox {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
.shortpadded td { padding: 3px 3px }
|
||||
|
||||
.paddedtable td { padding: 1px 20px }
|
||||
|
||||
Reference in New Issue
Block a user