.
This commit is contained in:
+6
-1
@@ -562,6 +562,11 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
answers_marks = []
|
answers_marks = []
|
||||||
answers = []
|
answers = []
|
||||||
|
|
||||||
|
|
||||||
|
view_all_results = False
|
||||||
|
if request.user.groups.filter(name="view_all_results").exists():
|
||||||
|
view_all_results = True
|
||||||
|
|
||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
||||||
@@ -578,7 +583,7 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
|
|
||||||
correct_answer = q.get_primary_answer()
|
correct_answer = q.get_primary_answer()
|
||||||
|
|
||||||
if not exam.publish_results:
|
if not exam.publish_results and not view_all_results:
|
||||||
correct_answer = "*****"
|
correct_answer = "*****"
|
||||||
answer_score = 0
|
answer_score = 0
|
||||||
answers.append(ans)
|
answers.append(ans)
|
||||||
|
|||||||
+6
-1
@@ -961,6 +961,11 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
#answers = []
|
#answers = []
|
||||||
answer_text = []
|
answer_text = []
|
||||||
|
|
||||||
|
|
||||||
|
view_all_results = False
|
||||||
|
if request.user.groups.filter(name="view_all_results").exists():
|
||||||
|
view_all_results = True
|
||||||
|
|
||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
||||||
@@ -980,7 +985,7 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
|
|
||||||
answer_text.append((user_answer.answer_observations, user_answer.answer_interpretation, user_answer.answer_principle_diagnosis, user_answer.answer_differential_diagnosis, user_answer.answer_management))
|
answer_text.append((user_answer.answer_observations, user_answer.answer_interpretation, user_answer.answer_principle_diagnosis, user_answer.answer_differential_diagnosis, user_answer.answer_management))
|
||||||
|
|
||||||
if not exam.publish_results:
|
if not exam.publish_results and not view_all_results:
|
||||||
answer_score = 0
|
answer_score = 0
|
||||||
#answers.append(ans)
|
#answers.append(ans)
|
||||||
answers_marks.append(answer_score)
|
answers_marks.append(answer_score)
|
||||||
|
|||||||
+6
-1
@@ -911,6 +911,11 @@ def exam_scores_cid_user(request, pk, cid):
|
|||||||
answers_marks = []
|
answers_marks = []
|
||||||
answers = []
|
answers = []
|
||||||
|
|
||||||
|
|
||||||
|
view_all_results = False
|
||||||
|
if request.user.groups.filter(name="view_all_results").exists():
|
||||||
|
view_all_results = True
|
||||||
|
|
||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
||||||
@@ -930,7 +935,7 @@ def exam_scores_cid_user(request, pk, cid):
|
|||||||
|
|
||||||
correct_answer = q.get_primary_answer()
|
correct_answer = q.get_primary_answer()
|
||||||
|
|
||||||
if not exam.publish_results:
|
if not exam.publish_results and not view_all_results:
|
||||||
correct_answer = "*****"
|
correct_answer = "*****"
|
||||||
answer_score = 0
|
answer_score = 0
|
||||||
answers.append(ans)
|
answers.append(ans)
|
||||||
|
|||||||
+6
-1
@@ -191,6 +191,11 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
answers_marks = []
|
answers_marks = []
|
||||||
answers = []
|
answers = []
|
||||||
|
|
||||||
|
|
||||||
|
view_all_results = False
|
||||||
|
if request.user.groups.filter(name="view_all_results").exists():
|
||||||
|
view_all_results = True
|
||||||
|
|
||||||
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()
|
||||||
@@ -205,7 +210,7 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
|
|
||||||
correct_answer = q.get_correct_answer()
|
correct_answer = q.get_correct_answer()
|
||||||
|
|
||||||
if not exam.publish_results:
|
if not exam.publish_results and not view_all_results:
|
||||||
correct_answer = "*****"
|
correct_answer = "*****"
|
||||||
answer_score = 0
|
answer_score = 0
|
||||||
answers.append(ans)
|
answers.append(ans)
|
||||||
|
|||||||
Reference in New Issue
Block a user