Self hosted FLOSS fitness/workout, nutrition and weight tracker
decimal field in RPE
Tony6c2ccd72f195
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 54e879449..b55c6e9d6 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -210,7 +210,7 @@ def reps_smart_text(settings, set_obj):"""if setting.rpe:- rpe = "{0} RPE".format(setting.rpe)+ rpe = "{0} RPE".format(normalize_decimal(setting.rpe))else:rpe = ""return rpediff --git a/wger/manager/migrations/0010_auto_20201111_2157.py b/wger/manager/migrations/0010_auto_20201111_2157.pynew file mode 100644index 000000000..39cbc2fb6--- /dev/null+++ b/wger/manager/migrations/0010_auto_20201111_2157.py@@ -0,0 +1,18 @@+# 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.pynew file mode 100644index 000000000..3670a2bee--- /dev/null+++ b/wger/manager/migrations/0011_auto_20201111_2201.py@@ -0,0 +1,18 @@+# 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 7e4cc608a..f63bc2bde 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -653,9 +653,12 @@ 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), (8, 8), (9, 9), (10, 10)]- rpe = models.IntegerField(verbose_name=_('rpe'),+ 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,+ decimal_places=1,+ max_digits=3,blank=True,null=True,choices=NUMBERS)