added support for figures in true_false and multiple choice questions

diff --git a/quiz/admin.py b/quiz/admin.py
index 00e4d1e7a0e2249f580169e3f5ca03de163012ba..a0e56ef5ee218f09015095193bbef0aab7f9479f 100644 (file)
--- a/quiz/admin.py
+++ b/quiz/admin.py
@@ -59,7 +59,7 @@ class CategoryAdmin(admin.ModelAdmin):
 class MCQuestionAdmin(admin.ModelAdmin):
     list_display = ('content', 'category', )
     list_filter = ('category',)
-    fields = ('content', 'category', 'quiz', 'explanation')
+    fields = ('content', 'category', 'figure', 'quiz', 'explanation')
 
     search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)
@@ -78,7 +78,7 @@ class ProgressAdmin(admin.ModelAdmin):
 class TFQuestionAdmin(admin.ModelAdmin):
     list_display = ('content', 'category', )
     list_filter = ('category',)
-    fields = ('content', 'category', 'quiz', 'explanation', 'correct',)
+    fields = ('content', 'category', 'figure', 'quiz', 'explanation', 'correct',)
 
     search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)

diff --git a/quiz/models.py b/quiz/models.py
index 8a7b62cb7998a2dc0b79e18b26dd80776877794d..d84ecd9f8366e1ab348c295bc063cc72d29857d8 100644 (file)
--- a/quiz/models.py
+++ b/quiz/models.py
@@ -463,7 +463,13 @@ class Question(models.Model):
                                  blank=True,
                                  null=True)
 
-    content = models.CharField(max_length=1000,
+    figure = models.ImageField(upload_to='uploads/%Y/%m/%d', 
+                                 blank=True, 
+                                 null=True)
+
+    figure = models.ImageField(upload_to='uploads/%Y/%m/%d',
+                                 blank=True, 
+                                 null=True)
                                blank=False,
                                help_text="Enter the question text that "
                                          "you want displayed",

diff --git a/quiz/templates/question.html b/quiz/templates/question.html
index b980c7432d19b2c490cd9d4dc6edcb58eecfb23c..73425a7451b1319cda4f438449dddd5a9735df5a 100644 (file)
--- a/quiz/templates/question.html
+++ b/quiz/templates/question.html
@@ -48,6 +48,10 @@
 
 <p class="lead">{{ question.content }}</p>
 
+{% if question.figure %}
+    <a src="{{ question.figure.url }}" />
+{% endif %}
+
 <form action="" method="POST">{% csrf_token %}
   <input type=hidden name="question_id" value="{{ question.id }}">