.

longs/admin.py

@@ -89,3 +89,15 @@ admin.site.register(LongSeries, LongSeriesAdmin)
 
 admin.site.register(Exam, ExamAdmin)
 # tagulous.admin.register(Long.condition)
+
+
+#@admin.register(AnswerMarks)
+#class AnswerMarksAdmin(admin.ModelAdmin):
+#    """Foo admin."""
+#
+#    fields = ["score", "mark_reason", "candidate_feedback", "marker"]
+#    list_display = ('name', 'get_bars')
+#    search_fields = ('name',)
+#
+#    def get_user_answer(self, obj):
+#        return obj.user_answer.first()

longs/migrations/0050_auto_20210911_1818.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.6 on 2021-09-11 17:18
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0049_alter_ciduseranswer_mark'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ciduseranswer',
+            name='mark',
+        ),
+        migrations.AddField(
+            model_name='answermarks',
+            name='user_answer',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mark', to='longs.ciduseranswer'),
+        ),
+    ]

longs/models.py

@@ -727,9 +727,9 @@ class CidUserAnswer(models.Model):
         max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED, blank=True, help_text="The final score for the candidate"
     )
 
-    mark = models.ManyToManyField(
-        "AnswerMarks", related_name="user_answer", blank=True
-    )
+    #mark = models.ManyToManyField(
+    #    "AnswerMarks", related_name="user_answer", blank=True
+    #)
     #secondary_mark = models.ForeignKey(
     #    "AnswerMarks", related_name="user_answer", on_delete=models.SET_NULL, null=True, blank=True
     #)
@@ -782,4 +782,8 @@ class AnswerMarks(models.Model):
 
     marker = models.ForeignKey(
         settings.AUTH_USER_MODEL, related_name="marker", on_delete=models.CASCADE
+    )
+
+    user_answer = models.ForeignKey(
+        CidUserAnswer, related_name="mark", on_delete=models.SET_NULL, null=True, blank=True
     )