Self hosted FLOSS fitness/workout, nutrition and weight tracker
Show set units in timer page as well
Roland Geider44c29a6f9f90
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex 908993783..dd00b0171 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -323,9 +323,18 @@ $(document).ready(function() {<div class="sub_header"><h2>{% if step.weight %}- {{step.reps}} × {{step.weight}} {% trans_weight_unit 'kg' user %}+ {{step.reps}}+ {% if step.unit.id != 1 %}+ {{ step.unit }}+ {% endif %}+ × {{step.weight}} {% trans_weight_unit 'kg' user %}{% else %}- {% if step.reps == 99 %}∞{% else %}{{step.reps}}{% endif %} {% trans "reps" %}+ {% if step.reps == 99 %}∞{% else %}{{step.reps}}{% endif %}+ {% if step.unit.id != 1 %}+ {{ step.unit }}+ {% else %}+ {% trans "reps" %}+ {% endif %}{% endif %}</h2></div>diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 92daec482..97d784143 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -291,6 +291,7 @@ def timer(request, day_pk):exercise = exercise_dict['obj']for key, element in enumerate(exercise_dict['reps_list']):reps = exercise_dict['reps_list'][key]+ unit = exercise_dict['setting_units'][key]default_weight = last_log.get_last_weight(exercise,reps,exercise_dict['weight_list'][key])@@ -301,6 +302,7 @@ def timer(request, day_pk):'exercise': exercise,'type': 'exercise','reps': reps,+ 'unit': unit,'weight': default_weight})if request.user.userprofile.timer_active:step_list.append({'current_step': uuid.uuid4().hex,@@ -315,6 +317,7 @@ def timer(request, day_pk):for i in range(0, total_reps):for exercise_dict in set_dict['exercise_list']:reps = exercise_dict['reps_list'][i]+ unit = exercise_dict['setting_units'][i]default_weight = exercise_dict['weight_list'][i]exercise = exercise_dict['obj']@@ -324,6 +327,7 @@ def timer(request, day_pk):'exercise': exercise,'type': 'exercise','reps': reps,+ 'unit': unit,'weight': last_log.get_last_weight(exercise,reps,default_weight)})