.
This commit is contained in:
@@ -222,6 +222,8 @@ class Rapid(models.Model):
|
|||||||
def GetPrimaryAnswer(self):
|
def GetPrimaryAnswer(self):
|
||||||
if len(self.answers.all()) > 0:
|
if len(self.answers.all()) > 0:
|
||||||
return self.answers.all().first().answer
|
return self.answers.all().first().answer
|
||||||
|
elif self.normal:
|
||||||
|
return "Normal"
|
||||||
else:
|
else:
|
||||||
return "None yet..."
|
return "None yet..."
|
||||||
|
|
||||||
|
|||||||
+5
-2
@@ -1017,16 +1017,19 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
user_answer = q.cid_user_answers.filter(cid=cid).first()
|
user_answer = q.cid_user_answers.filter(cid=cid).first()
|
||||||
|
|
||||||
|
|
||||||
if not user_answer:
|
if not user_answer:
|
||||||
# skip if no answer
|
# skip if no answer
|
||||||
answers_marks.append(0)
|
answers_marks.append(0)
|
||||||
answers.append("")
|
answers.append("")
|
||||||
answer_score = 0
|
answer_score = 0
|
||||||
ans = "Not answered"
|
ans = "Not answered"
|
||||||
|
elif user_answer.normal:
|
||||||
|
ans = "Normal"
|
||||||
else:
|
else:
|
||||||
ans = user_answer.answer
|
ans = user_answer.answer
|
||||||
|
answer_score = user_answer.get_answer_score()
|
||||||
answer_score = user_answer.get_answer_score()
|
|
||||||
|
|
||||||
correct_answer = q.GetPrimaryAnswer()
|
correct_answer = q.GetPrimaryAnswer()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user