3 files changed, 48 insertions, 35 deletions
diff --git a/ctrack/caf/migrations/0001_initial.py b/ctrack/caf/migrations/0001_initial.py
index 8e0b11a..bc6cc5a 100644
--- a/ctrack/caf/migrations/0001_initial.py
+++ b/ctrack/caf/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.9 on 2020-01-25 16:56
+# Generated by Django 2.2.9 on 2020-02-18 16:05
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,18 +9,26 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('organisations', '0014_auto_20200125_1459'),
     ]
 
     operations = [
         migrations.CreateModel(
+            name='CAF',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('essential_system', models.CharField(blank=True, max_length=255)),
+            ],
+            options={
+                'verbose_name': 'CAF',
+            },
+        ),
+        migrations.CreateModel(
             name='CAFFileStore',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('descriptor', models.CharField(max_length=100)),
                 ('virtual_location', models.CharField(help_text='USB, Rosa, email, etc', max_length=100)),
                 ('physical_location', models.CharField(blank=True, help_text='Cupboard, room, building, etc', max_length=100)),
-                ('physical_location_organisation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')),
             ],
             options={
                 'verbose_name': 'CAF File Store',
@@ -43,17 +51,4 @@ class Migration(migrations.Migration):
                 ('file_store_location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.CAFFileStore')),
             ],
         ),
-        migrations.CreateModel(
-            name='CAF',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('essential_system', models.CharField(blank=True, max_length=255)),
-                ('file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')),
-                ('triage_ranking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.Ranking')),
-            ],
-            options={
-                'verbose_name': 'CAF',
-            },
-        ),
     ]
diff --git a/ctrack/caf/migrations/0002_auto_20200207_1622.py b/ctrack/caf/migrations/0002_auto_20200207_1622.py
deleted file mode 100644
index 2d4575b..0000000
--- a/ctrack/caf/migrations/0002_auto_20200207_1622.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.9 on 2020-02-07 16:22
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('caf', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='caf',
-            name='file',
-            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile'),
-        ),
-    ]
diff --git a/ctrack/caf/migrations/0002_auto_20200218_1605.py b/ctrack/caf/migrations/0002_auto_20200218_1605.py
new file mode 100644
index 0000000..bd43d8e
--- /dev/null
+++ b/ctrack/caf/migrations/0002_auto_20200218_1605.py
@@ -0,0 +1,37 @@
+# Generated by Django 2.2.9 on 2020-02-18 16:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('caf', '0001_initial'),
+        ('organisations', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='caffilestore',
+            name='physical_location_organisation',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation'),
+        ),
+        migrations.AddField(
+            model_name='caf',
+            name='file',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile'),
+        ),
+        migrations.AddField(
+            model_name='caf',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation'),
+        ),
+        migrations.AddField(
+            model_name='caf',
+            name='triage_ranking',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.Ranking'),
+        ),
+    ]