Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add a type to the day model as well
Roland Geider037fa290e088
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 7bba11366..3ef22477d 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -74,6 +74,7 @@ class DayNgSerializer(serializers.ModelSerializer):'is_rest','last_day_in_week','need_logs_to_advance',+ 'type',)@@ -306,6 +307,7 @@ class SetConfigDataSerializer(serializers.Serializer):rir = serializers.DecimalField(max_digits=5, decimal_places=2)rest = serializers.DecimalField(max_digits=5, decimal_places=2)type = serializers.CharField()+ text_repr = serializers.CharField()class SetExerciseDataSerializer(serializers.Serializer):diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex 3f1178881..4e9926a26 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -27,6 +27,23 @@ class Migration(migrations.Migration):verbose_name='ID',),),+ (+ 'type',+ models.CharField(+ choices=[+ ('normal', 'Normal'),+ ('enom', 'Emom'),+ ('amrap', 'Amrap'),+ ('hiit', 'Hiit'),+ ('tabata', 'Tabata'),+ ('edt', 'Edt'),+ ('rft', 'Rft'),+ ('afap', 'Afap'),+ ],+ default='normal',+ max_length=10,+ ),+ ),('name', models.CharField(max_length=20, verbose_name='Description')),('description', models.CharField(max_length=250, verbose_name='Description')),('is_rest', models.BooleanField(default=False)),@@ -112,7 +129,16 @@ class Migration(migrations.Migration):('type',models.CharField(- choices=[('normal', 'Normal'), ('dropset', 'Dropset'), ('myo', 'Myo')],+ choices=[+ ('normal', 'Normal'),+ ('dropset', 'Dropset'),+ ('myo', 'Myo'),+ ('partial', 'Partial'),+ ('forced', 'Forced'),+ ('tut', 'Tut'),+ ('iso', 'Iso Hold'),+ ('jump', 'Jump'),+ ],default='normal',max_length=10,),diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex a3fc38774..fea94d29f 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -27,6 +27,17 @@ from wger.core.models import DaysOfWeekfrom wger.manager.dataclasses import SlotData+class DayType(models.TextChoices):+ NORMAL = 'normal'+ EMOM = 'enom'+ AMRAP = 'amrap'+ HIIT = 'hiit'+ TABATA = 'tabata'+ EDT = 'edt'+ RFT = 'rft'+ AFAP = 'afap'++class DayNg(models.Model):"""Model for a training day@@ -46,6 +57,13 @@ class DayNg(models.Model):on_delete=models.CASCADE,)+ type = models.CharField(+ choices=DayType.choices,+ max_length=10,+ default=DayType.NORMAL,+ null=False,+ )+name = models.CharField(max_length=20,verbose_name=_('Description'),