Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add rest and rest target values to the log table

Roland Geider829939e1f2c7
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 927ba4254..7d039a859 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -429,6 +429,7 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
'date',
'session',
'routine',
+ 'iteration',
'slot_entry',
'next_log',
'exercise',
@@ -440,7 +441,8 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
'weight_target',
'rir',
'rir_target',
- 'iteration',
+ 'rest',
+ 'rest_target'
]
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 58b27ea7d..5506e3fce 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -147,6 +147,16 @@ class Migration(migrations.Migration):
verbose_name='Weight',
),
),
+ migrations.AddField(
+ model_name="workoutlog",
+ name="rest",
+ field=models.PositiveIntegerField(blank=True, null=True),
+ ),
+ migrations.AddField(
+ model_name="workoutlog",
+ name="rest_target",
+ field=models.PositiveIntegerField(blank=True, null=True),
+ ),
migrations.AlterField(
model_name='workoutsession',
name='date',
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 95a024621..c24a1247c 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -184,6 +184,22 @@ class WorkoutLog(models.Model):
Target Reps in Reserve
"""
+ rest = models.PositiveIntegerField(
+ blank=True,
+ null=True,
+ )
+ """
+ Logged rest time
+ """
+
+ rest_target = models.PositiveIntegerField(
+ blank=True,
+ null=True,
+ )
+ """
+ Target rest time
+ """
+
# Metaclass to set some other properties
class Meta:
ordering = ['date', 'reps']