diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 66698eaa..64142b46 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -189,6 +189,15 @@ def ps_dict_get_description(d): return s +def ps_dict_get_description_html(d): + s = '' + 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() diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index 8dc378e4..a95a619f 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -39,6 +39,10 @@ {% endfor %} {% endfor %} + {% if steps %} +

Steps

+

{{ steps|safe }}

+ {% endif %}
  • {% if plannedsession.sessiontype == 'test' or plannedsession.sessiontype == 'coursetest' or plannedsession.sessiontype == 'fastest_distance' or plannedsession.sessiontype == 'fastest_time' %} diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 14e0f728..6ec7be5d 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -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, } )