diff --git a/cvkbrno/migrations/0001_initial.py b/cvkbrno/migrations/0001_initial.py deleted file mode 100644 index 29303c73..00000000 --- a/cvkbrno/migrations/0001_initial.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-13 15:14 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Boat', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('boatname', models.CharField(max_length=30)), - ('boatcode', models.CharField(max_length=10)), - ('nrseats', models.IntegerField()), - ('status', models.CharField(choices=[('water', 'water'), ('hangar', 'hangar'), ('damaged', 'damaged'), ('races', 'races')], default='hangar', max_length=30)), - ('comment', models.CharField(blank=True, max_length=100)), - ], - ), - migrations.CreateModel( - name='BoatCategory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ], - ), - migrations.CreateModel( - name='Member', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('contributions', models.BooleanField(default=True)), - ('status', models.CharField(choices=[('coach', 'coach'), ('member', 'member'), ('administrator', 'administrator')], default='member', max_length=30)), - ('categories', models.ManyToManyField(to='cvkbrno.BoatCategory')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Outing', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('starttime', models.DateTimeField()), - ('endtime', models.DateTimeField()), - ('distance', models.FloatField()), - ('comment', models.CharField(blank=True, max_length=100)), - ('status', models.CharField(choices=[('reservation', 'reservation'), ('active', 'active'), ('completed', 'completed'), ('race', 'race')], default='active', max_length=30)), - ('boat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cvkbrno.Boat')), - ('rower', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cvkbrno.Member')), - ], - ), - migrations.AddField( - model_name='boat', - name='categories', - field=models.ManyToManyField(to='cvkbrno.BoatCategory'), - ), - ] diff --git a/cvkbrno/migrations/0002_auto_20160515_0910.py b/cvkbrno/migrations/0002_auto_20160515_0910.py deleted file mode 100644 index 217be114..00000000 --- a/cvkbrno/migrations/0002_auto_20160515_0910.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-15 07:10 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='outing', - name='endtime', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/cvkbrno/migrations/0003_member_club.py b/cvkbrno/migrations/0003_member_club.py deleted file mode 100644 index a2045c74..00000000 --- a/cvkbrno/migrations/0003_member_club.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-17 09:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0002_auto_20160515_0910'), - ] - - operations = [ - migrations.AddField( - model_name='member', - name='club', - field=models.CharField(default='cvkbrno', max_length=30), - preserve_default=False, - ), - ] diff --git a/cvkbrno/migrations/0004_auto_20160518_2001.py b/cvkbrno/migrations/0004_auto_20160518_2001.py deleted file mode 100644 index ef1dbf43..00000000 --- a/cvkbrno/migrations/0004_auto_20160518_2001.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-18 18:01 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0003_member_club'), - ] - - operations = [ - migrations.CreateModel( - name='MemberWork', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ('hours', models.FloatField()), - ('name', models.CharField(max_length=30)), - ('status', models.CharField(choices=[('planned', 'planned'), ('executed', 'executed')], default='planned', max_length=30)), - ], - ), - migrations.AddField( - model_name='member', - name='hoursworked', - field=models.FloatField(default=0), - preserve_default=False, - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 18, 20, 1, 10, 126000)), - ), - migrations.AddField( - model_name='memberwork', - name='worker', - field=models.ManyToManyField(to='cvkbrno.Member'), - ), - ] diff --git a/cvkbrno/migrations/0005_auto_20160519_0750.py b/cvkbrno/migrations/0005_auto_20160519_0750.py deleted file mode 100644 index f83f251b..00000000 --- a/cvkbrno/migrations/0005_auto_20160519_0750.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 05:50 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0004_auto_20160518_2001'), - ] - - operations = [ - migrations.AlterField( - model_name='boat', - name='boatcode', - field=models.CharField(max_length=10, verbose_name='Boat Code'), - ), - migrations.AlterField( - model_name='boat', - name='boatname', - field=models.CharField(max_length=30, verbose_name='Boat Name'), - ), - migrations.AlterField( - model_name='boat', - name='nrseats', - field=models.IntegerField(verbose_name='Nr of Seats'), - ), - migrations.AlterField( - model_name='boatcategory', - name='name', - field=models.CharField(max_length=30, verbose_name='Boat Category'), - ), - migrations.AlterField( - model_name='member', - name='club', - field=models.CharField(max_length=30, verbose_name='Club'), - ), - migrations.AlterField( - model_name='member', - name='hoursworked', - field=models.FloatField(verbose_name='Hours Worked'), - ), - migrations.AlterField( - model_name='memberwork', - name='date', - field=models.DateField(verbose_name='Date'), - ), - migrations.AlterField( - model_name='memberwork', - name='hours', - field=models.FloatField(verbose_name='Hours'), - ), - migrations.AlterField( - model_name='memberwork', - name='name', - field=models.CharField(max_length=30, verbose_name='Work Event Name'), - ), - migrations.AlterField( - model_name='outing', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='outing', - name='distance', - field=models.FloatField(verbose_name='Distance'), - ), - migrations.AlterField( - model_name='outing', - name='endtime', - field=models.DateTimeField(blank=True, null=True, verbose_name='End Date/Time'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 19, 7, 50, 27, 933000), verbose_name='Start Date/Time'), - ), - migrations.AlterField( - model_name='outing', - name='status', - field=models.CharField(choices=[('reservation', 'reservation'), ('active', 'active'), ('completed', 'completed'), ('race', 'race')], default='active', max_length=30, verbose_name='Status'), - ), - ] diff --git a/cvkbrno/migrations/0006_auto_20160519_0805.py b/cvkbrno/migrations/0006_auto_20160519_0805.py deleted file mode 100644 index ad1be0e4..00000000 --- a/cvkbrno/migrations/0006_auto_20160519_0805.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 06:05 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0005_auto_20160519_0750'), - ] - - operations = [ - migrations.AlterField( - model_name='member', - name='categories', - field=models.ManyToManyField(to='cvkbrno.BoatCategory', verbose_name='Boat Categories'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 19, 8, 5, 40, 950000), verbose_name='Start Date/Time'), - ), - ] diff --git a/cvkbrno/migrations/0007_auto_20160519_1103.py b/cvkbrno/migrations/0007_auto_20160519_1103.py deleted file mode 100644 index 87c6b100..00000000 --- a/cvkbrno/migrations/0007_auto_20160519_1103.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 09:03 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0006_auto_20160519_0805'), - ] - - operations = [ - migrations.AlterModelOptions( - name='boat', - options={'verbose_name': 'boat', 'verbose_name_plural': 'boats'}, - ), - migrations.AlterModelOptions( - name='boatcategory', - options={'verbose_name': 'boat category', 'verbose_name_plural': 'boat categories'}, - ), - migrations.AlterModelOptions( - name='member', - options={'verbose_name': 'member', 'verbose_name_plural': 'members'}, - ), - migrations.AlterModelOptions( - name='memberwork', - options={'verbose_name': 'member work', 'verbose_name_plural': 'member work'}, - ), - migrations.AlterModelOptions( - name='outing', - options={'verbose_name': 'outing', 'verbose_name_plural': 'outings'}, - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 19, 11, 3, 18, 858000), verbose_name='Start Date/Time'), - ), - migrations.AlterField( - model_name='outing', - name='status', - field=models.CharField(choices=[('reservation', 'reservation'), ('active', 'aktivn\xed'), ('completed', 'completed'), ('race', 'race')], default='active', max_length=30, verbose_name='Status'), - ), - ] diff --git a/cvkbrno/migrations/0008_auto_20160519_1204.py b/cvkbrno/migrations/0008_auto_20160519_1204.py deleted file mode 100644 index 9396d812..00000000 --- a/cvkbrno/migrations/0008_auto_20160519_1204.py +++ /dev/null @@ -1,126 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 10:04 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0007_auto_20160519_1103'), - ] - - operations = [ - migrations.AlterModelOptions( - name='boat', - options={'verbose_name': 'lod', 'verbose_name_plural': 'lode'}, - ), - migrations.AlterModelOptions( - name='boatcategory', - options={'verbose_name': 'kategorie lod\xed', 'verbose_name_plural': 'kategorie lod\xed'}, - ), - migrations.AlterModelOptions( - name='member', - options={'verbose_name': 'clen', 'verbose_name_plural': 'clenove'}, - ), - migrations.AlterModelOptions( - name='memberwork', - options={'verbose_name': 'brigady', 'verbose_name_plural': 'brigady'}, - ), - migrations.AlterModelOptions( - name='outing', - options={'verbose_name': 'vyjezd', 'verbose_name_plural': 'vyjezdy'}, - ), - migrations.AlterField( - model_name='boat', - name='boatcode', - field=models.CharField(max_length=10, verbose_name='K\xf3d Lode'), - ), - migrations.AlterField( - model_name='boat', - name='boatname', - field=models.CharField(max_length=30, verbose_name='n\xe1zev lodi'), - ), - migrations.AlterField( - model_name='boat', - name='nrseats', - field=models.IntegerField(verbose_name='Pocet m\xedst'), - ), - migrations.AlterField( - model_name='boat', - name='status', - field=models.CharField(choices=[('water', 'voda'), ('hangar', 'lodenice'), ('damaged', 'po\u0161kozen\xe1'), ('races', 'zavody')], default='hangar', max_length=30), - ), - migrations.AlterField( - model_name='boatcategory', - name='name', - field=models.CharField(max_length=30, verbose_name='kategorie lod\xed'), - ), - migrations.AlterField( - model_name='member', - name='categories', - field=models.ManyToManyField(to='cvkbrno.BoatCategory', verbose_name='kategorie lod\xed'), - ), - migrations.AlterField( - model_name='member', - name='club', - field=models.CharField(max_length=30, verbose_name='Klub'), - ), - migrations.AlterField( - model_name='member', - name='hoursworked', - field=models.FloatField(verbose_name='Odpracovan\xe9 hodiny'), - ), - migrations.AlterField( - model_name='member', - name='status', - field=models.CharField(choices=[('coach', 'tren\xe9r'), ('member', 'clen'), ('administrator', 'spr\xe1vce')], default='member', max_length=30), - ), - migrations.AlterField( - model_name='memberwork', - name='date', - field=models.DateField(verbose_name='Datum'), - ), - migrations.AlterField( - model_name='memberwork', - name='hours', - field=models.FloatField(verbose_name='Hodiny'), - ), - migrations.AlterField( - model_name='memberwork', - name='name', - field=models.CharField(max_length=30, verbose_name='N\xe1zev Brig\xe1dy'), - ), - migrations.AlterField( - model_name='memberwork', - name='status', - field=models.CharField(choices=[('planned', 'planovane'), ('executed', 'hotov\xe1')], default='planned', max_length=30), - ), - migrations.AlterField( - model_name='outing', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='Koment\xe1r'), - ), - migrations.AlterField( - model_name='outing', - name='distance', - field=models.FloatField(verbose_name='Vzd\xe1lenost'), - ), - migrations.AlterField( - model_name='outing', - name='endtime', - field=models.DateTimeField(blank=True, null=True, verbose_name='Datum/Cas ukoncen\xed'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 19, 12, 4, 16, 852000), verbose_name='Startovn\xed Datum/Cas'), - ), - migrations.AlterField( - model_name='outing', - name='status', - field=models.CharField(choices=[('reservation', 'rezervace'), ('active', 'aktivn\xed'), ('completed', 'dokoncen\xfd'), ('race', 'zavod')], default='active', max_length=30, verbose_name='Status'), - ), - ] diff --git a/cvkbrno/migrations/0009_auto_20160519_1207.py b/cvkbrno/migrations/0009_auto_20160519_1207.py deleted file mode 100644 index dc62d860..00000000 --- a/cvkbrno/migrations/0009_auto_20160519_1207.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-19 10:07 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0008_auto_20160519_1204'), - ] - - operations = [ - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 5, 19, 12, 7, 34, 316000), verbose_name='Startovn\xed Datum/Cas'), - ), - ] diff --git a/cvkbrno/migrations/0010_auto_20160608_0811.py b/cvkbrno/migrations/0010_auto_20160608_0811.py deleted file mode 100644 index 203e70c9..00000000 --- a/cvkbrno/migrations/0010_auto_20160608_0811.py +++ /dev/null @@ -1,107 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-08 06:11 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0009_auto_20160519_1207'), - ] - - operations = [ - migrations.AlterModelOptions( - name='boat', - options={'verbose_name': 'lo\u010f', 'verbose_name_plural': 'lod\u011b'}, - ), - migrations.AlterModelOptions( - name='member', - options={'verbose_name': '\u010dlen', 'verbose_name_plural': '\u010dlenov\xe9'}, - ), - migrations.AlterModelOptions( - name='memberwork', - options={'verbose_name': 'Brig\xe1da', 'verbose_name_plural': 'Brig\xe1da'}, - ), - migrations.AlterModelOptions( - name='outing', - options={'verbose_name': 'j\xedzda', 'verbose_name_plural': 'j\xedzdy'}, - ), - migrations.AlterField( - model_name='boat', - name='boatcode', - field=models.CharField(max_length=10, verbose_name='k\xf3d lod\xed'), - ), - migrations.AlterField( - model_name='boat', - name='nrseats', - field=models.IntegerField(verbose_name='po\u010det m\xedst'), - ), - migrations.AlterField( - model_name='boat', - name='status', - field=models.CharField(choices=[('water', 'voda'), ('hangar', 'lod\u011bnice'), ('damaged', 'po\u0161kozen\xe1'), ('races', 'z\xe1vody')], default='hangar', max_length=30), - ), - migrations.AlterField( - model_name='member', - name='club', - field=models.CharField(max_length=30, verbose_name='klub'), - ), - migrations.AlterField( - model_name='member', - name='hoursworked', - field=models.FloatField(verbose_name='odpracovan\xe9 hodiny'), - ), - migrations.AlterField( - model_name='member', - name='status', - field=models.CharField(choices=[('coach', 'tren\xe9r'), ('member', '\u010dlen'), ('administrator', 'spr\xe1vce')], default='member', max_length=30), - ), - migrations.AlterField( - model_name='memberwork', - name='date', - field=models.DateField(verbose_name='datum'), - ), - migrations.AlterField( - model_name='memberwork', - name='hours', - field=models.FloatField(verbose_name='hodiny'), - ), - migrations.AlterField( - model_name='memberwork', - name='name', - field=models.CharField(max_length=30, verbose_name='n\xe1zev brig\xe1dy'), - ), - migrations.AlterField( - model_name='memberwork', - name='status', - field=models.CharField(choices=[('planned', 'pl\xe1novan\xfd'), ('executed', 'proveden\xfd')], default='planned', max_length=30), - ), - migrations.AlterField( - model_name='outing', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='koment\xe1\u0159'), - ), - migrations.AlterField( - model_name='outing', - name='distance', - field=models.FloatField(default=12, verbose_name='vzd\xe1lenost'), - ), - migrations.AlterField( - model_name='outing', - name='endtime', - field=models.DateTimeField(blank=True, null=True, verbose_name='P\u0159edpokl\xe1dan\xfd \u010das ukon\u010den\xed'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 6, 8, 8, 11, 2, 709000), verbose_name='\u010cas'), - ), - migrations.AlterField( - model_name='outing', - name='status', - field=models.CharField(choices=[('reservation', 'rezervace'), ('active', 'aktivn\xed'), ('completed', 'dokon\u010den\xfd'), ('race', 'z\xe1vod')], default='active', max_length=30, verbose_name='status'), - ), - ] diff --git a/cvkbrno/migrations/0011_auto_20160613_1640.py b/cvkbrno/migrations/0011_auto_20160613_1640.py deleted file mode 100644 index aacafbef..00000000 --- a/cvkbrno/migrations/0011_auto_20160613_1640.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-13 14:40 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0010_auto_20160608_0811'), - ] - - operations = [ - migrations.CreateModel( - name='Races', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('starttime', models.DateTimeField(verbose_name='Start Time')), - ('endtime', models.DateTimeField(verbose_name='End Time')), - ], - options={ - 'verbose_name': 'race', - 'verbose_name_plural': 'races', - }, - ), - migrations.AlterModelOptions( - name='boat', - options={'verbose_name': 'boat', 'verbose_name_plural': 'boats'}, - ), - migrations.AlterModelOptions( - name='boatcategory', - options={'verbose_name': 'boat category', 'verbose_name_plural': 'boat categories'}, - ), - migrations.AlterModelOptions( - name='member', - options={'verbose_name': 'member', 'verbose_name_plural': 'members'}, - ), - migrations.AlterModelOptions( - name='memberwork', - options={'verbose_name': 'member work', 'verbose_name_plural': 'member work'}, - ), - migrations.AlterModelOptions( - name='outing', - options={'verbose_name': 'outing', 'verbose_name_plural': 'outings'}, - ), - migrations.AlterField( - model_name='boat', - name='boatcode', - field=models.CharField(max_length=10, verbose_name='Boat Code'), - ), - migrations.AlterField( - model_name='boat', - name='boatname', - field=models.CharField(max_length=30, verbose_name='Boat Name'), - ), - migrations.AlterField( - model_name='boat', - name='nrseats', - field=models.IntegerField(verbose_name='Nr of Seats'), - ), - migrations.AlterField( - model_name='boat', - name='status', - field=models.CharField(choices=[('water', 'water'), ('hangar', 'hangar'), ('damaged', 'damaged'), ('races', 'races')], default='hangar', max_length=30), - ), - migrations.AlterField( - model_name='boatcategory', - name='name', - field=models.CharField(max_length=30, verbose_name='Boat Category'), - ), - migrations.AlterField( - model_name='member', - name='categories', - field=models.ManyToManyField(to='cvkbrno.BoatCategory', verbose_name='Boat Categories'), - ), - migrations.AlterField( - model_name='member', - name='club', - field=models.CharField(max_length=30, verbose_name='Club'), - ), - migrations.AlterField( - model_name='member', - name='hoursworked', - field=models.FloatField(verbose_name='Hours Worked'), - ), - migrations.AlterField( - model_name='member', - name='status', - field=models.CharField(choices=[('coach', 'coach'), ('member', 'member'), ('administrator', 'administrator')], default='member', max_length=30), - ), - migrations.AlterField( - model_name='memberwork', - name='date', - field=models.DateField(verbose_name='Date'), - ), - migrations.AlterField( - model_name='memberwork', - name='hours', - field=models.FloatField(verbose_name='Hours'), - ), - migrations.AlterField( - model_name='memberwork', - name='name', - field=models.CharField(max_length=30, verbose_name='Work Event Name'), - ), - migrations.AlterField( - model_name='memberwork', - name='status', - field=models.CharField(choices=[('planned', 'planned'), ('executed', 'executed')], default='planned', max_length=30), - ), - migrations.AlterField( - model_name='outing', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='outing', - name='distance', - field=models.FloatField(default=12, verbose_name='Distance'), - ), - migrations.AlterField( - model_name='outing', - name='endtime', - field=models.DateTimeField(blank=True, null=True, verbose_name='End Time'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 6, 13, 16, 40, 26, 888000), verbose_name='Start Time'), - ), - migrations.AlterField( - model_name='outing', - name='status', - field=models.CharField(choices=[('reservation', 'reservation'), ('active', 'active'), ('completed', 'completed'), ('race', 'race')], default='active', max_length=30, verbose_name='Status'), - ), - migrations.AddField( - model_name='races', - name='boats', - field=models.ManyToManyField(to='cvkbrno.Boat'), - ), - ] diff --git a/cvkbrno/migrations/0012_auto_20160719_2240.py b/cvkbrno/migrations/0012_auto_20160719_2240.py deleted file mode 100644 index 4dea6028..00000000 --- a/cvkbrno/migrations/0012_auto_20160719_2240.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-19 20:40 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0011_auto_20160613_1640'), - ] - - operations = [ - migrations.RemoveField( - model_name='races', - name='endtime', - ), - migrations.RemoveField( - model_name='races', - name='starttime', - ), - migrations.AddField( - model_name='races', - name='enddatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 40, 1, 937000), verbose_name='End Time'), - ), - migrations.AddField( - model_name='races', - name='startdatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 40, 1, 937000), verbose_name='Start Time'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 40, 1, 935000), verbose_name='Start Time'), - ), - ] diff --git a/cvkbrno/migrations/0013_auto_20160719_2245.py b/cvkbrno/migrations/0013_auto_20160719_2245.py deleted file mode 100644 index b978baf1..00000000 --- a/cvkbrno/migrations/0013_auto_20160719_2245.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-19 20:45 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0012_auto_20160719_2240'), - ] - - operations = [ - migrations.RenameField( - model_name='races', - old_name='boats', - new_name='transportboats', - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 45, 43, 357000), verbose_name='Start Time'), - ), - migrations.AlterField( - model_name='races', - name='enddatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 45, 43, 359000), verbose_name='End Time'), - ), - migrations.AlterField( - model_name='races', - name='startdatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 22, 45, 43, 359000), verbose_name='Start Time'), - ), - ] diff --git a/cvkbrno/migrations/0014_auto_20160719_2313.py b/cvkbrno/migrations/0014_auto_20160719_2313.py deleted file mode 100644 index c8dbd2a3..00000000 --- a/cvkbrno/migrations/0014_auto_20160719_2313.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-19 21:13 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0013_auto_20160719_2245'), - ] - - operations = [ - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 23, 13, 32, 498000), verbose_name='Start Time'), - ), - migrations.AlterField( - model_name='races', - name='enddatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 23, 13, 32, 499000), verbose_name='End Time'), - ), - migrations.AlterField( - model_name='races', - name='startdatetime', - field=models.DateTimeField(default=datetime.datetime(2016, 7, 19, 23, 13, 32, 499000), verbose_name='Start Time'), - ), - ] diff --git a/cvkbrno/migrations/0015_auto_20160720_1741.py b/cvkbrno/migrations/0015_auto_20160720_1741.py deleted file mode 100644 index d99d410c..00000000 --- a/cvkbrno/migrations/0015_auto_20160720_1741.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-20 15:41 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0014_auto_20160719_2313'), - ] - - operations = [ - migrations.AddField( - model_name='outing', - name='otherrowers', - field=models.ManyToManyField(related_name='otherrowers', to='cvkbrno.Member'), - ), - migrations.AlterField( - model_name='outing', - name='starttime', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Start Time'), - ), - migrations.AlterField( - model_name='races', - name='enddatetime', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='End Time'), - ), - migrations.AlterField( - model_name='races', - name='startdatetime', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Start Time'), - ), - ] diff --git a/cvkbrno/migrations/0016_outing_race.py b/cvkbrno/migrations/0016_outing_race.py deleted file mode 100644 index 348caa01..00000000 --- a/cvkbrno/migrations/0016_outing_race.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-21 06:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0015_auto_20160720_1741'), - ] - - operations = [ - migrations.AddField( - model_name='outing', - name='race', - field=models.ManyToManyField(blank=True, to='cvkbrno.Races'), - ), - ] diff --git a/cvkbrno/migrations/0017_auto_20160721_1621.py b/cvkbrno/migrations/0017_auto_20160721_1621.py deleted file mode 100644 index 2a4d7816..00000000 --- a/cvkbrno/migrations/0017_auto_20160721_1621.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-21 14:21 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0016_outing_race'), - ] - - operations = [ - migrations.AlterField( - model_name='outing', - name='distance', - field=models.FloatField(default=12, verbose_name='Distance (km)'), - ), - ] diff --git a/cvkbrno/migrations/0018_auto_20160722_1043.py b/cvkbrno/migrations/0018_auto_20160722_1043.py deleted file mode 100644 index 9be625fe..00000000 --- a/cvkbrno/migrations/0018_auto_20160722_1043.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-22 08:43 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0017_auto_20160721_1621'), - ] - - operations = [ - migrations.AlterField( - model_name='boat', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='Comment'), - ), - ] diff --git a/cvkbrno/migrations/0019_boatcategory_club.py b/cvkbrno/migrations/0019_boatcategory_club.py deleted file mode 100644 index 3b1fedea..00000000 --- a/cvkbrno/migrations/0019_boatcategory_club.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-22 08:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0018_auto_20160722_1043'), - ] - - operations = [ - migrations.AddField( - model_name='boatcategory', - name='club', - field=models.CharField(default='cvkbrno', max_length=30, verbose_name='Club'), - preserve_default=False, - ), - ] diff --git a/cvkbrno/migrations/0020_remove_member_club.py b/cvkbrno/migrations/0020_remove_member_club.py deleted file mode 100644 index 433fefbc..00000000 --- a/cvkbrno/migrations/0020_remove_member_club.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-22 08:46 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0019_boatcategory_club'), - ] - - operations = [ - migrations.RemoveField( - model_name='member', - name='club', - ), - ] diff --git a/cvkbrno/migrations/0021_member_club.py b/cvkbrno/migrations/0021_member_club.py deleted file mode 100644 index 19ece38b..00000000 --- a/cvkbrno/migrations/0021_member_club.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-22 08:47 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0020_remove_member_club'), - ] - - operations = [ - migrations.AddField( - model_name='member', - name='club', - field=models.CharField(default='cvkbrno', max_length=30, verbose_name='Club'), - preserve_default=False, - ), - ] diff --git a/cvkbrno/migrations/0022_auto_20160723_1502.py b/cvkbrno/migrations/0022_auto_20160723_1502.py deleted file mode 100644 index 80651758..00000000 --- a/cvkbrno/migrations/0022_auto_20160723_1502.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-23 13:02 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0021_member_club'), - ] - - operations = [ - migrations.AlterField( - model_name='memberwork', - name='worker', - field=models.ManyToManyField(related_name='Worker', to='cvkbrno.Member'), - ), - ] diff --git a/cvkbrno/migrations/0023_memberwork_comment.py b/cvkbrno/migrations/0023_memberwork_comment.py deleted file mode 100644 index b799c982..00000000 --- a/cvkbrno/migrations/0023_memberwork_comment.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-24 06:33 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cvkbrno', '0022_auto_20160723_1502'), - ] - - operations = [ - migrations.AddField( - model_name='memberwork', - name='comment', - field=models.CharField(blank=True, max_length=100, verbose_name='Comment'), - ), - ] diff --git a/cvkbrno/migrations/__init__.py b/cvkbrno/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/rowers/migrations/0001_initial.py b/rowers/migrations/0001_initial.py deleted file mode 100644 index fb9476fe..00000000 --- a/rowers/migrations/0001_initial.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-26 08:42 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Rower', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('max', models.IntegerField()), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Workout', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('date', models.DateField()), - ('type', models.CharField(choices=[('OTW', 'On-water'), ('OTE', 'Indoor Rower')], max_length=30)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rowers.Rower')), - ], - ), - ] diff --git a/rowers/migrations/0002_auto_20160426_1043.py b/rowers/migrations/0002_auto_20160426_1043.py deleted file mode 100644 index 46f09592..00000000 --- a/rowers/migrations/0002_auto_20160426_1043.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-26 08:43 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='workout', - old_name='type', - new_name='workouttype', - ), - ] diff --git a/rowers/migrations/0003_auto_20160426_1048.py b/rowers/migrations/0003_auto_20160426_1048.py deleted file mode 100644 index 74bd095a..00000000 --- a/rowers/migrations/0003_auto_20160426_1048.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-26 08:48 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0002_auto_20160426_1043'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='workouttype', - field=models.CharField(choices=[('water', 'On-water'), ('rower', 'Indoor Rower'), ('skierg', 'Ski Erg'), ('dynamic', 'Dynamic Indoor Rower'), ('slides', 'Indoor Rower on Slides'), ('paddle', 'Paddle Adapter'), ('snow', 'On-snow')], max_length=30), - ), - ] diff --git a/rowers/migrations/0004_auto_20160426_1441.py b/rowers/migrations/0004_auto_20160426_1441.py deleted file mode 100644 index 4c6f854e..00000000 --- a/rowers/migrations/0004_auto_20160426_1441.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-26 12:41 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0003_auto_20160426_1048'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='an', - field=models.IntegerField(default=180), - ), - migrations.AddField( - model_name='rower', - name='at', - field=models.IntegerField(default=160), - ), - migrations.AddField( - model_name='rower', - name='rest', - field=models.IntegerField(default=48), - ), - migrations.AddField( - model_name='rower', - name='tr', - field=models.IntegerField(default=167), - ), - migrations.AddField( - model_name='rower', - name='ut1', - field=models.IntegerField(default=146), - ), - migrations.AddField( - model_name='rower', - name='ut2', - field=models.IntegerField(default=105), - ), - migrations.AlterField( - model_name='rower', - name='max', - field=models.IntegerField(default=192), - ), - ] diff --git a/rowers/migrations/0005_auto_20160426_1446.py b/rowers/migrations/0005_auto_20160426_1446.py deleted file mode 100644 index c61ffb79..00000000 --- a/rowers/migrations/0005_auto_20160426_1446.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-26 12:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0004_auto_20160426_1441'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='c2token', - field=models.CharField(default='', max_length=50), - ), - migrations.AddField( - model_name='rower', - name='tokenexpirydate', - field=models.DateField(blank=True, null=True), - ), - migrations.AddField( - model_name='rower', - name='weightcategory', - field=models.CharField(default='hwt', max_length=30), - ), - ] diff --git a/rowers/migrations/0006_auto_20160427_1350.py b/rowers/migrations/0006_auto_20160427_1350.py deleted file mode 100644 index 5ba06faf..00000000 --- a/rowers/migrations/0006_auto_20160427_1350.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-27 11:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0005_auto_20160426_1446'), - ] - - operations = [ - migrations.AlterField( - model_name='rower', - name='c2token', - field=models.CharField(blank=True, default='', max_length=50, null=True), - ), - ] diff --git a/rowers/migrations/0007_auto_20160428_1153.py b/rowers/migrations/0007_auto_20160428_1153.py deleted file mode 100644 index 5a0784e9..00000000 --- a/rowers/migrations/0007_auto_20160428_1153.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 09:53 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0006_auto_20160427_1350'), - ] - - operations = [ - migrations.CreateModel( - name='GraphImage', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('filename', models.CharField(blank=True, default='', max_length=50, null=True)), - ('creationdatetime', models.DateTimeField()), - ('workout', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rowers.Workout')), - ], - ), - migrations.AlterField( - model_name='rower', - name='weightcategory', - field=models.CharField(choices=[('hwt', 'heavy-weight'), ('lwt', 'leight-weight')], default='hwt', max_length=30), - ), - ] diff --git a/rowers/migrations/0008_auto_20160428_1154.py b/rowers/migrations/0008_auto_20160428_1154.py deleted file mode 100644 index 16c7a05b..00000000 --- a/rowers/migrations/0008_auto_20160428_1154.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 09:54 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0007_auto_20160428_1153'), - ] - - operations = [ - migrations.AlterField( - model_name='rower', - name='weightcategory', - field=models.CharField(choices=[('hwt', 'heavy-weight'), ('lwt', 'light-weight')], default='hwt', max_length=30), - ), - ] diff --git a/rowers/migrations/0009_auto_20160428_1955.py b/rowers/migrations/0009_auto_20160428_1955.py deleted file mode 100644 index e406694a..00000000 --- a/rowers/migrations/0009_auto_20160428_1955.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 17:55 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0008_auto_20160428_1154'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='starttime', - field=models.TimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='rower', - name='an', - field=models.IntegerField(default=180, verbose_name='AN band lower HR'), - ), - migrations.AlterField( - model_name='rower', - name='at', - field=models.IntegerField(default=160, verbose_name='AT band lower HR'), - ), - migrations.AlterField( - model_name='rower', - name='max', - field=models.IntegerField(default=192, verbose_name='Max Heart Rate'), - ), - migrations.AlterField( - model_name='rower', - name='rest', - field=models.IntegerField(default=48, verbose_name='Resting Heart Rate'), - ), - migrations.AlterField( - model_name='rower', - name='tr', - field=models.IntegerField(default=167, verbose_name='TR band lower HR'), - ), - migrations.AlterField( - model_name='rower', - name='ut1', - field=models.IntegerField(default=146, verbose_name='UT1 band lower HR'), - ), - migrations.AlterField( - model_name='rower', - name='ut2', - field=models.IntegerField(default=105, verbose_name='UT2 band lower HR'), - ), - ] diff --git a/rowers/migrations/0010_workout_distance.py b/rowers/migrations/0010_workout_distance.py deleted file mode 100644 index 85ac5657..00000000 --- a/rowers/migrations/0010_workout_distance.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 17:58 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0009_auto_20160428_1955'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='distance', - field=models.IntegerField(blank=True, default=0), - ), - ] diff --git a/rowers/migrations/0011_auto_20160428_2009.py b/rowers/migrations/0011_auto_20160428_2009.py deleted file mode 100644 index a68306a5..00000000 --- a/rowers/migrations/0011_auto_20160428_2009.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 18:09 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0010_workout_distance'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='csvfilename', - field=models.CharField(blank=True, max_length=50), - ), - migrations.AddField( - model_name='workout', - name='duration', - field=models.IntegerField(blank=True, default=0), - preserve_default=False, - ), - migrations.AddField( - model_name='workout', - name='notes', - field=models.CharField(blank=True, max_length=100), - ), - migrations.AddField( - model_name='workout', - name='uploadedtoc2', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='workout', - name='weightclass', - field=models.CharField(default='hwt', max_length=10), - ), - ] diff --git a/rowers/migrations/0012_auto_20160428_2010.py b/rowers/migrations/0012_auto_20160428_2010.py deleted file mode 100644 index 8ef16d4a..00000000 --- a/rowers/migrations/0012_auto_20160428_2010.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 18:10 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0011_auto_20160428_2009'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='duration', - field=models.IntegerField(blank=True, default=1), - ), - ] diff --git a/rowers/migrations/0013_auto_20160428_2021.py b/rowers/migrations/0013_auto_20160428_2021.py deleted file mode 100644 index 5e3c5111..00000000 --- a/rowers/migrations/0013_auto_20160428_2021.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 18:21 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0012_auto_20160428_2010'), - ] - - operations = [ - migrations.RenameField( - model_name='workout', - old_name='weightclass', - new_name='weightcategory', - ), - ] diff --git a/rowers/migrations/0014_auto_20160428_2251.py b/rowers/migrations/0014_auto_20160428_2251.py deleted file mode 100644 index 46a54491..00000000 --- a/rowers/migrations/0014_auto_20160428_2251.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-28 20:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0013_auto_20160428_2021'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='duration', - field=models.TimeField(blank=True, default=1), - ), - ] diff --git a/rowers/migrations/0015_auto_20160429_2038.py b/rowers/migrations/0015_auto_20160429_2038.py deleted file mode 100644 index ddc88015..00000000 --- a/rowers/migrations/0015_auto_20160429_2038.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-29 18:38 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0014_auto_20160428_2251'), - ] - - operations = [ - migrations.AlterField( - model_name='graphimage', - name='filename', - field=models.CharField(blank=True, default='', max_length=150, null=True), - ), - ] diff --git a/rowers/migrations/0016_auto_20160501_1119.py b/rowers/migrations/0016_auto_20160501_1119.py deleted file mode 100644 index 4c863795..00000000 --- a/rowers/migrations/0016_auto_20160501_1119.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-01 09:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0015_auto_20160429_2038'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='c2refreshtoken', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - migrations.AlterField( - model_name='rower', - name='c2token', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - ] diff --git a/rowers/migrations/0017_auto_20160501_1126.py b/rowers/migrations/0017_auto_20160501_1126.py deleted file mode 100644 index af96a886..00000000 --- a/rowers/migrations/0017_auto_20160501_1126.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-01 09:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0016_auto_20160501_1119'), - ] - - operations = [ - migrations.AlterField( - model_name='rower', - name='tokenexpirydate', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/rowers/migrations/0018_auto_20160501_1944.py b/rowers/migrations/0018_auto_20160501_1944.py deleted file mode 100644 index 3020be4e..00000000 --- a/rowers/migrations/0018_auto_20160501_1944.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-01 17:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0017_auto_20160501_1126'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='uploadedtoc2', - field=models.IntegerField(default=0), - ), - ] diff --git a/rowers/migrations/0019_auto_20160522_1659.py b/rowers/migrations/0019_auto_20160522_1659.py deleted file mode 100644 index c24d0625..00000000 --- a/rowers/migrations/0019_auto_20160522_1659.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-22 14:59 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0018_auto_20160501_1944'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='stravarefreshtoken', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - migrations.AddField( - model_name='rower', - name='stravatoken', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - migrations.AddField( - model_name='rower', - name='stravatokenexpirydate', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/rowers/migrations/0020_auto_20160522_1726.py b/rowers/migrations/0020_auto_20160522_1726.py deleted file mode 100644 index 52b0440a..00000000 --- a/rowers/migrations/0020_auto_20160522_1726.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-22 15:26 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0019_auto_20160522_1659'), - ] - - operations = [ - migrations.RemoveField( - model_name='rower', - name='stravarefreshtoken', - ), - migrations.RemoveField( - model_name='rower', - name='stravatokenexpirydate', - ), - ] diff --git a/rowers/migrations/0021_rower_rowerplan.py b/rowers/migrations/0021_rower_rowerplan.py deleted file mode 100644 index ebc0a422..00000000 --- a/rowers/migrations/0021_rower_rowerplan.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-25 12:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0020_auto_20160522_1726'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='rowerplan', - field=models.CharField(choices=[('basic', 'basic'), ('pro', 'pro')], default='basic', max_length=30), - ), - ] diff --git a/rowers/migrations/0022_auto_20160529_2115.py b/rowers/migrations/0022_auto_20160529_2115.py deleted file mode 100644 index ed585c1a..00000000 --- a/rowers/migrations/0022_auto_20160529_2115.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-29 19:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0021_rower_rowerplan'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='csvfilename', - field=models.CharField(blank=True, max_length=150), - ), - migrations.AlterField( - model_name='workout', - name='notes', - field=models.CharField(blank=True, max_length=200), - ), - migrations.AlterField( - model_name='workout', - name='workouttype', - field=models.CharField(choices=[('water', 'On-water'), ('rower', 'Indoor Rower'), ('skierg', 'Ski Erg'), ('dynamic', 'Dynamic Indoor Rower'), ('slides', 'Indoor Rower on Slides'), ('paddle', 'Paddle Adapter'), ('snow', 'On-snow')], max_length=50), - ), - ] diff --git a/rowers/migrations/0023_auto_20160530_0914.py b/rowers/migrations/0023_auto_20160530_0914.py deleted file mode 100644 index c240493e..00000000 --- a/rowers/migrations/0023_auto_20160530_0914.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-30 07:14 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0022_auto_20160529_2115'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='name', - field=models.CharField(max_length=150), - ), - ] diff --git a/rowers/migrations/0024_workout_uploadedtostrava.py b/rowers/migrations/0024_workout_uploadedtostrava.py deleted file mode 100644 index 29266b17..00000000 --- a/rowers/migrations/0024_workout_uploadedtostrava.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-02 13:56 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0023_auto_20160530_0914'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='uploadedtostrava', - field=models.IntegerField(default=0), - ), - ] diff --git a/rowers/migrations/0025_workout_summary.py b/rowers/migrations/0025_workout_summary.py deleted file mode 100644 index 5399f4a2..00000000 --- a/rowers/migrations/0025_workout_summary.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-08 06:11 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0024_workout_uploadedtostrava'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='summary', - field=models.TextField(blank=True), - ), - ] diff --git a/rowers/migrations/0026_auto_20160608_2137.py b/rowers/migrations/0026_auto_20160608_2137.py deleted file mode 100644 index 04c87107..00000000 --- a/rowers/migrations/0026_auto_20160608_2137.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-08 19:37 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0025_workout_summary'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='averagehr', - field=models.IntegerField(blank=True, default=0), - preserve_default=False, - ), - migrations.AddField( - model_name='workout', - name='maxhr', - field=models.IntegerField(blank=True, default=0), - preserve_default=False, - ), - ] diff --git a/rowers/migrations/0027_workout_uploadedtosporttracks.py b/rowers/migrations/0027_workout_uploadedtosporttracks.py deleted file mode 100644 index 2405cd05..00000000 --- a/rowers/migrations/0027_workout_uploadedtosporttracks.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-09 16:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0026_auto_20160608_2137'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='uploadedtosporttracks', - field=models.IntegerField(default=0), - ), - ] diff --git a/rowers/migrations/0028_rower_sporttrackstoken.py b/rowers/migrations/0028_rower_sporttrackstoken.py deleted file mode 100644 index fc70da44..00000000 --- a/rowers/migrations/0028_rower_sporttrackstoken.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-09 16:37 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0027_workout_uploadedtosporttracks'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='sporttrackstoken', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - ] diff --git a/rowers/migrations/0029_auto_20160610_0825.py b/rowers/migrations/0029_auto_20160610_0825.py deleted file mode 100644 index 68c55066..00000000 --- a/rowers/migrations/0029_auto_20160610_0825.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-10 06:25 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0028_rower_sporttrackstoken'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='uploadedtosporttracks', - field=models.IntegerField(blank=True, default=0), - ), - ] diff --git a/rowers/migrations/0030_auto_20160610_0826.py b/rowers/migrations/0030_auto_20160610_0826.py deleted file mode 100644 index 601c2a41..00000000 --- a/rowers/migrations/0030_auto_20160610_0826.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-10 06:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0029_auto_20160610_0825'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='uploadedtosporttracks', - field=models.IntegerField(blank=True, default=0, null=True), - ), - ] diff --git a/rowers/migrations/0031_auto_20160610_0843.py b/rowers/migrations/0031_auto_20160610_0843.py deleted file mode 100644 index 9386f0e8..00000000 --- a/rowers/migrations/0031_auto_20160610_0843.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-10 06:43 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0030_auto_20160610_0826'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='averagehr', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='workout', - name='maxhr', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='workout', - name='uploadedtosporttracks', - field=models.IntegerField(default=0), - ), - ] diff --git a/rowers/migrations/0032_auto_20160615_1332.py b/rowers/migrations/0032_auto_20160615_1332.py deleted file mode 100644 index ced2bbeb..00000000 --- a/rowers/migrations/0032_auto_20160615_1332.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-15 11:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0031_auto_20160610_0843'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='sporttracksrefreshtoken', - field=models.CharField(blank=True, default='', max_length=200, null=True), - ), - migrations.AddField( - model_name='rower', - name='sporttrackstokenexpirytdata', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/rowers/migrations/0033_auto_20160617_0927.py b/rowers/migrations/0033_auto_20160617_0927.py deleted file mode 100644 index e4192f7b..00000000 --- a/rowers/migrations/0033_auto_20160617_0927.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-17 07:27 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0032_auto_20160615_1332'), - ] - - operations = [ - migrations.RenameField( - model_name='rower', - old_name='sporttrackstokenexpirytdata', - new_name='sporttrackstokenexpirytdate', - ), - ] diff --git a/rowers/migrations/0034_auto_20160617_0929.py b/rowers/migrations/0034_auto_20160617_0929.py deleted file mode 100644 index cbfd2eef..00000000 --- a/rowers/migrations/0034_auto_20160617_0929.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-17 07:29 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0033_auto_20160617_0927'), - ] - - operations = [ - migrations.RenameField( - model_name='rower', - old_name='sporttrackstokenexpirytdate', - new_name='sporttrackstokenexpirydate', - ), - ] diff --git a/rowers/migrations/0035_auto_20160623_0815.py b/rowers/migrations/0035_auto_20160623_0815.py deleted file mode 100644 index 5a3f0332..00000000 --- a/rowers/migrations/0035_auto_20160623_0815.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-23 06:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0034_auto_20160617_0929'), - ] - - operations = [ - migrations.CreateModel( - name='Team', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('notes', models.CharField(blank=True, max_length=200)), - ], - ), - migrations.AlterField( - model_name='rower', - name='rowerplan', - field=models.CharField(choices=[('basic', 'basic'), ('pro', 'pro'), ('coach', 'coach')], default='basic', max_length=30), - ), - migrations.AddField( - model_name='workout', - name='team', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='rowers.Team'), - ), - ] diff --git a/rowers/migrations/0036_rower_team.py b/rowers/migrations/0036_rower_team.py deleted file mode 100644 index 287d3203..00000000 --- a/rowers/migrations/0036_rower_team.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-23 06:17 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0035_auto_20160623_0815'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='team', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='rowers.Team'), - ), - ] diff --git a/rowers/migrations/0037_auto_20160629_1014.py b/rowers/migrations/0037_auto_20160629_1014.py deleted file mode 100644 index b7b30108..00000000 --- a/rowers/migrations/0037_auto_20160629_1014.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-29 08:14 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0036_rower_team'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='boattype', - field=models.CharField(blank=True, choices=[('1x', '1x (single)'), ('2x', '2x (double - not working)')], default='1x', max_length=50), - ), - migrations.AddField( - model_name='workout', - name='weightvalue', - field=models.FloatField(blank=True, default=80.0), - ), - ] diff --git a/rowers/migrations/0038_auto_20160629_1023.py b/rowers/migrations/0038_auto_20160629_1023.py deleted file mode 100644 index ee1ae219..00000000 --- a/rowers/migrations/0038_auto_20160629_1023.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-06-29 08:23 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0037_auto_20160629_1014'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='boattype', - field=models.CharField(blank=True, choices=[('1x', '1x (single)'), ('2x', '2x (double - not working)')], default='1x', max_length=50, verbose_name='Boat Type'), - ), - migrations.AlterField( - model_name='workout', - name='weightvalue', - field=models.FloatField(blank=True, default=80.0, verbose_name='Average Crew Weight (kg)'), - ), - ] diff --git a/rowers/migrations/0039_auto_20160719_2240.py b/rowers/migrations/0039_auto_20160719_2240.py deleted file mode 100644 index 6a187912..00000000 --- a/rowers/migrations/0039_auto_20160719_2240.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-19 20:40 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0038_auto_20160629_1023'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='boattype', - field=models.CharField(choices=[('1x', '1x (single)'), ('2x', '2x (double)'), ('2-', '2- (pair)'), ('4x', '4x (quad)'), ('4-', '4- (four)'), ('8+', '8+ (eight)')], default='1x (single)', max_length=50, verbose_name='Boat Type'), - ), - ] diff --git a/rowers/migrations/0040_workout_startdatetime.py b/rowers/migrations/0040_workout_startdatetime.py deleted file mode 100644 index 856f0870..00000000 --- a/rowers/migrations/0040_workout_startdatetime.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-07-20 19:31 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0039_auto_20160719_2240'), - ] - - operations = [ - migrations.AddField( - model_name='workout', - name='startdatetime', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/rowers/migrations/0041_rower_friends.py b/rowers/migrations/0041_rower_friends.py deleted file mode 100644 index a133aa20..00000000 --- a/rowers/migrations/0041_rower_friends.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-09-01 12:58 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0040_workout_startdatetime'), - ] - - operations = [ - migrations.AddField( - model_name='rower', - name='friends', - field=models.ManyToManyField(related_name='_rower_friends_+', to='rowers.Rower'), - ), - ] diff --git a/rowers/migrations/0042_auto_20161101_2235.py b/rowers/migrations/0042_auto_20161101_2235.py deleted file mode 100644 index da4f530b..00000000 --- a/rowers/migrations/0042_auto_20161101_2235.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-11-01 21:35 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rowers', '0041_rower_friends'), - ] - - operations = [ - migrations.AlterField( - model_name='workout', - name='notes', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/rowers/migrations/__init__.py b/rowers/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/rowers/views/errorviews.py b/rowers/views/errorviews.py index f0c14f4a..d6f7cc7c 100644 --- a/rowers/views/errorviews.py +++ b/rowers/views/errorviews.py @@ -22,14 +22,14 @@ def error500_view(request): response.status_code = 500 return response -def error404_view(request): +def error404_view(request, exception): response = render(request,'404.html', {},status=404) # context_instance = RequestContext(request)) response.status_code = 404 return response -def error400_view(request): +def error400_view(request, exception): response = render(request,'400.html', {},status=400) # context_instance = RequestContext(request)) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index ab39a1d6..5848fe52 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1408,7 +1408,9 @@ def workout_getimportview(request,externalid,source = 'c2'): except ValueError: pass + if strokedata.empty: + print('aap') distance = data['distance'] c2id = data['id'] workouttype = mytypes.c2mappinginv[data['type']]