From 25ac8762d9a3679d267ebf282ea8fef261875503 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 15 Dec 2021 20:02:33 +0000 Subject: [PATCH] . --- .../0056_alter_ciduseranswer_score.py | 18 ++++++++++++++++++ anatomy/models.py | 12 ------------ generic/views.py | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 anatomy/migrations/0056_alter_ciduseranswer_score.py diff --git a/anatomy/migrations/0056_alter_ciduseranswer_score.py b/anatomy/migrations/0056_alter_ciduseranswer_score.py new file mode 100644 index 00000000..d1061bae --- /dev/null +++ b/anatomy/migrations/0056_alter_ciduseranswer_score.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.8 on 2021-12-15 20:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0055_ciduseranswer_score'), + ] + + operations = [ + migrations.AlterField( + model_name='ciduseranswer', + name='score', + field=models.CharField(blank=True, choices=[('', 'Unmarked'), ('0', 'Incorrect'), ('1', 'Half mark'), ('2', 'Correct')], default='', max_length=1), + ), + ] diff --git a/anatomy/models.py b/anatomy/models.py index 548094cc..82681137 100644 --- a/anatomy/models.py +++ b/anatomy/models.py @@ -214,18 +214,6 @@ class AnatomyQuestion(models.Model): if i.status != i.MarkOptions.UNMARKED ] ) - # correct_answers = set( - # [i.answer.get_compare_string() for i in self.answers.all()] - # ) - # half_mark_answers = set( - # [i.answer.get_compare_string() for i in self.half_mark_answers.all()] - # ) - # incorrect_answers = set( - # [i.answer.get_compare_string() for i in self.incorrect_answers.all()] - # ) - - # marked_answers = correct_answers | half_mark_answers | incorrect_answers - # return marked_answers def get_annotations(self): return self.image_annotations diff --git a/generic/views.py b/generic/views.py index da0ba0af..ac8d1409 100644 --- a/generic/views.py +++ b/generic/views.py @@ -435,7 +435,7 @@ class ExamViews(View, LoginRequiredMixin): return render( request, - "rapids/base.html", + f"{self.app_name}/base.html", { "simple_content": "Answer scores updated", },