Self hosted FLOSS fitness/workout, nutrition and weight tracker
Polish RiR feature
Roland Geider9a99d32affa8
diff --git a/wger/core/templates/tags/render_weight_log.html b/wger/core/templates/tags/render_weight_log.htmlindex 6622f33c3..ac984906f 100644--- a/wger/core/templates/tags/render_weight_log.html+++ b/wger/core/templates/tags/render_weight_log.html@@ -24,7 +24,12 @@<tr><td class="text-right">{{entry.reps}}</td><td class="text-center" style="padding:0px;">×</td>- <td style="padding:0px;">{{entry.weight}}</td>+ <td style="padding:0px;">+ {{entry.weight}}+ {% if entry.rir %}+ {{ entry.rir }} {% trans "RiR" %}+ {% endif %}+ </td></tr>{% endfor %}</tbody>diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex b53221a64..069e372c7 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -134,7 +134,8 @@"weight_unit_id": 1,"weight": null,"order": 1,- "exercise": 1+ "exercise": 1,+ "rir": 3}},{diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex 20720332c..00dcc9efe 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -52,6 +52,7 @@ from wger.core.models import ()from wger.exercises.models import Exercisefrom wger.manager.models import (+ RIR_OPTIONS,Day,Set,Setting,@@ -130,6 +131,10 @@ class WorkoutLogForm(ModelForm):weight = DecimalField(label=_('Weight'),initial=0,required=False)+ rir = ChoiceField(label=_('RiR'),++ choices=RIR_OPTIONS,+ required=False)class Meta:model = WorkoutLog@@ -142,11 +147,11 @@ class WorkoutLogFormHelper(FormHelper):self.form_method = 'post'self.layout = Layout(Row(- Column('reps', css_class='form-group col-md-2 col-2 mb-0'),- Column('repetition_unit', css_class='form-group col-md-3 col-3 mb-0'),- Column('weight', css_class='form-group col-md-2 col-2 mb-0'),- Column('weight_unit', css_class='form-group col-md-3 col-3 mb-0'),- Column('rpe', css_class='form-group col-md-2 col-2 mb-0'),+ Column('reps', css_class='form-group col-2 mb-0'),+ Column('repetition_unit', css_class='form-group col-3 mb-0'),+ Column('weight', css_class='form-group col-2 mb-0'),+ Column('weight_unit', css_class='form-group col-3 mb-0'),+ Column('rir', css_class='form-group col-2 mb-0'),css_class='form-row'),)diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex b55c6e9d6..586125608 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -204,16 +204,16 @@ def reps_smart_text(settings, set_obj)::return setting_text, setting_list:"""- def get_rpe_representation(setting):+ def get_rir_representation(setting):"""- Returns the representation for the rpe for a setting+ Returns the representation for the RepsInReserve for a setting"""- if setting.rpe:- rpe = "{0} RPE".format(normalize_decimal(setting.rpe))+ if setting.rir:+ rir = "{0} RiR".format(normalize_decimal(setting.rir))else:- rpe = ""- return rpe+ rir = ""+ return rirdef get_reps_reprentation(setting, rep_unit):"""@@ -269,7 +269,7 @@ def reps_smart_text(settings, set_obj):reps = get_reps_reprentation(settings[0], rep_unit)weight_unit = settings[0].weight_unitweight = normalize_weight(settings[0])- rpe = get_rpe_representation(settings[0])+ rir = get_rir_representation(settings[0])setting_text = '{0} × {1}'.format(set_obj.sets, reps).strip()setting_list_text = '{0} {1}'.format(reps, rep_unit).strip()@@ -277,12 +277,12 @@ def reps_smart_text(settings, set_obj):setting_text += ' ({0} {1}'.format(weight, weight_unit)setting_list_text += ' ({0} {1}'.format(weight, weight_unit)- setting_text += ', {0})'.format(rpe) if rpe else ')'- setting_list_text += ', {0})'.format(rpe) if rpe else ')'+ setting_text += ', {0})'.format(rir) if rir else ')'+ setting_list_text += ', {0})'.format(rir) if rir else ')'else:- setting_text += ' ({0})'.format(rpe) if rpe else ''- setting_list_text += ' ({0})'.format(rpe) if rpe else ''+ setting_text += ' ({0})'.format(rir) if rir else ''+ setting_list_text += ' ({0})'.format(rir) if rir else ''setting_list = [setting_list_text] * set_obj.setsreps_list = [settings[0].reps] * set_obj.sets@@ -303,12 +303,12 @@ def reps_smart_text(settings, set_obj):rep_unit = get_weight_unit_reprentation(setting)reps = get_reps_reprentation(setting, rep_unit)weight = normalize_weight(setting)- rpe = get_rpe_representation(setting)+ rir = get_rir_representation(setting)if weight:reps += ' ({0} {1}'.format(weight, setting.weight_unit)- reps += ', {0})'.format(rpe) if rpe else ')'+ reps += ', {0})'.format(rir) if rir else ')'else:- reps += ' ({0})'.format(rpe) if rpe else ''+ reps += ' ({0})'.format(rir) if rir else ''tmp_reps_text.append(reps)tmp_reps.append(setting.reps)diff --git a/wger/manager/migrations/0009_auto_20201202_1455.py b/wger/manager/migrations/0009_auto_20201202_1455.pynew file mode 100644index 000000000..46ea860c6--- /dev/null+++ b/wger/manager/migrations/0009_auto_20201202_1455.py@@ -0,0 +1,23 @@+# Generated by Django 3.1.3 on 2020-12-02 13:55++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ('manager', '0008_auto_20190618_1617'),+ ]++ operations = [+ migrations.AddField(+ model_name='setting',+ name='rir',+ field=models.DecimalField(blank=True, choices=[(None, '------'), (0, 1), (0.5, 0.5), (1, 1), (1.5, 1.5), (2, 2), (2.5, 2.5), (3, 3), (3.5, 3.5), (4, 4)], decimal_places=1, max_digits=3, null=True, verbose_name='RiR'),+ ),+ migrations.AddField(+ model_name='workoutlog',+ name='rir',+ field=models.DecimalField(blank=True, choices=[(None, '------'), (0, 1), (0.5, 0.5), (1, 1), (1.5, 1.5), (2, 2), (2.5, 2.5), (3, 3), (3.5, 3.5), (4, 4)], decimal_places=1, max_digits=3, null=True, verbose_name='RiR'),+ ),+ ]diff --git a/wger/manager/migrations/0009_setting_rpe.py b/wger/manager/migrations/0009_setting_rpe.pydeleted file mode 100644index 7d3009b2e..000000000--- a/wger/manager/migrations/0009_setting_rpe.py+++ /dev/null@@ -1,21 +0,0 @@-# -*- coding: utf-8 -*--# flake8: noqa-# Generated by Django 3.1.2 on 2020-11-01 09:59-from __future__ import unicode_literals--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('manager', '0008_auto_20190618_1617'),- ]-- operations = [- migrations.AddField(- model_name='setting',- name='rpe',- field=models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10)], default=5, null=True, verbose_name='rpe'),- ),- ]diff --git a/wger/manager/migrations/0010_auto_20201111_2157.py b/wger/manager/migrations/0010_auto_20201111_2157.pydeleted file mode 100644index 91cfb0105..000000000--- a/wger/manager/migrations/0010_auto_20201111_2157.py+++ /dev/null@@ -1,21 +0,0 @@-# Generated by Django 3.1.3 on 2020-11-11 20:57--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('manager', '0009_setting_rpe'),- ]-- operations = [- migrations.AlterField(- model_name='setting',- name='rpe',- field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5),- (6, 6), (7, 7), (8, 8), (9, 9),- (10, 10)], decimal_places=1, default=5,- max_digits=3, null=True, verbose_name='rpe'),- ),- ]diff --git a/wger/manager/migrations/0011_auto_20201111_2201.py b/wger/manager/migrations/0011_auto_20201111_2201.pydeleted file mode 100644index 3126e4509..000000000--- a/wger/manager/migrations/0011_auto_20201111_2201.py+++ /dev/null@@ -1,22 +0,0 @@-# Generated by Django 3.1.3 on 2020-11-11 21:01--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('manager', '0010_auto_20201111_2157'),- ]-- operations = [- migrations.AlterField(- model_name='setting',- name='rpe',- field=models.DecimalField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5),- (6, 6), (7, 7), (7.5, 7.5), (8, 8),- (8.5, 8.5), (9, 9), (9.5, 9.5),- (10, 10)], decimal_places=1, default=5,- max_digits=3, null=True, verbose_name='rpe'),- ),- ]diff --git a/wger/manager/models.py b/wger/manager/models.pyindex f63bc2bde..108a8cd09 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -55,6 +55,16 @@ from wger.utils.fields import Html5DateFieldlogger = logging.getLogger(__name__)+RIR_OPTIONS = [(None, '------'),+ (0, 1),+ (0.5, 0.5),+ (1, 1),+ (1.5, 1.5),+ (2, 2),+ (2.5, 2.5),+ (3, 3),+ (3.5, 3.5),+ (4, 4)]## Classes@@ -653,20 +663,16 @@ class Setting(models.Model):"""The weight unit of a set. This can be e.g. kg, lb, km/h, etc."""- NUMBERS = [(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (7.5, 7.5), (8, 8),- (8.5, 8.5), (9, 9), (9.5, 9.5), (10, 10)]- rpe = models.DecimalField(verbose_name=_('rpe'),- default=5,++ rir = models.DecimalField(verbose_name=_('RiR'),decimal_places=1,max_digits=3,blank=True,null=True,- choices=NUMBERS)-+ choices=RIR_OPTIONS)"""- RPE is expressed in a number from 1 to 10; 1 being very easy and 10 being the most intense a- movement could be without failing. RPE with halves is sometimes used, e.g. RPE of 7,5; 8,5; 9,5- to have slightly more values to add more nuance.+ Reps in reserve, RiR. The amount of reps that could realistically still be+ done in the set."""order = models.IntegerField(blank=True,@@ -760,6 +766,17 @@ class WorkoutLog(models.Model):date = Html5DateField(verbose_name=_('Date'))+ rir = models.DecimalField(verbose_name=_('RiR'),+ decimal_places=1,+ max_digits=3,+ blank=True,+ null=True,+ choices=RIR_OPTIONS)+ """+ Reps in reserve, RiR. The amount of reps that could realistically still be+ done in the set.+ """+# Metaclass to set some other propertiesclass Meta:ordering = ["date", "reps"]diff --git a/wger/manager/templates/log/add.html b/wger/manager/templates/log/add.htmlindex 477864612..7fe64fe3e 100644--- a/wger/manager/templates/log/add.html+++ b/wger/manager/templates/log/add.html@@ -49,10 +49,11 @@ $(document).ready(function () {</label></div><div class="row">- <div class="col-md-2 col-3">{% trans "Amount" %}</div>- <div class="col-md-4 col-3">{% trans "Unit" %}</div>- <div class="col-md-2 col-3">{% trans "Weight" %}</div>- <div class="col-md-4 col-3">{% trans "Unit" %}</div>+ <div class="col-2">{% trans "Amount" %}</div>+ <div class="col-3">{% trans "Unit" %}</div>+ <div class="col-2">{% trans "Weight" %}</div>+ <div class="col-3">{% trans "Unit" %}</div>+ <div class="col-2">{% trans "RiR" %}</div></div>{% for form in value.forms %}{% crispy form helper %}diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.htmlindex f9cadf7c1..3c5a7ada9 100644--- a/wger/manager/templates/set/formset.html+++ b/wger/manager/templates/set/formset.html@@ -6,6 +6,13 @@</label>{{ formset.management_form }}+ <div class="row">+ <div class="col-2">{% trans "Amount" %}</div>+ <div class="col-3">{% trans "Unit" %}</div>+ <div class="col-2">{% trans "Weight" %}</div>+ <div class="col-3">{% trans "Unit" %}</div>+ <div class="col-2">{% trans "RiR" %}</div>+ </div>{% for field in formset %}{% crispy field helper %}{% endfor %}diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex 9954f716e..6c1051f66 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -204,10 +204,12 @@ class WeightLogOverviewAddTestCase(WgerTestCase):'form-0-repetition_unit': 1,'form-0-weight': 10,'form-0-weight_unit': 1,+ 'form-0-rir': '1','form-1-reps': 10,'form-1-repetition_unit': 1,'form-1-weight': 10,'form-1-weight_unit': 1,+ 'form-1-rir': '2','form-TOTAL_FORMS': 3,'form-INITIAL_FORMS': 0,'form-MAX-NUM_FORMS': 3@@ -333,7 +335,8 @@ class WeightLogEntryEditTestCase(WgerTestCase):'repetition_unit': 2,'weight_unit': 3,'weight': 10,- 'exercise': 1+ 'exercise': 1,+ 'rir': 2})date_after = WorkoutLog.objects.get(pk=1).datediff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 08b336522..f3c489093 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -78,12 +78,12 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):{'image': image2, 'is_main': False}],'comment_list': ['test 123'],'has_weight': False,- 'setting_list': ['8 (5 RPE)',- '8 (5 RPE)'],+ 'setting_list': ['8 (3 RiR)',+ '8 (3 RiR)'],'reps_list': [8, 8],'weight_list': [None, None],'setting_obj_list': [setting_1],- 'setting_text': '2 \xd7 8 (5 RPE)',+ 'setting_text': '2 \xd7 8 (3 RiR)','repetition_units': [repetition_unit,repetition_unit],'weight_units': [weight_unit,@@ -125,14 +125,13 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'comment_list': ['Foobar'],'has_weight': True,'reps_list': [10, 10, 10, 10],- 'setting_list': ['10 (15 kg, 5 RPE)',- '10 (15 kg, 5 RPE)',- '10 (15 kg, 5 RPE)',- '10 (15 kg, 5 RPE)'],+ 'setting_list': ['10 (15 kg)',+ '10 (15 kg)',+ '10 (15 kg)',+ '10 (15 kg)'],'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],- 'setting_text': '4 \xd7 10 (15 kg, 5 RPE'- ')',+ 'setting_text': '4 \xd7 10 (15 kg)','repetition_units': [repetition_unit,repetition_unit,repetition_unit,@@ -202,11 +201,10 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'comment_list': ['Foobar'],'reps_list': [10, 10, 10, 10],'has_weight': False,- 'setting_list': ['10 (5 RPE)', '10 (5 RPE)',- '10 (5 RPE)', '10 (5 RPE)'],+ 'setting_list': ['10', '10', '10', '10'],'weight_list': [None, None, None, None],'setting_obj_list': [Setting.objects.get(pk=3)],- 'setting_text': '4 \xd7 10 (5 RPE)',+ 'setting_text': '4 \xd7 10','repetition_units': [repetition_unit,repetition_unit,repetition_unit,diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 4ff7e38a1..ffa656dd3 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -55,7 +55,7 @@ logger = logging.getLogger(__name__)# ************************# Set functions# ************************-SETTING_FORMSET_FIELDS = ('reps', 'repetition_unit', 'weight', 'weight_unit', 'rpe')+SETTING_FORMSET_FIELDS = ('reps', 'repetition_unit', 'weight', 'weight_unit', 'rir')SettingFormset = modelformset_factory(Setting,form=SettingForm,