Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add JSON field for additional configuration

Roland Geider30c14310f8a1
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index d281898a2..b43980092 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -75,6 +75,7 @@ class DaySerializer(serializers.ModelSerializer):
'is_rest',
'need_logs_to_advance',
'type',
+ 'config',
)
@@ -182,6 +183,7 @@ class SlotEntryStructureSerializer(serializers.ModelSerializer):
'comment',
'type',
'class_name',
+ 'config',
'repetition_unit',
'repetition_rounding',
'reps_configs',
@@ -212,6 +214,7 @@ class SlotStructureSerializer(serializers.ModelSerializer):
'order',
'comment',
'entries',
+ 'config',
)
@@ -227,6 +230,7 @@ class SlotSerializer(serializers.ModelSerializer):
'day',
'order',
'comment',
+ 'config',
)
@@ -290,6 +294,7 @@ class SlotEntrySerializer(serializers.ModelSerializer):
'weight_rounding',
'order',
'comment',
+ 'config',
)
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 75c16661a..185f7b81d 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -45,7 +45,10 @@ class Migration(migrations.Migration):
max_length=10,
),
),
- ('name', models.CharField(max_length=20, verbose_name='Name')),
+ (
+ 'name',
+ models.CharField(max_length=20, verbose_name='Name'),
+ ),
(
'description',
models.CharField(
@@ -54,9 +57,22 @@ class Migration(migrations.Migration):
blank=True,
),
),
- ('is_rest', models.BooleanField(default=False)),
- ('need_logs_to_advance', models.BooleanField(default=False)),
- ('order', models.PositiveIntegerField(default=1, verbose_name='Order')),
+ (
+ 'is_rest',
+ models.BooleanField(default=False),
+ ),
+ (
+ 'need_logs_to_advance',
+ models.BooleanField(default=False),
+ ),
+ (
+ 'order',
+ models.PositiveIntegerField(default=1, verbose_name='Order'),
+ ),
+ (
+ 'config',
+ models.JSONField(default=None, null=True),
+ ),
],
options={
'ordering': ['order'],
@@ -100,8 +116,14 @@ class Migration(migrations.Migration):
verbose_name='ID',
),
),
- ('order', models.PositiveIntegerField(default=1, verbose_name='Order')),
- ('comment', models.CharField(blank=True, max_length=200, verbose_name='Comment')),
+ (
+ 'order',
+ models.PositiveIntegerField(default=1, verbose_name='Order'),
+ ),
+ (
+ 'comment',
+ models.CharField(blank=True, max_length=200, verbose_name='Comment'),
+ ),
(
'day',
models.ForeignKey(
@@ -111,6 +133,10 @@ class Migration(migrations.Migration):
verbose_name='Exercise day',
),
),
+ (
+ 'config',
+ models.JSONField(default=None, null=True),
+ ),
],
options={
'ordering': ['order'],
@@ -170,7 +196,7 @@ class Migration(migrations.Migration):
'slot',
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- related_name='configs',
+ related_name='entries',
to='manager.Slot',
),
),
@@ -191,6 +217,10 @@ class Migration(migrations.Migration):
max_digits=4,
),
),
+ (
+ 'config',
+ models.JSONField(default=None, null=True),
+ ),
],
options={
'ordering': ['order', 'id'],
@@ -589,7 +619,8 @@ class Migration(migrations.Migration):
(
'slot_entry',
models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to='manager.slotentry'
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.slotentry',
),
),
],
@@ -634,7 +665,8 @@ class Migration(migrations.Migration):
(
'slot_entry',
models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to='manager.slotentry'
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.slotentry',
),
),
],
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 3ee943ebd..97cdc9ab9 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -95,6 +95,12 @@ class Day(models.Model):
Needs logs to advance to the next day
"""
+ config = models.JSONField(
+ default=None,
+ null=True,
+ )
+ """JSON configuration field for custom behaviour"""
+
def __str__(self):
"""
Return a more human-readable representation
diff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.py
index 0e72cae9e..979b19a0e 100644
--- a/wger/manager/models/slot.py
+++ b/wger/manager/models/slot.py
@@ -40,6 +40,12 @@ class Slot(models.Model):
blank=True,
)
+ config = models.JSONField(
+ default=None,
+ null=True,
+ )
+ """JSON configuration field for custom behaviour"""
+
# Metaclass to set some other properties
class Meta:
ordering = [
diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.py
index 9c87d68d8..f1fff10a3 100644
--- a/wger/manager/models/slot_entry.py
+++ b/wger/manager/models/slot_entry.py
@@ -136,6 +136,12 @@ class SlotEntry(models.Model):
If this is set, all other settings will be ignored.
"""
+ config = models.JSONField(
+ default=None,
+ null=True,
+ )
+ """JSON configuration field for custom behaviour"""
+
# Metaclass to set some other properties
class Meta:
ordering = [