If survey categories are treated as sub-surveys, the survey gets clos…

…ed after all answers has been collected, even with external redirect

scientific_survey/views/confirm_view.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from datetime import date, timedelta
-
 from django.views.generic import TemplateView
 
 from scientific_survey.models import Response
@@ -14,10 +12,4 @@ def get_context_data(self, **kwargs):
         context = super(ConfirmView, self).get_context_data(**kwargs)
         context["uuid"] = str(kwargs["uuid"])
         context["response"] = Response.objects.get(interview_uuid=context["uuid"])
-
-        if context["response"].survey.categories_as_surveys:
-            cats2choose = context["response"].survey.get_bookable_categories()
-            if not cats2choose:
-                context["response"].survey.expire_date = date.today() - timedelta(days=1)
-                context["response"].survey.save()
         return context

scientific_survey/views/survey_detail.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
+from datetime import date, timedelta
 
 from django.conf import settings
 from django.shortcuts import Http404, redirect, render, reverse
@@ -103,6 +104,12 @@ def handle_invalid_form(context, form, request, survey):
         return render(request, template_name, context)
 
     def final_redirect(self, survey, response):
+        if survey.categories_as_surveys:
+            cats2choose = survey.get_bookable_categories()
+            if not cats2choose:
+                survey.expire_date = date.today() - timedelta(days=1)
+                survey.save()
+
         if survey.external_redirect:
             return redirect(survey.external_redirect)
         else: