Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add method to generate a canonical representation of a workout
Roland Geider18d25ebd23e1
diff --git a/wger/manager/models.py b/wger/manager/models.pyindex d5f9cf199..5b083464d 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -65,8 +65,10 @@ class Workout(models.Model):Model for a training schedule'''- # Metaclass to set some other propertiesclass Meta:+ '''+ Meta class to set some other properties+ '''ordering = ["-creation_date", ]creation_date = models.DateField(_('Creation date'), auto_now_add=True)@@ -81,7 +83,7 @@ class Workout(models.Model):'''Returns the canonical URL to view a workout'''- return reverse('wger.manager.views.workout.view', kwargs={'id': self.id})+ return reverse('workout-view', kwargs={'id': self.id})def __unicode__(self):'''@@ -98,6 +100,25 @@ class Workout(models.Model):'''return self+ @property+ def canonical_representation(self):+ '''+ Returns a canonical representation of the workout+ '''+ canonical_repr = []+ for day in self.day_set.select_related():+ tmp_days_of_week = []+ for day_of_week in day.day.select_related():+ tmp_days_of_week.append(day_of_week)++ canonical_repr.append({'obj': day,+ 'days_of_week': {+ 'text': u', '.join([unicode(_(i.day_of_week))+ for i in tmp_days_of_week]),+ 'day_list': tmp_days_of_week},+ 'set_list': day.canonical_representation})+ return canonical_repr+class ScheduleManager(models.Manager):'''@@ -351,6 +372,50 @@ class Day(models.Model):reset_day_template_cache(self.pk)super(Day, self).delete(*args, **kwargs)+ @property+ def canonical_representation(self):+ '''+ Returns a canonical representation of the day+ '''+ canonical_repr = []++ for set_obj in self.set_set.select_related():+ exercise_tmp = []+ for exercise in set_obj.exercises.select_related():+ setting_tmp = []+ for setting in Setting.objects.filter(set=set_obj,+ exercise=exercise).order_by('order'):+ setting_tmp.append(setting)++ if len(setting_tmp) > 1:+ tmp_reps_text = []+ tmp_reps = []+ for i in setting_tmp:+ reps = str(i.reps) if i.reps != 99 else '∞'+ tmp_reps_text.append(reps)+ tmp_reps.append(i.reps)++ setting_text = ' – '.join(tmp_reps_text)+ setting_list = tmp_reps+ else:+ reps = setting_tmp[0].reps if setting_tmp[0].reps != 99 else '∞'+ setting_text = u'{0} × {1}'.format(set_obj.sets, reps)+ setting_list = [reps] * set_obj.sets+ exercise_tmp.append({'obj': exercise,+ 'setting_obj_list': setting_tmp,+ 'setting_list': setting_list,+ 'setting_text': setting_text})++ if len(exercise_tmp) > 1:+ is_superset = True+ else:+ is_superset = False+ canonical_repr.append({'obj': set_obj,+ 'exercise_list': exercise_tmp,+ 'is_superset': is_superset})++ return canonical_repr+class Set(models.Model):'''@@ -540,7 +605,6 @@ class WorkoutLog(models.Model):class UserProfile(models.Model):-GENDER_MALE = '1'GENDER_FEMALE = '2'@@ -724,8 +788,7 @@ by the US Department of Agriculture. It is extremely complete, with aroundrate = ((10 * self.weight) # in kg+ (6.25 * self.height) # in cm- (5 * self.age) # in years- + factor- )+ + factor)except TypeError:# Any of the entries is missingrate = 0@@ -780,9 +843,9 @@ by the US Department of Agriculture. It is extremely complete, with around'''if (not WeightEntry.objects.filter(user=self.user).exists()- or (datetime.date.today()- - WeightEntry.objects.filter(user=self.user).latest().creation_date- > datetime.timedelta(1))):+ or (datetime.date.today()+ - WeightEntry.objects.filter(user=self.user).latest().creation_date+ > datetime.timedelta(1))):entry = WeightEntry()entry.weight = weightentry.user = self.user@@ -802,4 +865,5 @@ def create_user_profile(sender, instance, created, **kwargs):if created:UserProfile.objects.create(user=instance)+post_save.connect(create_user_profile, sender=User)diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex ff9620e09..d61b12c76 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -183,8 +183,10 @@ $(document).ready(function() {<h2>{% trans "Your workout today" %}</h2><div class="filler_div">- {% for exercise in exercise_list %}- {{exercise}}<br>+ {% for set in canonical_day %}+ {% for exercise in set.exercise_list %}+ {{exercise.obj}}: {{exercise.setting_text}}<br>+ {% endfor %}{% endfor %}</div><!--diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pynew file mode 100644index 000000000..6d3eae882--- /dev/null+++ b/wger/manager/tests/test_workout_canonical.py@@ -0,0 +1,77 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++from wger.exercises.models import Exercise+from wger.manager.models import Workout+from wger.manager.models import DaysOfWeek+from wger.manager.models import Day+from wger.manager.models import Set+from wger.manager.models import Setting++from wger.manager.tests.testcase import WorkoutManagerTestCase+++class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):+ '''+ Tests the canonical form for a workout+ '''+ maxDiff = None++ def test_canonical_form(self):+ '''+ Tests the canonical form for a workout+ '''++ workout = Workout.objects.get(pk=1)+ setting_1 = Setting.objects.get(pk=1)+ setting_2 = Setting.objects.get(pk=2)+ canonical_form = [{'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)],+ 'text': u'Tuesday'},+ 'obj': Day.objects.get(pk=1),+ 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),+ 'setting_list': [8, 8],+ 'setting_obj_list': [setting_1],+ 'setting_text': u'2 \xd7 8'}],+ 'is_superset': False,+ 'obj': Set.objects.get(pk=1)}]},+ {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)],+ 'text': u'Thursday'},+ 'obj': Day.objects.get(pk=2),+ 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),+ 'setting_list': [10, 10, 10, 10],+ 'setting_obj_list': [setting_2],+ 'setting_text': u'4 \xd7 10'}],+ 'is_superset': False,+ 'obj': Set.objects.get(pk=2)}]},+ {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)],+ 'text': u'Friday'},+ 'obj': Day.objects.get(pk=4),+ 'set_list': []}]++ self.assertEqual(workout.canonical_representation, canonical_form)++ def test_canonical_form_day(self):+ '''+ Tests the canonical form for a day+ '''++ day = Day.objects.get(pk=5)+ canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),+ 'setting_list': [10, 10, 10, 10],+ 'setting_obj_list': [Setting.objects.get(pk=3)],+ 'setting_text': u'4 \xd7 10'}],+ 'is_superset': False,+ 'obj': Set.objects.get(pk=3)}]++ self.assertEqual(day.canonical_representation, canonical_form)diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 9a57ddf31..3bc643c3e 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -234,70 +234,81 @@ class WorkoutEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):login_required = True+def get_last_weight(user, exercise, reps):+ '''+ Helper function to retrieve the last workout log for a certain+ user, exercise and repetition combination. Returns an emtpy string+ if no entry is found++ :param user:+ :param exercise:+ :param reps:+ :return: WorkoutLog or '' if none is found+ '''+ last_log = WorkoutLog.objects.filter(user=user,+ exercise=exercise,+ reps=reps).order_by('-date')+ if last_log.exists():+ weight = last_log[0].weight+ else:+ weight = ''++ return weight++@login_requireddef timer(request, pk):'''The timer view ("gym mode") for a workout'''- context = {}-day = Day.objects.get(pk=pk, training__user=request.user)+ canonical_day = day.canonical_representation+ context = {}context['day'] = day- exercise_list = []step_list = []- for set_obj in day.set_set.select_related():-- is_superset = False if set_obj.exercises.select_related().count() == 1 else True- tmp_2 = []-- for exercise in set_obj.exercises.select_related():-- exercise_list.append(exercise)-- # 'compact' means that there is only one setting object, e.g: the set has- # set.sets = 4 and there is only one setting: setting.reps = 10, total: 4x10- # Not compact settings have an entry for each repetition:- # set.sets = 4 and four setting objects: setting.reps = 10, 8, 8, 6- is_compact = False \- if Setting.objects.filter(set=set_obj, exercise=exercise).count() == 1 \- else True- logger.debug('is_compact: {0}'.format(is_compact))-- for setting in Setting.objects.filter(set=set_obj, exercise=exercise).order_by('order'):-- # To find out the last weight, look if the user has already- # a log with same exercise and repetitions and use the last one.- last_log = WorkoutLog.objects.filter(user=request.user,- exercise=exercise,- reps=setting.reps).order_by('-date')- if last_log.exists():- weight = last_log[0].weight- else:- weight = ''-- # Set range- if not is_compact:- set_range = range(0, set_obj.sets)- else:- set_range = (0, )-- for i in set_range:- tmp_2.append({'current_step': uuid.uuid4().hex,- 'exercise': exercise,- 'type': 'exercise',- 'weight': weight,- 'reps': setting.reps})-- tmp_2.append({'current_step': uuid.uuid4().hex,- 'type': 'pause',- 'time': 30})-- step_list = step_list + tmp_2+ for set_dict in canonical_day:++ if not set_dict['is_superset']:+ for exercise_dict in set_dict['exercise_list']:+ exercise = exercise_dict['obj']+ for reps in exercise_dict['setting_list']:++ step_list.append({'current_step': uuid.uuid4().hex,+ 'exercise': exercise,+ 'type': 'exercise',+ 'reps': reps,+ 'weight': get_last_weight(user=request.user,+ exercise=exercise,+ reps=reps)})++ step_list.append({'current_step': uuid.uuid4().hex,+ 'type': 'pause',+ 'time': 30})++ # Supersets need extra work to group the exercises and reps together+ else:+ total_reps = len(set_dict['exercise_list'][0]['setting_list'])+ for i in range(0, total_reps):+ for exercise_dict in set_dict['exercise_list']:+ reps = exercise_dict['setting_list'][i]+ exercise = exercise_dict['obj']++ step_list.append({'current_step': uuid.uuid4().hex,+ 'exercise': exercise,+ 'type': 'exercise',+ 'reps': reps,+ 'weight': get_last_weight(user=request.user,+ exercise=exercise,+ reps=reps)})++ step_list.append({'current_step': uuid.uuid4().hex,+ 'type': 'pause',+ 'time': 30})context['step_list'] = step_list- context['exercise_list'] = exercise_list+ context['canonical_day'] = canonical_dayreturn render_to_response('workout/timer.html',context,context_instance=RequestContext(request))