From b1cb8b9e8b158300a7745ecf4eb0c22b819e928c Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Apr 2022 22:56:48 +0100 Subject: [PATCH] . --- .../migrations/0059_exam_include_history.py | 18 ++++++++++++++++++ generic/models.py | 5 +++++ longs/migrations/0058_exam_include_history.py | 18 ++++++++++++++++++ .../migrations/0018_exam_include_history.py | 18 ++++++++++++++++++ rapids/migrations/0046_exam_include_history.py | 18 ++++++++++++++++++ rapids/models.py | 5 +++++ .../rapids/question_display_block.html | 2 +- sbas/migrations/0010_exam_include_history.py | 18 ++++++++++++++++++ 8 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 anatomy/migrations/0059_exam_include_history.py create mode 100644 longs/migrations/0058_exam_include_history.py create mode 100644 physics/migrations/0018_exam_include_history.py create mode 100644 rapids/migrations/0046_exam_include_history.py create mode 100644 sbas/migrations/0010_exam_include_history.py diff --git a/anatomy/migrations/0059_exam_include_history.py b/anatomy/migrations/0059_exam_include_history.py new file mode 100644 index 00000000..51446404 --- /dev/null +++ b/anatomy/migrations/0059_exam_include_history.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0058_exam_user_scores'), + ] + + operations = [ + migrations.AddField( + model_name='exam', + name='include_history', + field=models.BooleanField(default=False, help_text='If an exam should include history when taking'), + ), + ] diff --git a/generic/models.py b/generic/models.py index 48afef4c..0d1fe0a2 100644 --- a/generic/models.py +++ b/generic/models.py @@ -80,6 +80,11 @@ class ExamBase(models.Model): default=False, ) + include_history = models.BooleanField( + help_text="If an exam should include history when taking", + default=False, + ) + publish_results = models.BooleanField( help_text="If an exams results should be available", default=False ) diff --git a/longs/migrations/0058_exam_include_history.py b/longs/migrations/0058_exam_include_history.py new file mode 100644 index 00000000..09293599 --- /dev/null +++ b/longs/migrations/0058_exam_include_history.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0057_exam_user_scores'), + ] + + operations = [ + migrations.AddField( + model_name='exam', + name='include_history', + field=models.BooleanField(default=False, help_text='If an exam should include history when taking'), + ), + ] diff --git a/physics/migrations/0018_exam_include_history.py b/physics/migrations/0018_exam_include_history.py new file mode 100644 index 00000000..47cce439 --- /dev/null +++ b/physics/migrations/0018_exam_include_history.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('physics', '0017_exam_user_scores'), + ] + + operations = [ + migrations.AddField( + model_name='exam', + name='include_history', + field=models.BooleanField(default=False, help_text='If an exam should include history when taking'), + ), + ] diff --git a/rapids/migrations/0046_exam_include_history.py b/rapids/migrations/0046_exam_include_history.py new file mode 100644 index 00000000..e7fc27f4 --- /dev/null +++ b/rapids/migrations/0046_exam_include_history.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0045_rapidimage_description'), + ] + + operations = [ + migrations.AddField( + model_name='exam', + name='include_history', + field=models.BooleanField(default=False, help_text='If an exam should include history when taking'), + ), + ] diff --git a/rapids/models.py b/rapids/models.py index d145c18d..2a2b962f 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -463,6 +463,7 @@ class Rapid(models.Model): "type": "rapid", } + json["history"] = self.history json["normal"] = self.normal json["feedback_images"] = feedback_images json["answers"] = list(self.get_correct_unstripped_answers()) @@ -632,6 +633,10 @@ class Exam(ExamBase): q.get_correct_unstripped_answers() ) + if self.include_history: + exam_questions[q.id]["history"] = q.history + + # if feedback_images: # exam_questions[q.id]["feedback_image"] = feedback_images diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html index 73186964..644760df 100755 --- a/rapids/templates/rapids/question_display_block.html +++ b/rapids/templates/rapids/question_display_block.html @@ -22,7 +22,7 @@
Images: {% for image in question.images.all %} - Image {{ forloop.counter }}{% if image.feedback_image %} [feedback image]{% endif %}: + Image {{ forloop.counter }}{% if image.description %} ({{image.description}}){% endif %}{% if image.feedback_image %} [feedback image]{% endif %}:
diff --git a/sbas/migrations/0010_exam_include_history.py b/sbas/migrations/0010_exam_include_history.py new file mode 100644 index 00000000..691235dd --- /dev/null +++ b/sbas/migrations/0010_exam_include_history.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sbas', '0009_exam_user_scores'), + ] + + operations = [ + migrations.AddField( + model_name='exam', + name='include_history', + field=models.BooleanField(default=False, help_text='If an exam should include history when taking'), + ), + ]