Lots of improvemnets

anatomy/views.py

@@ -28,6 +28,7 @@ from dal import autocomplete
 
 from .forms import (
     AnatomyAnswerForm,
+    AnatomyQuestionAnswerForm,
     AnswerFormSet,
     AnswerUpdateFormSet,
     BodyPartForm,
@@ -247,7 +248,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
     elif not unmarked_exam_answers_only:
         mark_url = "anatomy:mark_all"
 
-    questions = exam.exam_questions.all()
+    questions = exam.exam_questions.all().prefetch_related("answers")
 
     n = sk
 
@@ -358,6 +359,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
             for suggest_incorrect in question.answer_suggest_incorrect:
                 if suggest_incorrect in ans:
                     answer_suggest_incorrect.append(ans)
+                    break
 
     return render(
         request,
@@ -554,6 +556,42 @@ class AnatomyQuestionCreate(AnatomyQuestionCreateBase):
 # return super().form_valid(form)
 
 
+class AnatomyQuestionAnswerUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView):
+    model = AnatomyQuestion
+    form_class = AnatomyQuestionAnswerForm
+    template_name = "anatomy/anatomyquestionanswer_form.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(AnatomyQuestionAnswerUpdate, self).get_context_data(**kwargs)
+        if self.request.POST:
+            context["answer_formset"] = AnswerUpdateFormSet(
+                self.request.POST, self.request.FILES, instance=self.object
+            )
+            context["answer_formset"].full_clean()
+        else:
+            context["answer_formset"] = AnswerUpdateFormSet(instance=self.object)
+        context["question"] = context["object"]
+        return context
+
+    def form_valid(self, form):
+
+        self.object = form.save(commit=False)
+        self.object.save()
+
+        #form.instance.author.add(self.request.user.id)
+
+        context = self.get_context_data(form=form)
+        formset = context["answer_formset"]
+        # logger.debug(formset.is_valid())
+        if formset.is_valid():
+            response = super().form_valid(form)
+            formset.instance = self.object
+            formset.save()
+
+            return response
+        else:
+            return super().form_invalid(form)
+
 # class AnatomyQuestionUpdate(LoginRequiredMixin, AuthorOrCheckerRequiredMixin,
 class AnatomyQuestionUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView):
     model = AnatomyQuestion
@@ -566,13 +604,14 @@ class AnatomyQuestionUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateV
 
     def get_context_data(self, **kwargs):
         context = super(AnatomyQuestionUpdate, self).get_context_data(**kwargs)
-        if self.request.POST:
-            context["answer_formset"] = AnswerUpdateFormSet(
-                self.request.POST, self.request.FILES, instance=self.object
-            )
-            context["answer_formset"].full_clean()
-        else:
-            context["answer_formset"] = AnswerUpdateFormSet(instance=self.object)
+        #if self.request.POST:
+        #    context["answer_formset"] = AnswerUpdateFormSet(
+        #        self.request.POST, self.request.FILES, instance=self.object
+        #    )
+        #    context["answer_formset"].full_clean()
+        #else:
+        #    context["answer_formset"] = AnswerUpdateFormSet(instance=self.object)
+        context["question"] = context["object"]
         return context
 
     def form_valid(self, form):
@@ -589,23 +628,24 @@ class AnatomyQuestionUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateV
         form.instance.author.add(self.request.user.id)
 
         context = self.get_context_data(form=form)
-        formset = context["answer_formset"]
-        # logger.debug(formset.is_valid())
-        if formset.is_valid():
-            response = super().form_valid(form)
-            formset.instance = self.object
-            formset.save()
+        #formset = context["answer_formset"]
+        return super().form_valid(form)
+        ## logger.debug(formset.is_valid())
+        #if formset.is_valid():
+        #    response = super().form_valid(form)
+        #    formset.instance = self.object
+        #    formset.save()
 
-            # restore exam orders
-            #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])
-            #        exam.save()
+        #    # restore exam orders
+        #    #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])
+        #    #        exam.save()
 
-            return response
-        else:
-            return super().form_invalid(form)
+        #    return response
+        #else:
+        #    return super().form_invalid(form)
 
 
 class QuestionClone(AnatomyQuestionCreateBase):
@@ -625,6 +665,8 @@ class QuestionClone(AnatomyQuestionCreateBase):
 
         # initial_data["exams"] = list(exams)
 
+        # TODO: clone answers?
+
         return initial_data