Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

display secondary muscle on workout page

alois594abbd2fb62
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 4872ff7fc..6b1ccaa48 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -117,6 +117,8 @@ class Workout(models.Model):
day_canonical_repr = []
muscles_front = []
muscles_back = []
+ muscles_front_secondary = []
+ muscles_back_secondary = []
# Sort list by weekday
day_list = [i for i in self.day_set.select_related()]
@@ -132,13 +134,19 @@ class Workout(models.Model):
for i in canonical_repr_day['muscles']['back']:
if i not in muscles_back:
muscles_back.append(i)
+ for i in canonical_repr_day['muscles']['frontsecondary']:
+ if i not in muscles_front_secondary:
+ muscles_front_secondary.append(i)
+ for i in canonical_repr_day['muscles']['backsecondary']:
+ if i not in muscles_back_secondary:
+ muscles_back_secondary.append(i)
day_canonical_repr.append(canonical_repr_day)
workout_canonical_form = {'obj': self,
- 'muscles': {'front': muscles_front, 'back': muscles_back},
+ 'muscles': {'front': muscles_front, 'back': muscles_back, 'frontsecondary':muscles_front_secondary, 'backsecondary': muscles_back_secondary },
'day_list': day_canonical_repr}
-
+ print(workout_canonical_form)
# Save to cache
cache.set(cache_mapper.get_workout_canonical(self.pk), workout_canonical_form)
@@ -426,6 +434,9 @@ class Day(models.Model):
canonical_repr = []
muscles_front = []
muscles_back = []
+ muscles_front_secondary = []
+ muscles_back_secondary = []
+
for set_obj in self.set_set.select_related():
exercise_tmp = []
@@ -440,6 +451,12 @@ class Day(models.Model):
elif not muscle.is_front and muscle.id not in muscles_back:
muscles_back.append(muscle.id)
+ for muscle in exercise.muscles_secondary.all():
+ if muscle.is_front and muscle.id not in muscles_front:
+ muscles_front_secondary.append(muscle.id)
+ elif not muscle.is_front and muscle.id not in muscles_back:
+ muscles_back_secondary.append(muscle.id)
+
for setting in Setting.objects.filter(set=set_obj,
exercise=exercise).order_by('order', 'id'):
setting_tmp.append(setting)
@@ -495,7 +512,9 @@ class Day(models.Model):
'has_settings': has_setting_tmp,
'muscles': {
'back': muscles_back,
- 'front': muscles_front
+ 'front': muscles_front,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_front_secondary
}})
# Days of the week
@@ -510,7 +529,9 @@ class Day(models.Model):
'day_list': tmp_days_of_week},
'muscles': {
'back': muscles_back,
- 'front': muscles_front
+ 'front': muscles_front,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_front_secondary
},
'set_list': canonical_repr}
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 92daec482..1262b78d1 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -93,6 +93,14 @@ def view(request, pk):
if i not in muscles_back:
muscles_back.append('images/muscles/main/muscle-{0}.svg'.format(i))
+ for i in canonical['muscles']['frontsecondary']:
+ if i not in muscles_front:
+ muscles_front.append('images/muscles/secondary/muscle-{0}.svg'.format(i))
+ for i in canonical['muscles']['backsecondary']:
+ if i not in muscles_back:
+ muscles_back.append('images/muscles/secondary/muscle-{0}.svg'.format(i))
+
+
# Append the silhouette of the human body as the last entry so the browser
# renders it in the background
muscles_front.append('images/muscles/muscular_system_front.svg')