This commit is contained in:
Ross
2021-04-18 12:11:05 +01:00
parent e2e04a8c39
commit a3ee399c63
+27 -27
View File
@@ -553,7 +553,7 @@ class Exam(ExamBase):
return exam_question return exam_question
def get_exam_json(self): def get_exam_json(self, based=False):
questions = self.exam_questions.all() questions = self.exam_questions.all()
exam_questions = defaultdict(dict) exam_questions = defaultdict(dict)
@@ -562,38 +562,38 @@ class Exam(ExamBase):
n = 1 n = 1
for q in questions: for q in questions:
exam_order.append(q.id) if based:
exam_order.append(q.id)
exam_questions[q.id] = q.json_creation_time.isoformat() exam_questions[q.id] = q.json_creation_time.isoformat()
continue else:
# TODO: combine with question_json
# Loop through longimage associations images = []
images = [] image_titles = []
image_titles = [] for series in q.series.all():
for series in q.series.all(): #image_array = []
#image_array = [] #for i in series.images.all():
#for i in series.images.all(): # image_array.append(image_as_base64(i.image))
# image_array.append(image_as_base64(i.image)) # #image_array.append(i.image.url)
# #image_array.append(i.image.url) image_array = [i.image.url for i in series.images.all()]
image_array = [image_as_base64(i.image) for i in series.images.all()] images.append(image_array)
images.append(image_array) image_titles.append(series.get_examination())
image_titles.append(series.get_examination())
#exam_questions[q.id] = n #exam_questions[q.id] = n
exam_questions[q.id] = { exam_questions[q.id] = {
"title": q.history, "title": q.history,
"images": images, "images": images,
"image_titles": image_titles, "image_titles": image_titles,
#"feedback_image": [], #"feedback_image": [],
#"annotations": [str(q.image_annotations)], #"annotations": [str(q.image_annotations)],
"type": "long", "type": "long",
} }
#if feedback_images: #if feedback_images:
# exam_questions[q.id]["feedback_image"] = feedback_images # exam_questions[q.id]["feedback_image"] = feedback_images
exam_json = { exam_json = {