switch to generic exam urls

rapids/views.py

@@ -686,93 +686,6 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
         },
     )
 
-@login_required
-def exam_scores_user(request, pk):
-    return exam_scores_cid_user(request, pk)
-
-def exam_scores_cid_user(request, pk, cid=None, passcode=""):
-    exam = get_object_or_404(Exam, pk=pk)
-
-    if not exam.exam_mode:
-        raise Http404("Packet not in exam mode")
-
-    # TODO:Need some kind of test for cid
-
-    questions = (
-        exam.exam_questions.all()
-    )  # .prefetch_related("cid_user_answers", "answers")
-
-    # cid_user_answers = list(CidUserAnswer.objects.filter(cid=cid, exam__id=pk).prefetch_related("question"))
-
-    # cid_user_answers_q_map = {}
-
-    # for ans in cid_user_answers:
-    #    cid_user_answers_q_map[ans.question] = ans
-
-    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
-        user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
-        # user_answer = cid_user_answers_q_map[q]
-
-        if not user_answer or user_answer is None:
-            # skip if no answer
-            answers_marks.append(0)
-            # answers.append("")
-            answer_score = 0
-            ans = "Not answered"
-        else:
-            if user_answer.normal:
-                ans = "Normal"
-            else:
-                ans = user_answer.answer
-            answer_score = user_answer.get_answer_score()
-
-        correct_answer = q.get_primary_answer()
-
-        if not exam.publish_results and not view_all_results:
-            correct_answer = "*****"
-            answer_score = 0
-        answers.append(ans)
-        answers_marks.append(answer_score)
-        answers_and_marks.append((ans, answer_score, correct_answer))
-
-    if "unmarked" in answers_marks:
-        answered = [i for i in answers_marks if type(i) == int]
-        total_score = sum(answered)
-        unmarked_number = len(answers_marks) - len(answered)
-        total_score = "{} ({} unmarked)".format(total_score, unmarked_number)
-    else:
-        total_score = sum(answers_marks)
-
-    normalised_score = normaliseScore(total_score)
-
-    max_score = len(questions) * 2
-
-    return render(
-        request,
-        "rapids/exam_scores_user.html",
-        {
-            "exam": exam,
-            "cid": cid,
-            "passcode": passcode,
-            "questions": questions,
-            "answers": answers,
-            "answers_marks": answers_marks,
-            "total_score": total_score,
-            "normalised_score": normalised_score,
-            "max_score": max_score,
-            "answers_and_marks": answers_and_marks,
-            "view_all_results": view_all_results,
-        },
-    )
 
 
 class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
@@ -780,7 +693,7 @@ class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
     success_url = reverse_lazy("rapids:rapid_view")
 
 
-GenericExamViews = ExamViews(Exam, Rapid, Answer, CidUserAnswer, "rapids", "rapid")
+GenericExamViews = ExamViews(Exam, Rapid, Answer, CidUserAnswer, "rapids", "rapid", normalise_score=normaliseScore)
 
 
 class ExamCreate(ExamCreateBase):