2 files changed, 35 insertions, 11 deletions
diff --git a/ctrack/assessments/migrations/0001_initial.py b/ctrack/assessments/migrations/0001_initial.py
index 3789ad7..a9c6a43 100644
--- a/ctrack/assessments/migrations/0001_initial.py
+++ b/ctrack/assessments/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.12 on 2020-08-27 09:40
+# Generated by Django 3.1.2 on 2020-10-14 16:05
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,8 +9,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('organisations', '0001_initial'),
-        ('caf', '0001_initial'),
     ]
 
     operations = [
@@ -28,8 +26,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('comments', models.TextField(max_length=500)),
-                ('caf', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.CAF')),
-                ('completer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Person')),
             ],
             options={
                 'verbose_name': 'CAF Assessment',
@@ -65,8 +61,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('descriptive_text', models.CharField(max_length=2000)),
-                ('achievement_level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.AchievementLevel')),
-                ('contributing_outcome', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.CAFContributingOutcome')),
+                ('achievement_level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.achievementlevel')),
+                ('contributing_outcome', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.cafcontributingoutcome')),
             ],
             options={
                 'verbose_name': 'IGP',
@@ -80,7 +76,7 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(max_length=50)),
                 ('description', models.TextField(max_length=1000)),
                 ('order_id', models.IntegerField()),
-                ('caf_objective', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.CAFObjective')),
+                ('caf_objective', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.cafobjective')),
             ],
             options={
                 'verbose_name': 'CAF Principle',
@@ -89,7 +85,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cafcontributingoutcome',
             name='principle',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.CAFPrinciple'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.cafprinciple'),
         ),
         migrations.CreateModel(
             name='CAFAssessmentOutcomeScore',
@@ -97,8 +93,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('assessment_score', models.CharField(choices=[('Achieved', 'Achieved'), ('Partially Achieved', 'Partially Achieved'), ('Not Achieved', 'Not Achieved')], help_text='Choose an assessment score', max_length=20, verbose_name='Assessment Score')),
                 ('baseline_assessment_score', models.CharField(choices=[('Achieved', 'Achieved'), ('Partially Achieved', 'Partially Achieved'), ('Not Achieved', 'Not Achieved')], help_text='Choose an assessment score', max_length=20, verbose_name='Baseline Score')),
-                ('caf_assessment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.CAFAssessment', verbose_name='CAF Assessment')),
-                ('caf_contributing_outcome', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.CAFContributingOutcome', verbose_name='CAF Contributing Outcome')),
+                ('caf_assessment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.cafassessment', verbose_name='CAF Assessment')),
+                ('caf_contributing_outcome', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assessments.cafcontributingoutcome', verbose_name='CAF Contributing Outcome')),
             ],
             options={
                 'verbose_name': 'CAF Assessment Outcome Score',
diff --git a/ctrack/assessments/migrations/0002_auto_20201014_1605.py b/ctrack/assessments/migrations/0002_auto_20201014_1605.py
new file mode 100644
index 0000000..3a20060
--- /dev/null
+++ b/ctrack/assessments/migrations/0002_auto_20201014_1605.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.1.2 on 2020-10-14 16:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('caf', '0001_initial'),
+        ('assessments', '0001_initial'),
+        ('organisations', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cafassessment',
+            name='caf',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.caf'),
+        ),
+        migrations.AddField(
+            model_name='cafassessment',
+            name='completer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.person'),
+        ),
+    ]