adding timed courses to workout view and edit view
This commit is contained in:
@@ -106,6 +106,16 @@ $('#id_workouttype').change();
|
||||
<a href="/rowers/workout/{{ workout.id|encode }}/">https://rowsandall.com/rowers/workout/{{ workout.id|encode }}/</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% for course in courses %}
|
||||
<tr>
|
||||
<th>
|
||||
Timed Course:
|
||||
</th>
|
||||
<td>
|
||||
<a href="/rowers/courses/{{ course.id }}"/>{{ course }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</li>
|
||||
<li class="grid_2">
|
||||
|
||||
@@ -104,6 +104,16 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% for course in courses %}
|
||||
<tr>
|
||||
<th>
|
||||
Timed Course:
|
||||
</th>
|
||||
<td>
|
||||
<a href="/rowers/courses/{{ course.id }}"/>{{ course }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</li>
|
||||
<li class="grid_2">
|
||||
|
||||
@@ -2364,7 +2364,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
|
||||
else: # pragma: no cover
|
||||
hascoordinates = 0
|
||||
|
||||
|
||||
courses = []
|
||||
if hascoordinates:
|
||||
if intervaldata: # pragma: no cover
|
||||
rowdata.df['reltime'] = rowdata.df['TimeStamp (sec)']-rowdata.df.loc[0,'TimeStamp (sec)']
|
||||
@@ -2375,6 +2375,9 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
|
||||
latitudes = rowdata.df[' latitude']
|
||||
longitudes = rowdata.df[' longitude']
|
||||
mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,raceresult=raceresult)
|
||||
records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id)
|
||||
if records.count()>0:
|
||||
courses = list(set([record.course for record in records]))
|
||||
|
||||
|
||||
else:
|
||||
@@ -2414,6 +2417,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
|
||||
'mapscript':mapscript,
|
||||
'mapdiv':mapdiv,
|
||||
'teams':get_my_teams(request.user),
|
||||
'courses':courses,
|
||||
'the_div':div})
|
||||
|
||||
|
||||
@@ -4446,6 +4450,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
rowdata = rdata(csvfile=f1)
|
||||
|
||||
hascoordinates = 1
|
||||
courses = []
|
||||
if rowdata != 0:
|
||||
try:
|
||||
latitude = rowdata.df[' latitude']
|
||||
@@ -4457,6 +4462,8 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
except (KeyError,AttributeError):
|
||||
hascoordinates = 0
|
||||
|
||||
|
||||
|
||||
else: # pragma: no cover
|
||||
hascoordinates = 0
|
||||
|
||||
@@ -4473,6 +4480,11 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
except KeyError: # pragma: no cover
|
||||
pass
|
||||
|
||||
records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id)
|
||||
if records.count()>0:
|
||||
courses = list(set([record.course for record in records]))
|
||||
|
||||
|
||||
breadcrumbs = [
|
||||
{
|
||||
'url':'/rowers/list-workouts/',
|
||||
@@ -4510,6 +4522,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
'mapscript':mapscript,
|
||||
'mapdiv':mapdiv,
|
||||
'rower':r,
|
||||
'courses':courses,
|
||||
})
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user