Lots of improvemnets

rapids/views.py

@@ -24,6 +24,7 @@ from .forms import (
     RapidForm,
     MarkRapidQuestionForm,
     ImageFormSet,
+    RapidQuestionAnswerForm,
     RegionForm,
     AbnormalityForm,
     ExaminationForm,
@@ -330,9 +331,44 @@ class RapidCreate(RapidCreateBase):
     # form.instance.author.add(self.request.user.id)
     # return super().form_valid(form)
 
+class RapidAnswerUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView):
+    model = Rapid
+    form_class = RapidQuestionAnswerForm
+    template_name = "rapids/rapidquestionanswer_form.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(RapidAnswerUpdate, 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 RapidUpdate(
-    RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin, UpdateView
+    RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView
 ):
     model = Rapid
     form_class = RapidForm
@@ -360,6 +396,7 @@ class RapidUpdate(
         else:
             context["image_formset"] = ImageFormSet(instance=self.object)
             context["answer_formset"] = AnswerFormSet(instance=self.object)
+        context["question"] = context["object"]
         return context
 
     def form_valid(self, form):