big migration reset

6 files changed, 35 insertions, 119 deletions

diff --git a/ctrack/register/migrations/0001_initial.py b/ctrack/register/migrations/0001_initial.py
index 2ac7241..7db1237 100644
--- a/ctrack/register/migrations/0001_initial.py
+++ b/ctrack/register/migrations/0001_initial.py
@@ -1,7 +1,5 @@
-# Generated by Django 2.2.9 on 2020-02-21 15:20
+# Generated by Django 2.2.9 on 2020-04-03 14:07
 
-import ctrack.register.models
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,9 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('organisations', '0004_auto_20200220_1634'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('caf', '0002_auto_20200220_1434'),
+        ('caf', '0002_auto_20200403_1407'),
+        ('organisations', '0001_initial'),
     ]
 
     operations = [
@@ -23,23 +20,24 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('descriptor', models.CharField(max_length=50)),
                 ('enforcement_instrument', models.BooleanField(default=False)),
-                ('regulation_reference', models.CharField(blank=True, max_length=100)),
-                ('comments', models.TextField(max_length=1000)),
+                ('regulation_reference', models.CharField(blank=True, max_length=100, null=True)),
+                ('comments', models.TextField(blank=True, max_length=1000, null=True)),
             ],
         ),
         migrations.CreateModel(
             name='EngagementEvent',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('short_description', models.CharField(help_text='Short description of the event', max_length=50)),
                 ('date', models.DateTimeField()),
-                ('end_date', models.DateTimeField(blank=True)),
-                ('document_link', models.URLField(max_length=1000)),
-                ('response_date_requested', models.DateField()),
-                ('response_received', models.DateField()),
+                ('end_date', models.DateTimeField(blank=True, null=True)),
+                ('document_link', models.URLField(blank=True, max_length=1000, null=True)),
+                ('response_date_requested', models.DateField(blank=True, null=True)),
+                ('response_received', models.DateField(blank=True, null=True)),
+                ('comments', models.TextField(blank=True, max_length=1000, null=True)),
                 ('participants', models.ManyToManyField(to='organisations.Person')),
-                ('related_caf', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='caf.CAF')),
+                ('related_caf', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='caf.CAF')),
                 ('type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='register.EngagementType')),
-                ('user', models.ForeignKey(on_delete=models.SET(ctrack.register.models.EngagementEvent.get_sentinel_user), to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]
diff --git a/ctrack/register/migrations/0002_auto_20200221_1527.py b/ctrack/register/migrations/0002_auto_20200221_1527.py
deleted file mode 100644
index ad82341..0000000
--- a/ctrack/register/migrations/0002_auto_20200221_1527.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Generated by Django 2.2.9 on 2020-02-21 15:27
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('register', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='document_link',
-            field=models.URLField(blank=True, max_length=1000, null=True),
-        ),
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='end_date',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='related_caf',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='caf.CAF'),
-        ),
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='response_date_requested',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='response_received',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='engagementtype',
-            name='comments',
-            field=models.TextField(blank=True, max_length=1000, null=True),
-        ),
-        migrations.AlterField(
-            model_name='engagementtype',
-            name='regulation_reference',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-    ]
diff --git a/ctrack/register/migrations/0002_engagementevent_user.py b/ctrack/register/migrations/0002_engagementevent_user.py
new file mode 100644
index 0000000..59c93d6
--- /dev/null
+++ b/ctrack/register/migrations/0002_engagementevent_user.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.9 on 2020-04-03 14:07
+
+import ctrack.register.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('register', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='engagementevent',
+            name='user',
+            field=models.ForeignKey(on_delete=models.SET(ctrack.register.models.EngagementEvent.get_sentinel_user), to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/ctrack/register/migrations/0003_engagementevent_short_description.py b/ctrack/register/migrations/0003_engagementevent_short_description.py
deleted file mode 100644
index dc976f9..0000000
--- a/ctrack/register/migrations/0003_engagementevent_short_description.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.9 on 2020-02-21 15:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('register', '0002_auto_20200221_1527'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='engagementevent',
-            name='short_description',
-            field=models.CharField(default='NA', help_text='Short description of the event', max_length=50),
-            preserve_default=False,
-        ),
-    ]
diff --git a/ctrack/register/migrations/0004_engagementevent_comments.py b/ctrack/register/migrations/0004_engagementevent_comments.py
deleted file mode 100644
index 3379b03..0000000
--- a/ctrack/register/migrations/0004_engagementevent_comments.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.9 on 2020-03-03 09:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('register', '0003_engagementevent_short_description'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='engagementevent',
-            name='comments',
-            field=models.TextField(default='No comment', max_length=1000),
-            preserve_default=False,
-        ),
-    ]
diff --git a/ctrack/register/migrations/0005_auto_20200303_0909.py b/ctrack/register/migrations/0005_auto_20200303_0909.py
deleted file mode 100644
index 94551a5..0000000
--- a/ctrack/register/migrations/0005_auto_20200303_0909.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.9 on 2020-03-03 09:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('register', '0004_engagementevent_comments'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='engagementevent',
-            name='comments',
-            field=models.TextField(blank=True, max_length=1000, null=True),
-        ),
-    ]