Private
Public Access
1
0

adding steps to workout view

This commit is contained in:
Sander Roosendaal
2021-02-13 19:58:39 +01:00
parent 5c5000a7b4
commit 08cd56cba1
3 changed files with 21 additions and 1 deletions

View File

@@ -189,6 +189,15 @@ def ps_dict_get_description(d):
return s
def ps_dict_get_description_html(d):
s = '<ul>'
steps = d['steps']
for step in steps:
s += '<li>'+step_to_string(step)+'</li>'
s += '</ul>'
return s
class FitWorkoutSteps(object):
@@ -1130,7 +1139,7 @@ def update_plannedsession(ps,cd):
f = cd['fitfile']
filename, path_and_filename = handle_uploaded_file(f)
ps.fitfile.name = filename
ps.save()

View File

@@ -39,6 +39,10 @@
{% endfor %}
{% endfor %}
</table>
{% if steps %}
<h2>Steps</h2>
<p>{{ steps|safe }}</p>
{% endif %}
</li>
<li class="grid_2">
{% if plannedsession.sessiontype == 'test' or plannedsession.sessiontype == 'coursetest' or plannedsession.sessiontype == 'fastest_distance' or plannedsession.sessiontype == 'fastest_time' %}

View File

@@ -2114,6 +2114,12 @@ def plannedsession_view(request,id=0,userid=0):
comments = PlannedSessionComment.objects.filter(plannedsession=ps).order_by("created")
steps = ''
if ps.steps_json:
d = json.loads(ps.steps_json)
steps = ps_dict_get_description_html(d)
return render(request,'plannedsessionview.html',
{
'psdict': psdict,
@@ -2138,6 +2144,7 @@ def plannedsession_view(request,id=0,userid=0):
'coursescript': coursescript,
'coursediv': coursediv,
'comments': comments,
'steps':steps,
}
)