Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Small improvements to the text representation of the slot

Roland Geider1cd27e06bd17
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 21bd0547f..73c871e51 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -101,14 +101,18 @@ class SetConfigData:
reps = f'{reps}-{max_reps}'
unit = ''
- if self.reps_unit not in (1, 2):
- unit = _(RepetitionUnit.objects.get(pk=self.reps_unit).name)
+ if self.reps_unit in (1, 2) and not self.weight:
+ unit = _('Reps')
elif self.reps_unit == 2:
unit = '∞'
reps = ''
+ elif self.reps_unit not in (1, 2):
+ unit = _(RepetitionUnit.objects.get(pk=self.reps_unit).name)
out.append(f'{reps} {unit}'.strip())
- out.append('×')
+
+ if self.weight:
+ out.append('×')
if self.weight:
weight = round_value(self.weight, self.weight_rounding)
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 2c2a30b7f..1695e0e9f 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -45,7 +45,7 @@ class Migration(migrations.Migration):
),
),
('name', models.CharField(max_length=20, verbose_name='Description')),
- ('description', models.CharField(max_length=250, verbose_name='Description')),
+ ('description', models.CharField(max_length=1000, verbose_name='Description')),
('is_rest', models.BooleanField(default=False)),
('last_day_in_week', models.BooleanField(default=False)),
('need_logs_to_advance', models.BooleanField(default=False)),
diff --git a/wger/manager/migrations/0019_flexible_routines_migration.py b/wger/manager/migrations/0019_flexible_routines_migration.py
index fb830a33f..5dfaaa504 100644
--- a/wger/manager/migrations/0019_flexible_routines_migration.py
+++ b/wger/manager/migrations/0019_flexible_routines_migration.py
@@ -21,6 +21,7 @@ def migrate_routines(apps) -> dict[int, Any]:
DayNg = apps.get_model('manager', 'DayNg')
Slot = apps.get_model('manager', 'Slot')
SlotConfig = apps.get_model('manager', 'SlotConfig')
+ SetsConfig = apps.get_model('manager', 'SetsConfig')
WeightConfig = apps.get_model('manager', 'WeightConfig')
RepsConfig = apps.get_model('manager', 'RepsConfig')
RiRConfig = apps.get_model('manager', 'RiRConfig')
@@ -32,7 +33,7 @@ def migrate_routines(apps) -> dict[int, Any]:
next_monday = workout.creation_date + timedelta(days=7 - workout.creation_date.weekday())
routine = Routine(
- name=workout.name,
+ name=workout.name[:50],
description=workout.description,
user=workout.user,
created=workout.creation_date,
@@ -65,13 +66,13 @@ def migrate_routines(apps) -> dict[int, Any]:
day = workout.day_set.filter(day__id=i).first()
if day:
- current_day.description = day.description
+ current_day.name = day.description if len(day.description) <= 50 else f'Day {i}'
+ current_day.description = day.description if len(day.description) > 50 else ''
current_day.is_rest = False
current_day.need_logs_to_advance = False
current_day.save()
# Set the exercises and repetitions
- # TODO: properly handle number of sets
for set_obj in day.set_set.all():
slot = Slot(day=current_day, comment=set_obj.comment, order=set_obj.order)
slot.save()
@@ -117,6 +118,13 @@ def migrate_routines(apps) -> dict[int, Any]:
replace=True,
).save()
+ SetsConfig(
+ slot_config=slot_config,
+ value=set_obj.sets,
+ iteration=1,
+ replace=True,
+ ).save()
+
routine.first_day = day_dict[1]
routine.save()
return workouts_to_routines
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 816d132a3..866e8d48c 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -66,11 +66,11 @@ class Day(models.Model):
name = models.CharField(
max_length=20,
- verbose_name=_('Description'),
+ verbose_name=_('Name'),
)
description = models.CharField(
- max_length=250,
+ max_length=1000,
verbose_name=_('Description'),
)
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index 77bc29d92..52888939d 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -56,7 +56,7 @@ class SetConfigDataTestCase(WgerTestCase):
def test_text_repr_no_weight(self):
self.config.weight = None
- self.assertEqual(self.config.text_repr, '4 × @ 3 RiR')
+ self.assertEqual(self.config.text_repr, '4 Reps @ 3 RiR')
def test_text_repr_sets(self):
self.config.sets = 3
@@ -72,6 +72,12 @@ class SetConfigDataTestCase(WgerTestCase):
self.config.reps_unit = 3
self.assertEqual(self.config.text_repr, '90 Seconds × 20 kg @ 3 RiR')
+ def test_text_repr_reps_unit_no_weight(self):
+ self.config.reps = 90
+ self.config.reps_unit = 3
+ self.config.weight = None
+ self.assertEqual(self.config.text_repr, '90 Seconds @ 3 RiR')
+
def test_text_repr_reps_rounding(self):
self.config.reps = 4.72
self.config.reps_rounding = 2.5