This commit is contained in:
Ross
2021-03-03 21:02:39 +00:00
parent 619082061f
commit 7f5af94df2
2 changed files with 20 additions and 0 deletions
@@ -11,6 +11,19 @@
{% endfor %} {% endfor %}
</ul> </ul>
<br /> Total mark: {{ total_score }} / {{max_score}} <br /> Total mark: {{ total_score }} / {{max_score}}
<div>
<h4>Answers</h4>
<ul>{% for answer in answer_text %}
<li class="user-answer-li">Observation</br>{{answer[0]}}</li>
<li class="user-answer-li">Interpretation</br>{{answer[1]}}</li>
<li class="user-answer-li">Principle Diagnosis</br>{{answer[2]}}</li>
<li class="user-answer-li">Differential Diagnosis</br>{{answer[3]}}</li>
<li class="user-answer-li">Management</br>{{answer[4]}}</li>
{% endfor %}
</ul>
</div>
<div> <div>
<a href="{% url 'cid_scores' cid %}">Other exams</a> <a href="{% url 'cid_scores' cid %}">Other exams</a>
</div> </div>
+7
View File
@@ -889,21 +889,27 @@ def exam_scores_cid_user(request, pk, sk):
#answers_and_marks = [] #answers_and_marks = []
answers_marks = [] answers_marks = []
#answers = [] #answers = []
answer_text = []
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 or user_answer is None: if not user_answer or user_answer is None:
# skip if no answer # skip if no answer
#answers_marks.append("") #answers_marks.append("")
#answers.append("") #answers.append("")
answer_score = 4 answer_score = 4
#ans = "Not answered" #ans = "Not answered"
answer_text.append("Not answered")
else: else:
answer_score = user_answer.get_answer_score() answer_score = user_answer.get_answer_score()
answer_text.append((answer_observations, answer_interpretation, answer_principle_diagnosis, answer_differential_diagnosis, answer_management))
if not exam.publish_results: if not exam.publish_results:
answer_score = 0 answer_score = 0
#answers.append(ans) #answers.append(ans)
@@ -931,6 +937,7 @@ def exam_scores_cid_user(request, pk, sk):
"answers_marks": answers_marks, "answers_marks": answers_marks,
"total_score": total_score, "total_score": total_score,
"max_score": max_score, "max_score": max_score,
"answer_text": answer_text
#"answers_and_marks": answers_and_marks, #"answers_and_marks": answers_and_marks,
}, },
) )