fixup! general and contributor questionnaires per course type added the option to specify course types, where specific contributor questionaires should be added to all such courses

Author: jooooosef

evap/staff/views.py

@@ -913,12 +913,17 @@ def semester_questionnaire_assign(request, semester_id):
                 evaluation.general_contribution.questionnaires.set(
                     form.cleaned_data[f"general-{evaluation.course.type.id}"]
                 )
-            if form.cleaned_data[f"contributor-{evaluation.course.type.id}"]:
-                for contribution in evaluation.contributions.exclude(contributor=None):
-                    contribution.questionnaires.set(form.cleaned_data[f"contributor-{evaluation.course.type.id}"])
             if form.cleaned_data["all-contributors"]:
                 for contribution in evaluation.contributions.exclude(contributor=None):
                     contribution.questionnaires.set(form.cleaned_data["all-contributors"])
+
+                    # when additional specific questionaires are selected they need to be added (not set) so both are assigned
+                    if form.cleaned_data[f"contributor-{evaluation.course.type.id}"]:
+                        contribution.questionnaires.add(*form.cleaned_data[f"contributor-{evaluation.course.type.id}"])
+
+            elif form.cleaned_data[f"contributor-{evaluation.course.type.id}"]:
+                for contribution in evaluation.contributions.exclude(contributor=None):
+                    contribution.questionnaires.set(form.cleaned_data[f"contributor-{evaluation.course.type.id}"])
             evaluation.save()
 
         messages.success(request, _("Successfully assigned questionnaires."))