Questionnaires: add archived state, tabs in management page

evap/evaluation/migrations/0164_remove_questionnaire_questionnaire_visibility_choices_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.11 on 2026-03-02 21:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("evaluation", "0163_migrate_cms_links"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="questionnaire",
+            name="Questionnaire_visibility_choices",
+        ),
+        migrations.AlterField(
+            model_name="questionnaire",
+            name="visibility",
+            field=models.IntegerField(
+                choices=[(0, "Don't show"), (1, "Managers only"), (2, "Managers and editors"), (3, "Archived")],
+                default=1,
+                verbose_name="visibility",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="questionnaire",
+            constraint=models.CheckConstraint(
+                condition=models.Q(("visibility__in", [0, 1, 2, 3])), name="Questionnaire_visibility_choices"
+            ),
+        ),
+    ]

evap/evaluation/models.py

@@ -214,6 +214,7 @@ class Visibility(models.IntegerChoices):
         HIDDEN = 0, _("Don't show")
         MANAGERS = 1, _("Managers only")
         EDITORS = 2, _("Managers and editors")
+        ARCHIVED = 3, _("Archived")
 
     visibility = models.IntegerField(
         choices=Visibility.choices, verbose_name=_("visibility"), default=Visibility.MANAGERS

evap/evaluation/tools.py

@@ -175,11 +175,19 @@ def get_parameter_from_url_or_session(request: HttpRequest, parameter: str, defa
     if result_str is None:  # if no parameter is given take session value
         result = request.session.get(parameter, default)
     else:
-        result = {"true": True, "false": False}.get(result_str.lower())  # convert parameter to boolean
+        result = {"true": True, "false": False}.get(result_str.lower(), default)  # convert parameter to boolean
     request.session[parameter] = result  # store value for session
     return result
 
 
+def get_string_from_url_or_session(request: HttpRequest, parameter: str, default: str | None = None) -> str | None:
+    result = request.GET.get(parameter, None)
+    if result is None:
+        result = request.session.get(parameter, default)
+    request.session[parameter] = result
+    return result
+
+
 def translate(**kwargs):
     # pylint is really buggy with this method.
     # pylint: disable=unused-variable, useless-suppression

evap/staff/forms.py

@@ -444,7 +444,7 @@ def __init__(self, *args, requires_decided_main_language=False, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["course"].queryset = Course.objects.filter(semester=semester)
 
-        visible_questionnaires = ~Q(visibility=Questionnaire.Visibility.HIDDEN)
+        visible_questionnaires = Q(visibility__in=[Questionnaire.Visibility.EDITORS, Questionnaire.Visibility.MANAGERS])
         if self.instance.pk is not None:
             visible_questionnaires |= Q(contributions__evaluation=self.instance)
 

evap/staff/templates/staff_questionnaire_index.html

@@ -10,13 +10,16 @@
         </div>
         <div class="col-auto">
             <div class="btn-switch btn-switch-light">
-                <div class="btn-switch-label">{% translate 'Hidden questionnaires' %}</div>
+                <div class="btn-switch-label">{% translate 'Show questionnaires' %}</div>
                 <div class="btn-switch btn-group">
-                    <a href="{% url 'staff:questionnaire_index' %}?filter_questionnaires=false" role="button" class="btn btn-sm btn-light{% if not filter_questionnaires %} active{% endif %}">
-                    {% translate 'Show' %}
+                    <a href="{% url 'staff:questionnaire_index' %}?filter_questionnaires=all" role="button" class="btn btn-sm btn-light{% if filter_questionnaires == 'all' %} active{% endif %}">
+                        {% translate 'All' %}
                     </a>
-                    <a href="{% url 'staff:questionnaire_index' %}?filter_questionnaires=true" role="button" class="btn btn-sm btn-light{% if filter_questionnaires %} active{% endif %}">
-                        {% translate 'Hide' %}
+                    <a href="{% url 'staff:questionnaire_index' %}?filter_questionnaires=visible" role="button" class="btn btn-sm btn-light{% if filter_questionnaires == 'visible' %} active{% endif %}">
+                        {% translate 'Visible' %}
+                    </a>
+                    <a href="{% url 'staff:questionnaire_index' %}?filter_questionnaires=archived" role="button" class="btn btn-sm btn-light{% if filter_questionnaires == 'archived' %} active{% endif %}">
+                        {% translate 'Archived' %}
                     </a>
                 </div>
             </div>
@@ -56,14 +59,47 @@
             });
         </script>
 
-        {% translate 'Top general questionnaires' as headline %}
-        {% include 'staff_questionnaire_index_list.html' with questionnaires=general_questionnaires_top headline=headline extra_classes='mb-3' type='top' %}
-        {% translate 'Contributor questionnaires' as headline %}
-        {% include 'staff_questionnaire_index_list.html' with questionnaires=contributor_questionnaires headline=headline extra_classes='mb-3' type='contributor' %}
-        {% translate 'Bottom general questionnaires' as headline %}
-        {% include 'staff_questionnaire_index_list.html' with questionnaires=general_questionnaires_bottom headline=headline extra_classes='mb-3' type='bottom' %}
-        {% translate 'Dropout questionnaires' as headline %}
-        {% include 'staff_questionnaire_index_list.html' with questionnaires=dropout_questionnaires headline=headline extra_classes='' type='dropout' %}
+        <div class="card">
+            <div class="card-header">
+                <ul class="nav nav-tabs card-header-tabs" >
+                    <li class="nav-item">
+                        <a class="nav-link" id="topTab" href="#" data-bs-target="#topTabContent" data-bs-toggle="tab" role="tab">
+                            {% translate 'Top general questionnaires' %}
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" id="contributorTab" href="#" data-bs-target="#contributorTabContent" data-bs-toggle="tab" role="tab">
+                            {% translate 'Contributor questionnaires' %}
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" id="bottomTab" href="#" data-bs-target="#bottomTabContent" data-bs-toggle="tab" role="tab">
+                            {% translate 'Bottom general questionnaires' %}
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" id="dropoutTab" href="#" data-bs-target="#dropoutTabContent" data-bs-toggle="tab" role="tab">
+                            {% translate 'Dropout questionnaires' %}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <div class="tab-content">
+                <div class="tab-pane show" id="topTabContent" role="tabpanel">
+                    {% include 'staff_questionnaire_index_list.html' with questionnaires=general_questionnaires_top type='top' %}
+                </div>
+                <div class="tab-pane" id="contributorTabContent" role="tabpanel">
+                    {% include 'staff_questionnaire_index_list.html' with questionnaires=contributor_questionnaires type='contributor' %}
+                </div>
+                <div class="tab-pane" id="bottomTabContent" role="tabpanel">
+                    {% include 'staff_questionnaire_index_list.html' with questionnaires=general_questionnaires_bottom type='bottom' %}
+                </div>
+                <div class="tab-pane" id="dropoutTabContent" role="tabpanel">
+                    {% include 'staff_questionnaire_index_list.html' with questionnaires=dropout_questionnaires type='dropout' %}
+                </div>
+            </div>
+        </div>
+
     {% else %}
         <p>
             {% translate 'There are no questionnaires yet.' %}
@@ -125,4 +161,23 @@
             button.addEventListener("click", () => changeLocked(button));
         }
     </script>
+
+    <script type="module">
+        const tabIds = ["topTab", "contributorTab", "bottomTab", "dropoutTab"];
+        const tabName = localStorage.getItem('staff_questionnaure_index_tab') || tabIds[0];
+
+        if (tabIds.includes(tabName)) {
+            const tab = document.getElementById(tabName);
+            const tabTrigger = new bootstrap.Tab(tab);
+            tabTrigger.show();
+        }
+
+        function saveSelectedTab(tab) {
+            localStorage['staff_questionnaure_index_tab'] = tab;
+        }
+
+        for (const id of tabIds) {
+            document.getElementById(id).addEventListener("click", () => saveSelectedTab(id))
+        }
+    </script>
 {% endblock %}