Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Improve the workout page when exercises don't have repetitions.

Roland Geidercfd982921cc0
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 88b614c6f..04aac8015 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -432,6 +432,7 @@ class Day(models.Model):
for set_obj in self.set_set.select_related():
exercise_tmp = []
+ has_setting_tmp = True
for exercise in set_obj.exercises.select_related():
setting_tmp = []
@@ -449,6 +450,9 @@ class Day(models.Model):
# "Smart" textual representation
setting_text, setting_list = reps_smart_text(setting_tmp, set_obj)
+ # Flag indicating whether all exercises have settings
+ has_setting_tmp = True if len(setting_tmp) > 0 else False
+
# Exercise comments
comment_list = []
for i in exercise.exercisecomment_set.all():
@@ -480,6 +484,7 @@ class Day(models.Model):
canonical_repr.append({'obj': set_obj,
'exercise_list': exercise_tmp,
'is_superset': True if len(exercise_tmp) > 1 else False,
+ 'has_settings': has_setting_tmp,
'muscles': {
'back': muscles_back,
'front': muscles_front
diff --git a/wger/manager/templates/mobile/tags/render_day.html b/wger/manager/templates/mobile/tags/render_day.html
index 242d8dfad..3cd5bdf97 100644
--- a/wger/manager/templates/mobile/tags/render_day.html
+++ b/wger/manager/templates/mobile/tags/render_day.html
@@ -111,23 +111,24 @@
</li>
{% for set in day.set_list %}
<li id="set-{{ set.obj.id }}" data-icon="false">
- <a href="#editoptions-set-{{ set.obj.id }}"
- data-rel="popup"
- data-position-to="window">
+ {% if set.has_settings %}
+ <a href="#editoptions-set-{{ set.obj.id }}"
+ data-rel="popup"
+ data-position-to="window">
+ {% else %}
+ <a href="{% url 'set-edit' set.obj.id %}">
+ {% endif %}
{% for exercise in set.exercise_list %}
<div id="exercise-{{ exercise.obj.id }}" class="ajax-set-edit-target">
<h3>{{ exercise.obj.name }}</h3>
+ <p><strong>{{exercise.setting_text}}</strong></p>
- <p><strong>
- {{exercise.setting_text}}
- </strong></p>
{% if not exercise.setting_list %}
- <a href="{% url 'set-edit' set.obj.id %}"
- data-role="button">
- {% trans "This exercise has no repetitions." %}
- {% trans "Edit them now."%}
- </a>
+ <p>
+ {% trans "This exercise has no repetitions." %}<br>
+ {% trans "Edit them now."%}
+ </p>
{% endif %}
<p class="exercise-comments">
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 7545e31f8..430ad5917 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -52,6 +52,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_obj_list': [setting_1],
'setting_text': u'2 \xd7 8'}],
'is_superset': False,
+ 'has_settings': True,
'muscles': {'back': [2], 'front': [1]},
'obj': Set.objects.get(pk=1)}]}
self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form)
@@ -66,6 +67,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_obj_list': [setting_2],
'setting_text': u'4 \xd7 10'}],
'is_superset': False,
+ 'has_settings': True,
'muscles': {'back': [2], 'front': []},
'obj': Set.objects.get(pk=2)}]}
self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form)
@@ -85,8 +87,6 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
day = Day.objects.get(pk=5)
weekday1 = DaysOfWeek.objects.get(pk=3)
weekday2 = DaysOfWeek.objects.get(pk=5)
- #import pprint
- #pprint.pprint(day.canonical_representation)
self.assertEqual(day.canonical_representation['days_of_week'],
{'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'})
self.assertEqual(day.canonical_representation['muscles'], {'back': [2], 'front': []})
@@ -98,6 +98,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_obj_list': [Setting.objects.get(pk=3)],
'setting_text': u'4 \xd7 10'}],
'is_superset': False,
+ 'has_settings': True,
'muscles': {'back': [2], 'front': []},
'obj': Set.objects.get(pk=3)}]