move sbas and physics exam_scores_cid_user into generic view

physics/views.py

@@ -100,70 +100,6 @@ 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_take_old(request, pk):
     exam = get_object_or_404(Exam, pk=pk)
 

sbas/views.py

@@ -99,70 +99,6 @@ def active_exams(request):
     return render(request, "sbas/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_score = 0
-#            ans = ""
-#        else:
-#            answer_score = user_answer.get_answer_score()
-#            ans = user_answer.get_answer()
-#
-#        correct_answer = q.get_correct_answer()
-#
-#        if not exam.publish_results and not view_all_results:
-#            correct_answer = "*****"
-#            answer_score = 0
-#        answers.append(ans)
-#        answers_marks.append(answer_score)
-#
-#        merged_ans = (ans, answer_score, correct_answer)
-#        chosen_answer = q.get_answer_by_choice(ans)
-#        answers_and_marks.append((q, *merged_ans, chosen_answer))
-#
-#    total_score = sum(answers_marks)
-#
-#    max_score = len(questions)
-#
-#    return render(
-#        request,
-#        "sbas/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_start(request, pk):
     exam = get_object_or_404(Exam, pk=pk)