Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use saved weight in timer view
Roland Geider68bab94042b1
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex 079d7383b..c174421f6 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -129,7 +129,8 @@"fields": {"comment": "","set": 1,- "reps": 8,+ "reps": 8,+ "weight": null,"order": 1,"exercise": 1}@@ -140,7 +141,8 @@"fields": {"comment": "","set": 2,- "reps": 10,+ "reps": 10,+ "weight": 15,"order": 1,"exercise": 2}@@ -151,7 +153,8 @@"fields": {"comment": "","set": 3,- "reps": 10,+ "reps": 10,+ "weight": null,"order": 1,"exercise": 2}diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 1fec04edc..cc962ed4d 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -139,26 +139,31 @@ def reps_smart_text(settings, set_obj):if len(settings) == 0:setting_text = ''setting_list = []+ weight_list = []elif len(settings) == 1:reps = settings[0].reps if settings[0].reps != 99 else u'∞'setting_text = u'{0} × {1}'.format(set_obj.sets, reps)if settings[0].weight:setting_text += ' ({0}{1})'.format(settings[0].weight, unit)setting_list = [settings[0].reps] * set_obj.sets+ weight_list = [settings[0].weight] * set_obj.setselif len(settings) > 1:tmp_reps_text = []tmp_reps = []+ tmp_weight = []for i in settings:reps = str(i.reps) if i.reps != 99 else u'∞'if i.weight:reps += ' ({0}{1})'.format(i.weight, unit)tmp_reps_text.append(reps)tmp_reps.append(i.reps)+ tmp_weight.append(i.weight)setting_text = u' – '.join(tmp_reps_text)setting_list = tmp_reps+ weight_list = tmp_weight- return setting_text, setting_list+ return setting_text, setting_list, weight_listclass WorkoutCalendar(HTMLCalendar):diff --git a/wger/manager/models.py b/wger/manager/models.pyindex e4244014f..f402d71f0 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -440,7 +440,7 @@ class Day(models.Model):setting_tmp.append(setting)# "Smart" textual representation- setting_text, setting_list = reps_smart_text(setting_tmp, set_obj)+ setting_text, setting_list, weight_list = reps_smart_text(setting_tmp, set_obj)# Flag indicating whether all exercises have settingshas_setting_tmp = True if len(setting_tmp) > 0 else False@@ -453,6 +453,7 @@ class Day(models.Model):exercise_tmp.append({'obj': exercise,'setting_obj_list': setting_tmp,'setting_list': setting_list,+ 'weight_list': weight_list,'setting_text': setting_text,'comment_list': comment_list})diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 2d9f3ad42..f7d2c9664 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -12,6 +12,8 @@## You should have received a copy of the GNU Affero General Public License+from decimal import Decimal+from django.core.cache import cachefrom wger.core.models import DaysOfWeek@@ -49,6 +51,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),'comment_list': [u'test 123'],'setting_list': [8, 8],+ 'weight_list': [None, None],'setting_obj_list': [setting_1],'setting_text': u'2 \xd7 8'}],'is_superset': False,@@ -64,8 +67,9 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),'comment_list': [u'Foobar'],'setting_list': [10, 10, 10, 10],+ 'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],- 'setting_text': u'4 \xd7 10'}],+ 'setting_text': u'4 \xd7 10 (15kg)'}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},@@ -95,6 +99,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),'comment_list': [u'Foobar'],'setting_list': [10, 10, 10, 10],+ 'weight_list': [None, None, None, None],'setting_obj_list': [Setting.objects.get(pk=3)],'setting_text': u'4 \xd7 10'}],'is_superset': False,diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 18f3156e8..954e97d28 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -242,21 +242,22 @@ class LastWeightHelper():def __init__(self, user):self.user = user- def get_last_weight(self, exercise, reps):+ def get_last_weight(self, exercise, reps, default_weight):'''Returns an emtpy string if no entry is found:param exercise::param reps:+ :param default_weight::return: WorkoutLog or '' if none is found'''- key = (self.user.pk, exercise.pk, reps)-+ key = (self.user.pk, exercise.pk, reps, default_weight)if self.last_weight_list.get(key) is None:last_log = WorkoutLog.objects.filter(user=self.user,exercise=exercise,reps=reps).order_by('-date')- weight = last_log[0].weight if last_log.exists() else ''+ default_weight = '' if default_weight is None else default_weight+ weight = last_log[0].weight if last_log.exists() else default_weightself.last_weight_list[key] = weightreturn self.last_weight_list.get(key)@@ -280,14 +281,19 @@ def timer(request, day_pk):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']:+ for key, element in enumerate(exercise_dict['setting_list']):+ reps = exercise_dict['setting_list'][key]+ default_weight = last_log.get_last_weight(exercise,+ reps,+ exercise_dict['weight_list'][key])+step_list.append({'current_step': uuid.uuid4().hex,'step_percent': 0,'step_nr': len(step_list) + 1,'exercise': exercise,'type': 'exercise','reps': reps,- 'weight': last_log.get_last_weight(exercise, reps)})+ 'weight': default_weight})if request.user.userprofile.timer_active:step_list.append({'current_step': uuid.uuid4().hex,'step_percent': 0,@@ -301,6 +307,7 @@ def timer(request, day_pk):for i in range(0, total_reps):for exercise_dict in set_dict['exercise_list']:reps = exercise_dict['setting_list'][i]+ default_weight = exercise_dict['weight_list'][i]exercise = exercise_dict['obj']step_list.append({'current_step': uuid.uuid4().hex,@@ -309,7 +316,9 @@ def timer(request, day_pk):'exercise': exercise,'type': 'exercise','reps': reps,- 'weight': last_log.get_last_weight(exercise, reps)})+ 'weight': last_log.get_last_weight(exercise,+ reps,+ default_weight)})if request.user.userprofile.timer_active:step_list.append({'current_step': uuid.uuid4().hex,