diff --git a/longs/migrations/0024_auto_20210217_1423.py b/longs/migrations/0024_auto_20210217_1423.py new file mode 100644 index 00000000..dda2d25a --- /dev/null +++ b/longs/migrations/0024_auto_20210217_1423.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.3 on 2021-02-17 14:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0023_auto_20210216_1315'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ciduseranswer', + options={'ordering': ['cid']}, + ), + ] diff --git a/longs/models.py b/longs/models.py index c8cc5870..015d66c3 100644 --- a/longs/models.py +++ b/longs/models.py @@ -406,15 +406,15 @@ class CidUserAnswer(models.Model): class ScoreOptions(models.TextChoices): UNMARKED = "", _("Unmarked") - FOUR = "4", _("4") + FOUR = 4, _("4") FOUR_HALF = "4.5", _("4.5") - FIVE = "5", _("5") + FIVE = 5, _("5") FIVE_HALF = "5.5", _("5.5") - SIX = "6", _("6") + SIX = 6, _("6") SIX_HALF = "6.5", _("6.5") - SEVEN = "7", _("7") + SEVEN = 7, _("7") SEVEN_HALF = "7.5", _("7.5") - EIGHT = "8", _("8") + EIGHT = 8, _("8") score = models.CharField( max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED, blank=True diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html index 95bbca04..6579fcc5 100644 --- a/longs/templates/longs/exam_scores.html +++ b/longs/templates/longs/exam_scores.html @@ -49,7 +49,7 @@ Question {{forloop.counter}} {% for ans, score in by_question|get_item:question %} - {{ans}} + {{score}} {% endfor %} {% endfor %} diff --git a/longs/templates/longs/exam_scores_user.html b/longs/templates/longs/exam_scores_user.html index c6a64ad0..86936e20 100644 --- a/longs/templates/longs/exam_scores_user.html +++ b/longs/templates/longs/exam_scores_user.html @@ -5,8 +5,8 @@

Exam: {{ exam.name }}

Candidate: {{ cid }}

Answers: - +

Longs

+ {% endblock %}