|
|
@@ -174,14 +174,15 @@ class ExamLogViewSet(CustomModelViewSet):
|
|
|
|
|
|
# 右侧习题类别列表
|
|
|
# 单选、多选、填空。选择答案后，可能会把答案清空，得加上NOTDONE过滤
|
|
|
- questions = ExamPaperDetail.objects.filter(main=instance.exampaper, delete=False).values_list('id',
|
|
|
- flat=True)
|
|
|
+ questions = ExamPaperDetail.objects.filter(main=instance.exampaper, delete=False).values('id','question_id',
|
|
|
+ )
|
|
|
single_questions_list = []
|
|
|
for single in questions.filter(question__type=ExamQuestion.SINGLE):
|
|
|
answer_log = ExamAnswerLog.objects.filter(main=instance, detail=single)
|
|
|
single_questions_list.append(
|
|
|
{
|
|
|
- 'question_id': single,
|
|
|
+ 'question_id': single['id'],
|
|
|
+ 'question': single['question_id'],
|
|
|
'complete': answer_log and True or False,
|
|
|
}
|
|
|
)
|
|
|
@@ -191,7 +192,8 @@ class ExamLogViewSet(CustomModelViewSet):
|
|
|
answer_log = ExamAnswerLog.objects.filter(main=instance, detail=multiple)
|
|
|
multiple_questions_list.append(
|
|
|
{
|
|
|
- 'question_id': multiple,
|
|
|
+ 'question_id': multiple['id'],
|
|
|
+ 'question': multiple['question_id'],
|
|
|
'complete': answer_log and True or False,
|
|
|
}
|
|
|
)
|
|
|
@@ -201,7 +203,8 @@ class ExamLogViewSet(CustomModelViewSet):
|
|
|
answer_log = ExamAnswerLog.objects.filter(main=instance, detail=fill)
|
|
|
fill_questions_list.append(
|
|
|
{
|
|
|
- 'question_id': fill,
|
|
|
+ 'question_id': fill['id'],
|
|
|
+ 'question': fill['question_id'],
|
|
|
'complete': answer_log and True or False,
|
|
|
}
|
|
|
)
|
|
|
@@ -211,7 +214,8 @@ class ExamLogViewSet(CustomModelViewSet):
|
|
|
answer_log = ExamAnswerLog.objects.filter(main=instance, detail=judgment)
|
|
|
judgment_questions_list.append(
|
|
|
{
|
|
|
- 'question_id': judgment,
|
|
|
+ 'question_id': judgment['id'],
|
|
|
+ 'question': judgment['question_id'],
|
|
|
'complete': answer_log and True or False,
|
|
|
}
|
|
|
)
|
wushaodong