diff --git a/smash/web/migrations/0126_auto_20181030_1733.py b/smash/web/migrations/0126_auto_20181030_1733.py new file mode 100644 index 0000000000000000000000000000000000000000..95685160ed73cc2db73c1bb3203e2f7f07e225e9 --- /dev/null +++ b/smash/web/migrations/0126_auto_20181030_1733.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-10-30 17:33 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0125_merge_20181025_0745'), + ] + + operations = [ + migrations.AlterField( + model_name='subject', + name='phone_number', + field=models.CharField(blank=True, max_length=64, null=True, verbose_name=b'Phone number'), + ), + migrations.AlterField( + model_name='subject', + name='phone_number_2', + field=models.CharField(blank=True, max_length=64, null=True, verbose_name=b'Phone number 2'), + ), + migrations.AlterField( + model_name='subject', + name='phone_number_3', + field=models.CharField(blank=True, max_length=64, null=True, verbose_name=b'Phone number 3'), + ), + ] diff --git a/smash/web/migrations/0127_auto_20181031_0959.py b/smash/web/migrations/0127_auto_20181031_0959.py new file mode 100644 index 0000000000000000000000000000000000000000..1ea22a278f0232bcced072ab3a6b7af06becfa21 --- /dev/null +++ b/smash/web/migrations/0127_auto_20181031_0959.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-10-31 09:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0126_auto_20181030_1733'), + ] + + operations = [ + migrations.AddField( + model_name='studysubject', + name='exclude_reason', + field=models.TextField(blank=True, max_length=2000, verbose_name=b'Exclude reason'), + ), + migrations.AddField( + model_name='studysubject', + name='excluded', + field=models.BooleanField(default=False, verbose_name=b'Excluded'), + ), + ] diff --git a/smash/web/migrations/0128_studycolumns_excluded.py b/smash/web/migrations/0128_studycolumns_excluded.py new file mode 100644 index 0000000000000000000000000000000000000000..3814c094fc5b36c81bbde0ee409b805a3fb32418 --- /dev/null +++ b/smash/web/migrations/0128_studycolumns_excluded.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-10-31 10:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0127_auto_20181031_0959'), + ] + + operations = [ + migrations.AddField( + model_name='studycolumns', + name='excluded', + field=models.BooleanField(default=True, verbose_name=b'Excluded'), + ), + ] diff --git a/smash/web/migrations/0129_auto_20181031_1348.py b/smash/web/migrations/0129_auto_20181031_1348.py new file mode 100644 index 0000000000000000000000000000000000000000..3cad6e89ca098101e35fc79b8d1ce78d63f39b08 --- /dev/null +++ b/smash/web/migrations/0129_auto_20181031_1348.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-10-31 13:48 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0128_studycolumns_excluded'), + ] + + operations = [ + migrations.AlterField( + model_name='studycolumns', + name='excluded', + field=models.BooleanField(default=False, verbose_name=b'Excluded'), + ), + ] diff --git a/smash/web/models/visit.py b/smash/web/models/visit.py index bf5c2bb8e9485e4cf03205f83ac5c9f52d19e122..47ac3d8a7287d4bc57395a91e265a1b89f49a69f 100644 --- a/smash/web/models/visit.py +++ b/smash/web/models/visit.py @@ -13,8 +13,7 @@ class Visit(models.Model): class Meta: app_label = 'web' - subject = models.ForeignKey("web.StudySubject", on_delete=models.CASCADE, - verbose_name='Subject' + subject = models.ForeignKey("web.StudySubject", on_delete=models.CASCADE, verbose_name='Subject' ) datetime_begin = models.DateTimeField( verbose_name='Visit starts at'