Private
Public Access
1
0

adding timed courses to workout view and edit view

This commit is contained in:
Sander Roosendaal
2021-10-08 16:37:13 +02:00
parent e604350e23
commit d526646410
3 changed files with 34 additions and 1 deletions

View File

@@ -106,6 +106,16 @@ $('#id_workouttype').change();
<a href="/rowers/workout/{{ workout.id|encode }}/">https://rowsandall.com/rowers/workout/{{ workout.id|encode }}/</a> <a href="/rowers/workout/{{ workout.id|encode }}/">https://rowsandall.com/rowers/workout/{{ workout.id|encode }}/</a>
</td> </td>
</tr> </tr>
{% for course in courses %}
<tr>
<th>
Timed Course:
</th>
<td>
<a href="/rowers/courses/{{ course.id }}"/>{{ course }}</a>
</td>
</tr>
{% endfor %}
</table> </table>
</li> </li>
<li class="grid_2"> <li class="grid_2">

View File

@@ -104,6 +104,16 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% for course in courses %}
<tr>
<th>
Timed Course:
</th>
<td>
<a href="/rowers/courses/{{ course.id }}"/>{{ course }}</a>
</td>
</tr>
{% endfor %}
</table> </table>
</li> </li>
<li class="grid_2"> <li class="grid_2">

View File

@@ -2364,7 +2364,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
else: # pragma: no cover else: # pragma: no cover
hascoordinates = 0 hascoordinates = 0
courses = []
if hascoordinates: if hascoordinates:
if intervaldata: # pragma: no cover if intervaldata: # pragma: no cover
rowdata.df['reltime'] = rowdata.df['TimeStamp (sec)']-rowdata.df.loc[0,'TimeStamp (sec)'] 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'] latitudes = rowdata.df[' latitude']
longitudes = rowdata.df[' longitude'] longitudes = rowdata.df[' longitude']
mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,raceresult=raceresult) 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: else:
@@ -2414,6 +2417,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
'mapscript':mapscript, 'mapscript':mapscript,
'mapdiv':mapdiv, 'mapdiv':mapdiv,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'courses':courses,
'the_div':div}) 'the_div':div})
@@ -4446,6 +4450,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
rowdata = rdata(csvfile=f1) rowdata = rdata(csvfile=f1)
hascoordinates = 1 hascoordinates = 1
courses = []
if rowdata != 0: if rowdata != 0:
try: try:
latitude = rowdata.df[' latitude'] latitude = rowdata.df[' latitude']
@@ -4457,6 +4462,8 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
except (KeyError,AttributeError): except (KeyError,AttributeError):
hascoordinates = 0 hascoordinates = 0
else: # pragma: no cover else: # pragma: no cover
hascoordinates = 0 hascoordinates = 0
@@ -4473,6 +4480,11 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
except KeyError: # pragma: no cover except KeyError: # pragma: no cover
pass 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 = [ breadcrumbs = [
{ {
'url':'/rowers/list-workouts/', 'url':'/rowers/list-workouts/',
@@ -4510,6 +4522,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
'mapscript':mapscript, 'mapscript':mapscript,
'mapdiv':mapdiv, 'mapdiv':mapdiv,
'rower':r, 'rower':r,
'courses':courses,
}) })