Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Consolidate migrations

Roland Geider2830eea1ddb4
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 71633e093..da675615e 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -1,5 +1,6 @@
-# Generated by Django 4.2.6 on 2024-03-06 10:02
+# Generated by Django 4.2.6 on 2024-03-12 15:17
+import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
@@ -7,9 +8,9 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
+ ('core', '0016_alter_language_short_name'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('exercises', '0028_add_uuid_alias_and_comments'),
- ('core', '0016_alter_language_short_name'),
('manager', '0017_alter_workoutlog_exercise_base'),
]
@@ -20,10 +21,7 @@ class Migration(migrations.Migration):
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
('description', models.CharField(max_length=50, verbose_name='Description')),
@@ -46,20 +44,16 @@ class Migration(migrations.Migration):
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
- ('order', models.PositiveIntegerField(blank=True, verbose_name='Order')),
- ('comment', models.CharField(blank=True, max_length=100, verbose_name='Comment')),
+ ('order', models.PositiveIntegerField(blank=True)),
+ ('comment', models.CharField(blank=True, max_length=100)),
+ ('class_name', models.CharField(blank=True, max_length=100, null=True)),
(
'exercise',
models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to='exercises.exercisebase',
- verbose_name='Exercise',
+ on_delete=django.db.models.deletion.CASCADE, to='exercises.exercisebase'
),
),
(
@@ -68,7 +62,6 @@ class Migration(migrations.Migration):
default=1,
on_delete=django.db.models.deletion.CASCADE,
to='core.repetitionunit',
- verbose_name='Unit',
),
),
(
@@ -93,62 +86,30 @@ class Migration(migrations.Migration):
'ordering': ['order', 'id'],
},
),
- migrations.CreateModel(
- name='WeightConfig',
- fields=[
- (
- 'id',
- models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
- ),
- ),
- ('iteration', models.PositiveIntegerField()),
- ('value', models.DecimalField(decimal_places=2, max_digits=6)),
- (
- 'creation_date',
- models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
- ),
- (
- 'operation',
- models.CharField(
- choices=[('+', 'Plus'), ('-', 'Minus')],
- default='+',
- max_length=1,
- null=True,
- ),
- ),
- (
- 'trigger',
- models.CharField(
- choices=[('session', 'Session'), ('week', 'Week')],
- default='session',
- max_length=10,
- null=True,
- ),
- ),
- (
- 'step',
- models.CharField(
- choices=[('abs', 'Absolute'), ('percent', 'Percent')],
- default='abs',
- max_length=10,
- null=True,
- ),
- ),
- ('replace', models.BooleanField(default=False)),
- (
- 'set_config',
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'
- ),
- ),
- ],
- options={
- 'ordering': ['-creation_date'],
- },
+ migrations.AddField(
+ model_name='workoutlog',
+ name='iteration',
+ field=models.PositiveIntegerField(null=True),
+ ),
+ migrations.AddField(
+ model_name='workoutlog',
+ name='session',
+ field=models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.workoutsession',
+ verbose_name='Session',
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='date',
+ field=models.DateTimeField(default=datetime.datetime.now, verbose_name='Date'),
+ ),
+ migrations.AlterField(
+ model_name='workoutsession',
+ name='date',
+ field=models.DateField(default=datetime.date.today, verbose_name='Date'),
),
migrations.CreateModel(
name='SetNg',
@@ -181,10 +142,7 @@ class Migration(migrations.Migration):
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
('name', models.CharField(blank=True, max_length=50, verbose_name='Name')),
@@ -220,24 +178,49 @@ class Migration(migrations.Migration):
'ordering': ['-creation_date'],
},
),
+ migrations.AddField(
+ model_name='dayng',
+ name='routine',
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.routine',
+ verbose_name='Routine',
+ ),
+ ),
+ migrations.AddField(
+ model_name='workoutlog',
+ name='set_config',
+ field=models.ForeignKey(
+ null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'
+ ),
+ ),
+ migrations.AddField(
+ model_name='workoutsession',
+ name='day',
+ field=models.ForeignKey(
+ null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.dayng'
+ ),
+ ),
migrations.CreateModel(
- name='RiRConfig',
+ name='WeightConfig',
fields=[
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
('iteration', models.PositiveIntegerField()),
- ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
- 'creation_date',
- models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
+ 'trigger',
+ models.CharField(
+ choices=[('session', 'Session'), ('week', 'Week')],
+ default='session',
+ max_length=10,
+ null=True,
+ ),
),
+ ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
'operation',
models.CharField(
@@ -247,6 +230,40 @@ class Migration(migrations.Migration):
null=True,
),
),
+ (
+ 'step',
+ models.CharField(
+ choices=[('abs', 'Absolute'), ('percent', 'Percent')],
+ default='abs',
+ max_length=10,
+ null=True,
+ ),
+ ),
+ ('replace', models.BooleanField(default=False)),
+ ('need_log_to_apply', models.BooleanField(default=False)),
+ (
+ 'set_config',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'
+ ),
+ ),
+ ],
+ options={
+ 'ordering': ['set_config', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('set_config', 'iteration')},
+ },
+ ),
+ migrations.CreateModel(
+ name='RiRConfig',
+ fields=[
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ ),
+ ),
+ ('iteration', models.PositiveIntegerField()),
(
'trigger',
models.CharField(
@@ -256,6 +273,16 @@ class Migration(migrations.Migration):
null=True,
),
),
+ ('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ (
+ 'operation',
+ models.CharField(
+ choices=[('+', 'Plus'), ('-', 'Minus')],
+ default='+',
+ max_length=1,
+ null=True,
+ ),
+ ),
(
'step',
models.CharField(
@@ -266,6 +293,7 @@ class Migration(migrations.Migration):
),
),
('replace', models.BooleanField(default=False)),
+ ('need_log_to_apply', models.BooleanField(default=False)),
(
'set_config',
models.ForeignKey(
@@ -274,7 +302,9 @@ class Migration(migrations.Migration):
),
],
options={
- 'ordering': ['-creation_date'],
+ 'ordering': ['set_config', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('set_config', 'iteration')},
},
),
migrations.CreateModel(
@@ -283,18 +313,20 @@ class Migration(migrations.Migration):
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
('iteration', models.PositiveIntegerField()),
- ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
- 'creation_date',
- models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
+ 'trigger',
+ models.CharField(
+ choices=[('session', 'Session'), ('week', 'Week')],
+ default='session',
+ max_length=10,
+ null=True,
+ ),
),
+ ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
'operation',
models.CharField(
@@ -304,15 +336,6 @@ class Migration(migrations.Migration):
null=True,
),
),
- (
- 'trigger',
- models.CharField(
- choices=[('session', 'Session'), ('week', 'Week')],
- default='session',
- max_length=10,
- null=True,
- ),
- ),
(
'step',
models.CharField(
@@ -323,6 +346,7 @@ class Migration(migrations.Migration):
),
),
('replace', models.BooleanField(default=False)),
+ ('need_log_to_apply', models.BooleanField(default=False)),
(
'set_config',
models.ForeignKey(
@@ -331,7 +355,9 @@ class Migration(migrations.Migration):
),
],
options={
- 'ordering': ['-creation_date'],
+ 'ordering': ['set_config', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('set_config', 'iteration')},
},
),
migrations.CreateModel(
@@ -340,18 +366,20 @@ class Migration(migrations.Migration):
(
'id',
models.AutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name='ID',
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
('iteration', models.PositiveIntegerField()),
- ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
- 'creation_date',
- models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
+ 'trigger',
+ models.CharField(
+ choices=[('session', 'Session'), ('week', 'Week')],
+ default='session',
+ max_length=10,
+ null=True,
+ ),
),
+ ('value', models.DecimalField(decimal_places=2, max_digits=6)),
(
'operation',
models.CharField(
@@ -361,15 +389,6 @@ class Migration(migrations.Migration):
null=True,
),
),
- (
- 'trigger',
- models.CharField(
- choices=[('session', 'Session'), ('week', 'Week')],
- default='session',
- max_length=10,
- null=True,
- ),
- ),
(
'step',
models.CharField(
@@ -380,6 +399,7 @@ class Migration(migrations.Migration):
),
),
('replace', models.BooleanField(default=False)),
+ ('need_log_to_apply', models.BooleanField(default=False)),
(
'set_config',
models.ForeignKey(
@@ -388,23 +408,9 @@ class Migration(migrations.Migration):
),
],
options={
- 'ordering': ['-creation_date'],
+ 'ordering': ['set_config', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('set_config', 'iteration')},
},
),
- migrations.AddField(
- model_name='dayng',
- name='routine',
- field=models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to='manager.routine',
- verbose_name='Routine',
- ),
- ),
- migrations.AddField(
- model_name='workoutsession',
- name='day',
- field=models.ForeignKey(
- null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.dayng'
- ),
- ),
]
diff --git a/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.py b/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.py
deleted file mode 100644
index b3a26c0e2..000000000
--- a/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Generated by Django 4.2.6 on 2024-03-07 19:02
-
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('exercises', '0028_add_uuid_alias_and_comments'),
- ('core', '0016_alter_language_short_name'),
- ('manager', '0018_flexible_routines'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='repsconfig',
- options={'ordering': ['set_config', 'iteration']},
- ),
- migrations.AlterModelOptions(
- name='restconfig',
- options={'ordering': ['set_config', 'iteration']},
- ),
- migrations.AlterModelOptions(
- name='rirconfig',
- options={'ordering': ['set_config', 'iteration']},
- ),
- migrations.AlterModelOptions(
- name='weightconfig',
- options={'ordering': ['set_config', 'iteration']},
- ),
- migrations.AddField(
- model_name='repsconfig',
- name='need_log_to_apply',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='restconfig',
- name='need_log_to_apply',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='rirconfig',
- name='need_log_to_apply',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='weightconfig',
- name='need_log_to_apply',
- field=models.BooleanField(default=False),
- ),
- migrations.AddField(
- model_name='workoutlog',
- name='session',
- field=models.ForeignKey(
- null=True,
- on_delete=django.db.models.deletion.CASCADE,
- to='manager.workoutsession',
- verbose_name='Session',
- ),
- ),
- migrations.AddField(
- model_name='workoutlog',
- name='set_config',
- field=models.ForeignKey(
- null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'
- ),
- ),
- migrations.AlterField(
- model_name='setconfig',
- name='exercise',
- field=models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to='exercises.exercisebase'
- ),
- ),
- migrations.AlterField(
- model_name='setconfig',
- name='repetition_unit',
- field=models.ForeignKey(
- default=1, on_delete=django.db.models.deletion.CASCADE, to='core.repetitionunit'
- ),
- ),
- migrations.AlterField(
- model_name='workoutlog',
- name='date',
- field=models.DateTimeField(default=datetime.datetime.now, verbose_name='Date'),
- ),
- migrations.AlterField(
- model_name='workoutsession',
- name='date',
- field=models.DateField(default=datetime.date.today, verbose_name='Date'),
- ),
- migrations.AlterUniqueTogether(
- name='repsconfig',
- unique_together={('set_config', 'iteration')},
- ),
- migrations.AlterUniqueTogether(
- name='restconfig',
- unique_together={('set_config', 'iteration')},
- ),
- migrations.AlterUniqueTogether(
- name='rirconfig',
- unique_together={('set_config', 'iteration')},
- ),
- migrations.AlterUniqueTogether(
- name='weightconfig',
- unique_together={('set_config', 'iteration')},
- ),
- migrations.RemoveField(
- model_name='repsconfig',
- name='creation_date',
- ),
- migrations.RemoveField(
- model_name='restconfig',
- name='creation_date',
- ),
- migrations.RemoveField(
- model_name='rirconfig',
- name='creation_date',
- ),
- migrations.RemoveField(
- model_name='weightconfig',
- name='creation_date',
- ),
- ]
diff --git a/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.py b/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.py
deleted file mode 100644
index d030d4df7..000000000
--- a/wger/manager/migrations/0020_workoutlog_iteration_alter_setconfig_comment_and_more.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 4.2.6 on 2024-03-09 14:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('manager', '0019_alter_repsconfig_options_alter_restconfig_options_and_more'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='workoutlog',
- name='iteration',
- field=models.PositiveIntegerField(null=True),
- ),
- migrations.AlterField(
- model_name='setconfig',
- name='comment',
- field=models.CharField(blank=True, max_length=100),
- ),
- migrations.AlterField(
- model_name='setconfig',
- name='order',
- field=models.PositiveIntegerField(blank=True),
- ),
- ]
diff --git a/wger/manager/migrations/0021_rename_code_repsconfig_class_name_and_more.py b/wger/manager/migrations/0021_rename_code_repsconfig_class_name_and_more.py
deleted file mode 100644
index 157829d11..000000000
--- a/wger/manager/migrations/0021_rename_code_repsconfig_class_name_and_more.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 4.2.6 on 2024-03-10 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('manager', '0020_workoutlog_iteration_alter_setconfig_comment_and_more'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='setconfig',
- name='class_name',
- field=models.CharField(blank=True, max_length=100, null=True),
- ),
- ]