ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update sba testing (and fix others)

Browse Source
This commit is contained in:
Ross
2023-10-09 12:44:11 +01:00
parent 297f8619b4
commit 9b16596d0c
13 changed files with 363 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
physics/views.py
+62 -62
View File
@@ -100,68 +100,68 @@ def active_exams(request):
return render(request, "physics/available_exam_list.html", {"exams": active_exams})
def exam_scores_cid_user(request, pk, cid=None, passcode=None):
exam = get_object_or_404(Exam, pk=pk)
exam.check_user_can_review(cid, passcode, request)
questions = exam.exam_questions.all()
answers_and_marks = []
answers_marks = []
answers = []
view_all_results = False
if request.user.groups.filter(name="view_all_results").exists():
view_all_results = True
for q in questions:
# Get user answer
if cid is not None:
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
else:
user_answer = q.cid_user_answers.filter(
user=request.user, exam__id=pk
).first()
if user_answer is None:
answer_scores = (0, 0, 0, 0, 0)
ans = ("", "", "", "", "")
else:
ans = user_answer.get_answers()
answer_scores = user_answer.get_answer_score()
correct_answers = q.get_answers()
if not exam.publish_results and not view_all_results:
correct_answers = ("*****", "*****", "*****", "*****", "*****")
answer_scores = (0, 0, 0, 0, 0)
answers.append(ans)
answers_marks.append(answer_scores)
merged_ans = zip(q.get_questions(), ans, answer_scores, correct_answers)
answers_and_marks.append((q, merged_ans))
total_score = sum(sum(i) for i in answers_marks)
max_score = len(questions) * 5
return render(
request,
"physics/exam_scores_user.html",
{
"exam": exam,
"cid": cid,
"passcode": passcode,
"questions": questions,
"answers": answers,
"answers_marks": answers_marks,
"total_score": total_score,
"max_score": max_score,
"answers_and_marks": answers_and_marks,
"view_all_results": view_all_results,
},
)
#def exam_scores_cid_user(request, pk, cid=None, passcode=None):
# exam = get_object_or_404(Exam, pk=pk)
#
# exam.check_user_can_review(cid, passcode, request)
#
# questions = exam.exam_questions.all()
#
# answers_and_marks = []
# answers_marks = []
# answers = []
#
# view_all_results = False
# if request.user.groups.filter(name="view_all_results").exists():
# view_all_results = True
#
# for q in questions:
# # Get user answer
# if cid is not None:
# user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
# else:
# user_answer = q.cid_user_answers.filter(
# user=request.user, exam__id=pk
# ).first()
#
# if user_answer is None:
# answer_scores = (0, 0, 0, 0, 0)
# ans = ("", "", "", "", "")
# else:
# ans = user_answer.get_answers()
# answer_scores = user_answer.get_answer_score()
#
# correct_answers = q.get_answers()
#
# if not exam.publish_results and not view_all_results:
# correct_answers = ("*****", "*****", "*****", "*****", "*****")
# answer_scores = (0, 0, 0, 0, 0)
# answers.append(ans)
# answers_marks.append(answer_scores)
#
# merged_ans = zip(q.get_questions(), ans, answer_scores, correct_answers)
# answers_and_marks.append((q, merged_ans))
#
# total_score = sum(sum(i) for i in answers_marks)
#
# max_score = len(questions) * 5
#
# return render(
# request,
# "physics/exam_scores_user.html",
# {
# "exam": exam,
# "cid": cid,
# "passcode": passcode,
# "questions": questions,
# "answers": answers,
# "answers_marks": answers_marks,
# "total_score": total_score,
# "max_score": max_score,
# "answers_and_marks": answers_and_marks,
# "view_all_results": view_all_results,
# },
# )
def exam_take_old(request, pk):