.

rapids/views.py

@@ -42,7 +42,14 @@ from .models import (
     CidUserAnswer,
 )
 
-from generic.views import AuthorRequiredMixin, ExamCloneMixin, ExamViews, GenericViewBase
+from generic.views import (
+    AuthorRequiredMixin,
+    ExamCloneMixin,
+    ExamCreateBase,
+    ExamUpdateBase,
+    ExamViews,
+    GenericViewBase,
+)
 
 from reversion.views import RevisionMixin
 
@@ -350,8 +357,8 @@ class RapidUpdate(
 
     def form_valid(self, form):
         # save exam orders (there must be a better way to do this)
-        #exam_orders = {}
-        #for exam in self.object.exams.all():
+        # exam_orders = {}
+        # for exam in self.object.exams.all():
         #    exam_orders[exam] = list(exam.exam_questions.all())
 
         self.object = form.save(commit=False)
@@ -371,8 +378,8 @@ class RapidUpdate(
             answer_formset.save()
 
             # restore exam orders
-            #wanted_exams = form["exams"].data
-            #for exam in self.object.exams.all():
+            # wanted_exams = form["exams"].data
+            # for exam in self.object.exams.all():
             #    if exam in exam_orders and self.object in exam_orders[exam]:
             #        print(exam_orders[exam])
             #        exam.exam_questions.set(exam_orders[exam])
@@ -677,7 +684,6 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
     )
 
 
-
 def exam_scores_cid_user(request, pk, cid, passcode):
     exam = get_object_or_404(Exam, pk=pk)
 
@@ -686,13 +692,15 @@ def exam_scores_cid_user(request, pk, cid, passcode):
 
     # TODO:Need some kind of test for cid
 
-    questions = exam.exam_questions.all()#.prefetch_related("cid_user_answers", "answers")
+    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 = list(CidUserAnswer.objects.filter(cid=cid, exam__id=pk).prefetch_related("question"))
 
-    #cid_user_answers_q_map = {}
+    # cid_user_answers_q_map = {}
 
-    #for ans in cid_user_answers:
+    # for ans in cid_user_answers:
     #    cid_user_answers_q_map[ans.question] = ans
 
     answers_and_marks = []
@@ -706,7 +714,7 @@ def exam_scores_cid_user(request, pk, cid, passcode):
     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]
+        # user_answer = cid_user_answers_q_map[q]
 
         if not user_answer or user_answer is None:
             # skip if no answer
@@ -766,49 +774,36 @@ 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")
 
 
-class ExamCreate(RevisionMixin, LoginRequiredMixin, CreateView):
+class ExamCreate(ExamCreateBase):
     model = Exam
     form_class = ExamForm
 
-    def form_valid(self, form):
-        self.object = form.save(commit=False)
-        self.object.save()
 
-        form.instance.author.add(self.request.user.id)
-        return super().form_valid(form)
+class ExamUpdate(ExamUpdateBase, AuthorOrCheckerRequiredMixin):
+    model = Exam
+    form_class = ExamForm
 
 
-class ExamUpdate(
-    RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin, UpdateView
+class ExamAuthorUpdate(
+    RevisionMixin, LoginRequiredMixin, AuthorRequiredMixin, UpdateView
 ):
-    model = Exam
-    form_class = ExamForm
-
-    def form_valid(self, form):
-        self.object = form.save(commit=False)
-        self.object.save()
-
-        form.instance.author.add(self.request.user.id)
-
-        return super().form_valid(form)
-
-class ExamAuthorUpdate(RevisionMixin, LoginRequiredMixin, AuthorRequiredMixin, UpdateView):
     model = Exam
     form_class = ExamAuthorForm
 
+
 class ExamDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView):
     model = Exam
     template_name = "exam_confirm_delete.html"
     success_url = reverse_lazy("rapids:index")
 
+
 class UserAnswerView(LoginRequiredMixin, DetailView):
     model = CidUserAnswer
 
+
 class UserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
     model = CidUserAnswer
     table_class = RapidUserAnswerTable
@@ -925,6 +920,7 @@ class RapidLateralityViewSet(
 
 GenericViews = GenericViewBase("rapids", Rapid, CidUserAnswer, Exam)
 
+
 @user_is_author_or_rapid_checker
 def question_anonymise_dicom(request, pk):
     question = get_object_or_404(Rapid, pk=pk)
@@ -933,6 +929,7 @@ def question_anonymise_dicom(request, pk):
 
     return redirect("rapids:question_detail", pk=pk)
 
+
 @user_is_author_or_rapid_checker
 def question_save_annotation(request, pk):
     if request.is_ajax() and request.method == "POST":