allow contributors to edit dropout questionnaires

Author: fekoch

evap/contributor/forms.py

@@ -15,6 +15,12 @@ class EvaluationForm(forms.ModelForm):
     general_questionnaires: "forms.ModelMultipleChoiceField[Questionnaire]" = forms.ModelMultipleChoiceField(
         queryset=None, required=False, widget=CheckboxSelectMultiple, label=_("General questionnaires")
     )
+    dropout_questionnaires: "forms.ModelMultipleChoiceField[Questionnaire]" = forms.ModelMultipleChoiceField(
+        queryset=None,
+        required=False,
+        widget=CheckboxSelectMultiple,
+        label=_("Dropout Questionnaires"),
+    )
     course = forms.ModelChoiceField(Course.objects.all(), disabled=True, required=False, widget=forms.HiddenInput())
     name_de_field = forms.CharField(label=_("Name (German)"), disabled=True, required=False)
     name_en_field = forms.CharField(label=_("Name (English)"), disabled=True, required=False)
@@ -28,6 +34,7 @@ class Meta:
             "vote_end_date",
             "participants",
             "general_questionnaires",
+            "dropout_questionnaires",
             "course",
         )
         field_classes = {
@@ -46,6 +53,12 @@ def __init__(self, *args, **kwargs):
             .distinct()
             .prefetch_related("questions")
         )
+        self.fields["dropout_questionnaires"].queryset = (
+            Questionnaire.objects.dropout_questionnaires()
+            .filter(Q(visibility=Questionnaire.Visibility.EDITORS) | Q(contributions__evaluation=self.instance))
+            .distinct()
+            .prefetch_related("questions")
+        )
 
         self.fields["vote_start_datetime"].localize = True
         self.fields["vote_end_date"].localize = True
@@ -55,9 +68,12 @@ def __init__(self, *args, **kwargs):
             queryset = (queryset | self.instance.participants.all()).distinct()
         self.fields["participants"].queryset = queryset
 
-        if self.instance.general_contribution:
+        if general_contribution := self.instance.general_contribution:
             self.fields["general_questionnaires"].initial = [
-                q.pk for q in self.instance.general_contribution.questionnaires.all()
+                q.pk for q in general_contribution.questionnaires.all() if q.is_general_questionnaire
+            ]
+            self.fields["dropout_questionnaires"].initial = [
+                q.pk for q in general_contribution.questionnaires.all() if q.is_dropout_questionnaire
             ]
 
         if not self.instance.allow_editors_to_edit:
@@ -73,6 +89,19 @@ def clean(self):
             self.add_error("vote_start_datetime", "")
             self.add_error("vote_end_date", _("The first day of evaluation must be before the last one."))
 
+        # Ensure locked questionnaires cannot be deselected and only unlocked ones can be added
+        selected_questionnaires = self.instance.general_contribution.questionnaires.filter(is_locked=True).distinct()
+        selected_questionnaires |= self.cleaned_data.get("general_questionnaires").filter(is_locked=False)
+        selected_questionnaires |= self.cleaned_data.get("dropout_questionnaires").filter(is_locked=False)
+
+        self.cleaned_data.update(
+            general_questionnaires=selected_questionnaires.exclude(type=Questionnaire.Type.DROPOUT),
+            dropout_questionnaires=selected_questionnaires.filter(type=Questionnaire.Type.DROPOUT),
+        )
+
+        if not self.cleaned_data.get("general_questionnaires"):
+            self.add_error("general_questionnaires", _("At least one questionnaire must be selected."))
+
     def clean_vote_end_date(self):
         vote_end_date = self.cleaned_data.get("vote_end_date")
 
@@ -83,22 +112,12 @@ def clean_vote_end_date(self):
 
         return vote_end_date
 
-    def clean_general_questionnaires(self):
-        # Ensure all locked questionnaires still have the same status (included or not)
-        not_locked = []
-        if self.cleaned_data.get("general_questionnaires"):
-            not_locked = list(self.cleaned_data.get("general_questionnaires").filter(is_locked=False))
-
-        locked = list(self.instance.general_contribution.questionnaires.filter(is_locked=True))
-
-        if not not_locked + locked:
-            self.add_error("general_questionnaires", _("At least one questionnaire must be selected."))
-
-        return not_locked + locked
-
     def save(self, *args, **kw):
         evaluation = super().save(*args, **kw)
-        evaluation.general_contribution.questionnaires.set(self.cleaned_data.get("general_questionnaires"))
+        selected_questionnaires = self.cleaned_data.get("general_questionnaires") | self.cleaned_data.get(
+            "dropout_questionnaires"
+        )
+        evaluation.general_contribution.questionnaires.set(selected_questionnaires)
         return evaluation
 
 

evap/staff/forms.py

@@ -357,15 +357,15 @@ def save(self, commit=True) -> Course:
 
 class EvaluationForm(forms.ModelForm):
     general_questionnaires: "forms.ModelMultipleChoiceField[Questionnaire]" = forms.ModelMultipleChoiceField(
-        Questionnaire.objects.general_questionnaires().exclude(visibility=Questionnaire.Visibility.HIDDEN),
+        queryset=None,
         widget=CheckboxSelectMultiple,
         label=_("General questions"),
     )
     dropout_questionnaires: "forms.ModelMultipleChoiceField[Questionnaire]" = forms.ModelMultipleChoiceField(
-        Questionnaire.objects.dropout_questionnaires().exclude(visibility=Questionnaire.Visibility.HIDDEN),
+        queryset=None,
+        required=False,
         widget=CheckboxSelectMultiple,
         label=_("Dropout Questionnaires"),
-        required=False,
     )
 
     class Meta: