.

longs/models.py

@@ -553,7 +553,7 @@ class Exam(ExamBase):
         return exam_question
 
 
-    def get_exam_json(self):
+    def get_exam_json(self, based=False):
         questions = self.exam_questions.all()
 
         exam_questions = defaultdict(dict)
@@ -562,13 +562,13 @@ class Exam(ExamBase):
 
         n = 1
         for q in questions:
+            if based:
                 exam_order.append(q.id)
 
                 exam_questions[q.id] = q.json_creation_time.isoformat()
 
-            continue
-
-            # Loop through longimage associations
+            else:
+                # TODO: combine with question_json
                 images = []
                 image_titles = []
                 for series in q.series.all():
@@ -576,7 +576,7 @@ class Exam(ExamBase):
                     #for i in series.images.all():
                     #    image_array.append(image_as_base64(i.image))
                     #    #image_array.append(i.image.url)
-                image_array = [image_as_base64(i.image) for i in series.images.all()]
+                    image_array = [i.image.url for i in series.images.all()]
                     images.append(image_array)
                     image_titles.append(series.get_examination())