Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add multiplier field to the repetition units

Roland Geider5566a2ff08ff
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bfdcfbc8..28eb9ba40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,6 @@
# Changelog for the next release
+<https://github.com/wger-project/wger/pull/2137>
+Add more information to the repetition units in the routines. This will allow
+us to e.g. properly handle time units in the mobile app, e.g. by showing a
+timer or similar
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 90b016fa7..a7e84c8ec 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -187,7 +187,7 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):
class Meta:
model = RepetitionUnit
- fields = ('id', 'name', 'unit_type')
+ fields = ('id', 'name', 'unit_type', 'multiplier')
class RoutineWeightUnitSerializer(serializers.ModelSerializer):
diff --git a/wger/core/fixtures/setting_repetition_units.json b/wger/core/fixtures/setting_repetition_units.json
index f2a5853dd..55b65047b 100644
--- a/wger/core/fixtures/setting_repetition_units.json
+++ b/wger/core/fixtures/setting_repetition_units.json
@@ -3,7 +3,8 @@
"pk": 1,
"fields": {
"name": "Repetitions",
- "unit_type": "REPETITIONS"
+ "unit_type": "REPETITIONS",
+ "multiplier": 1
},
"model": "core.repetitionunit"
},
@@ -11,7 +12,8 @@
"pk": 2,
"fields": {
"name": "Until Failure",
- "unit_type": "REPETITIONS"
+ "unit_type": "REPETITIONS",
+ "multiplier": null
},
"model": "core.repetitionunit"
},
@@ -19,7 +21,8 @@
"pk": 3,
"fields": {
"name": "Seconds",
- "unit_type": "TIME"
+ "unit_type": "TIME",
+ "multiplier": 1
},
"model": "core.repetitionunit"
},
@@ -27,7 +30,8 @@
"pk": 4,
"fields": {
"name": "Minutes",
- "unit_type": "TIME"
+ "unit_type": "TIME",
+ "multiplier": 60
},
"model": "core.repetitionunit"
},
@@ -35,7 +39,8 @@
"pk": 5,
"fields": {
"name": "Miles",
- "unit_type": "DISTANCE"
+ "unit_type": "DISTANCE",
+ "multiplier": 1609
},
"model": "core.repetitionunit"
},
@@ -43,7 +48,8 @@
"pk": 6,
"fields": {
"name": "Kilometers",
- "unit_type": "DISTANCE"
+ "unit_type": "DISTANCE",
+ "multiplier": 1000
},
"model": "core.repetitionunit"
},
@@ -52,7 +58,17 @@
"pk": 7,
"fields": {
"name": "Max Reps",
- "unit_type": "REPETITIONS"
+ "unit_type": "REPETITIONS",
+ "multiplier": null
+ }
+ },
+ {
+ "model": "core.repetitionunit",
+ "pk": 8,
+ "fields": {
+ "name": "Meters",
+ "unit_type": "DISTANCE",
+ "multiplier": 1
}
}
]
diff --git a/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py b/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
index eb0de694c..55c3e34cf 100644
--- a/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
+++ b/wger/core/migrations/0021_add_unit_type_to_repetitionunit.py
@@ -20,21 +20,21 @@ def set_unit_types(apps, schema_editor):
# Time-based units
RepetitionUnit.objects.filter(id__in=[3, 4]).update(unit_type='TIME')
+ RepetitionUnit.objects.filter(id=3).update(multiplier=1) # Seconds -> base unit for time
+ RepetitionUnit.objects.filter(id=4).update(multiplier=60) # Minutes -> 60 seconds
# Distance-based units
- RepetitionUnit.objects.filter(id__in=[5, 6]).update(unit_type='DISTANCE')
+ RepetitionUnit.objects.filter(id__in=[5, 6, 8]).update(unit_type='DISTANCE')
+ RepetitionUnit.objects.filter(id=8).update(multiplier=1) # Meters -> base unit for distance
+ RepetitionUnit.objects.filter(id=6).update(multiplier=1000) # Kilometers -> 1000 meters
+ RepetitionUnit.objects.filter(id=5).update(multiplier=1609) # Miles -> 1609 meters
# Repetition-based units (already default, but explicit for clarity)
RepetitionUnit.objects.filter(id__in=[1, 2, 7]).update(unit_type='REPETITIONS')
-
-
-def reverse_unit_types(apps, schema_editor):
- """Reverse migration - no action needed since field will be removed"""
- pass
+ RepetitionUnit.objects.filter(id=1).update(multiplier=1)
class Migration(migrations.Migration):
-
dependencies = [
('core', '0020_add_trophies_enabled_to_userprofile'),
]
@@ -55,5 +55,19 @@ class Migration(migrations.Migration):
verbose_name='Unit Type',
),
),
- migrations.RunPython(set_unit_types, reverse_unit_types),
+ migrations.AddField(
+ model_name='repetitionunit',
+ name='multiplier',
+ field=models.PositiveIntegerField(
+ blank=True,
+ help_text='Multiplier to convert this unit to a base unit. Time units are converted\n to seconds, distance units to meters, and repetitions remain unchanged. For example:\n minutes -> 60, kilometers -> 1000. Leave empty if a multiplier does not apply.',
+ null=True,
+ verbose_name='Multiplier',
+ ),
+ ),
+ migrations.AlterModelOptions(
+ name='repetitionunit',
+ options={'ordering': ['unit_type', 'name']},
+ ),
+ migrations.RunPython(set_unit_types, reverse_code=migrations.RunPython.noop),
]
diff --git a/wger/core/models/rep_unit.py b/wger/core/models/rep_unit.py
index fc3490787..8be0ea459 100644
--- a/wger/core/models/rep_unit.py
+++ b/wger/core/models/rep_unit.py
@@ -40,10 +40,12 @@ class RepetitionUnit(models.Model):
"""
ordering = [
+ 'unit_type',
'name',
]
name = models.CharField(max_length=100, verbose_name=_('Name'))
+
unit_type = models.CharField(
max_length=20,
choices=UNIT_TYPE_CHOICES,
@@ -52,6 +54,15 @@ class RepetitionUnit(models.Model):
help_text=_('The type of unit (repetitions, time, or distance)'),
)
+ multiplier = models.PositiveIntegerField(
+ null=True,
+ blank=True,
+ verbose_name='Multiplier',
+ help_text="""Multiplier to convert this unit to a base unit. Time units are converted
+ to seconds, distance units to meters, and repetitions remain unchanged. For example:
+ minutes -> 60, kilometers -> 1000. Leave empty if a multiplier does not apply.""",
+ )
+
def __str__(self):
"""
Return a more human-readable representation
diff --git a/wger/core/tests/test_repetition_unit.py b/wger/core/tests/test_repetition_unit.py
index 354eee515..d8649e529 100644
--- a/wger/core/tests/test_repetition_unit.py
+++ b/wger/core/tests/test_repetition_unit.py
@@ -123,7 +123,7 @@ class EditTestCase(WgerEditTestCase):
pk = 1
object_class = RepetitionUnit
url = 'core:repetition-unit:edit'
- data = {'name': 'Furlongs'}
+ data = {'name': 'Furlongs', 'unit_type': RepetitionUnit.UNIT_TYPE_DISTANCE, 'multiplier': 201}
user_success = ('admin',)
user_fail = (
'general_manager1',
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index d654c0137..4d2c37389 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -74,7 +74,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = RepetitionUnit
- fields = ('name',)
+ fields = ('name', 'unit_type', 'multiplier')
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.change_repetitionunit'
diff --git a/wger/i18n.tpl b/wger/i18n.tpl
index b2674c353..371c6e2ed 100644
--- a/wger/i18n.tpl
+++ b/wger/i18n.tpl
@@ -35,6 +35,7 @@
{% translate "Swiss Ball" %}
{% translate "Triceps" %}
{% translate "Until Failure" %}
+{% translate "Meters" %}
{% translate "kg" %}
{% translate "lb" %}
{% translate "none (bodyweight exercise)" %}