Customizable evaluation results filters

evap/results/fixtures/minimal_test_data_results.json

@@ -109,17 +109,6 @@
     "type": 2
   }
 },
-{
-  "pk": 6,
-  "model": "evaluation.question",
-  "fields": {
-    "questionnaire": 2,
-    "text_en": "can you see me?",
-    "text_de": "can you see me?",
-    "allows_additional_textanswers": false,
-    "type": 0
-  }
-},
 {
   "pk": "00000000-0000-0000-0000-000000000001",
   "model": "evaluation.textanswer",
@@ -135,7 +124,7 @@
   "pk": "00000000-0000-0000-0000-000000000002",
   "model": "evaluation.textanswer",
   "fields": {
-    "answer": ".general_orig_hidden.",
+    "answer": ".general_orig_deleted.",
     "question": 3,
     "original_answer": null,
     "contribution": 1,
@@ -190,7 +179,7 @@
   "pk": "00000000-0000-0000-0000-000000000012",
   "model": "evaluation.textanswer",
   "fields": {
-    "answer": ".responsible_contributor_orig_hidden.",
+    "answer": ".responsible_contributor_orig_deleted.",
     "question": 1,
     "original_answer": null,
     "contribution": 6,
@@ -223,24 +212,13 @@
   "pk": "00000000-0000-0000-0000-000000000015",
   "model": "evaluation.textanswer",
   "fields": {
-    "answer": ".responsible_contributor_orig_notreviewed.",
+    "answer": ".responsible_contributor_orig_unreviewed.",
     "question": 1,
     "original_answer": null,
     "contribution": 6,
     "review_decision": "UN"
   }
 },
-{
-  "pk": "00000000-0000-0000-0000-000000000016",
-  "model": "evaluation.textanswer",
-  "fields": {
-    "answer": ".proxy_user_visibility_info.",
-    "question": 6,
-    "original_answer": null,
-    "contribution": 1,
-    "review_decision": "PU"
-  }
-},
 {
   "pk": "00000000-0000-0000-0000-000000000017",
   "model": "evaluation.textanswer",
@@ -256,7 +234,7 @@
   "pk": "00000000-0000-0000-0000-000000000018",
   "model": "evaluation.textanswer",
   "fields": {
-    "answer": ".responsible_contributor_additional_orig_hidden.",
+    "answer": ".responsible_contributor_additional_orig_deleted.",
     "question": 2,
     "original_answer": null,
     "contribution": 6,
@@ -278,7 +256,7 @@
   "pk": "00000000-0000-0000-0000-000000000020",
   "model": "evaluation.textanswer",
   "fields": {
-    "answer": ".general_additional_orig_hidden.",
+    "answer": ".general_additional_orig_deleted.",
     "question": 4,
     "original_answer": null,
     "contribution": 1,

evap/results/templates/results_evaluation_detail.html

@@ -21,7 +21,7 @@
     {% if evaluation.state != evaluation.State.PUBLISHED %}
         <div class="alert alert-warning">{% translate 'This is a preview. The results have not been published yet.' %}</div>
     {% endif %}
-
+    {# manager is automatically a reviewer (so these are all groups that can see the buttons) #}
     {% if is_reviewer or is_responsible_or_contributor_or_delegate %}
         {% if evaluation.course.is_private %}
             <div class="alert alert-info d-print-none">
@@ -32,68 +32,63 @@
             <div class="col">
                 <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
             </div>
-
             <div class="col-auto">
-                <div class="btn-switch btn-switch-light my-auto d-print-none">
-                    <div class="btn-switch-label">{% translate 'View' %}</div>
-                    <div class="btn-switch btn-group">
-                        {% if user.is_staff and view == 'export' or is_contributor %}
-                            <a
-                                href="{% if is_contributor %}{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=export{% endif %}"
-                                role="button"
-                                class="btn btn-sm btn-light{% if view == 'export' %} active{% endif %}"
-                                data-bs-toggle="tooltip"
-                                data-bs-placement="bottom"
-                                title="{% blocktranslate %}Shows filtered view meant for personal export. Other contributors' results and private answers are hidden.{% endblocktranslate %}"
-                            >
-                                {% translate 'Export' context 'view mode' %}
-                            </a>
-
-                        {% endif %}
-                        <a
-                            href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=full"
-                            role="button"
-                            class="btn btn-sm btn-light{% if view == 'full' %} active{% endif %}"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="bottom"
-                            title="{% translate 'Shows all results available for you.' %}"
-                        >
-                            {% translate 'Full' %}
-                        </a>
-                        {% if not evaluation.can_publish_rating_results %}
-                            <button
-                                type="button"
-                                disabled
-                                class="btn btn-sm btn-light"
-                                data-bs-toggle="tooltip"
-                                data-bs-placement="bottom"
-                                title="{% blocktranslate %}The results of this evaluation have not been published because it didn't get enough votes.{% endblocktranslate %}"
-                            >
-                                {% if evaluation.course.is_private %}
-                                    {% translate 'Participant' %}
-                                {% else %}
-                                    {% translate 'Public' %}
-                                {% endif %}
-                            </button>
-                        {% else %}
-                            <a
-                                href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=public"
-                                role="button"
-                                class="btn btn-sm btn-light{% if view == 'public' %} active{% endif %}"
-                                data-bs-toggle="tooltip"
-                                data-bs-placement="bottom"
-                                title="
-                                    {% if evaluation.course.is_private %}
-                                        {% translate 'Shows results available for the participants.' %}"
-                                        >
-                                        {% translate 'Participant' %}
-                                    {% else %}
-                                        {% translate 'Shows results available for everyone logged in.' %}"
-                                        >
-                                        {% translate 'Public' %}
-                                    {% endif %}
-                            </a>
-                        {% endif %}
+                    <div class="row">
+                        <div class="col-auto">
+                            <div class="btn-switch btn-switch-light my-auto d-print-none">
+                                <div class="btn-switch-label">
+                                    {% translate 'General results' %}
+                                </div>
+                                <div class="btn-switch btn-group">
+                                    <a
+                                        href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view_general_results=full&view_contributor_results={{ view_contributor_results.value }}"
+                                        role="button"
+                                        class="btn btn-sm btn-light {% if not general_textanswers %} disabled {% elif view_general_results == ViewGeneralResults.FULL %} active {% endif %}"
+                                    >
+                                        {% translate 'Ratings and texts' %}
+                                    </a>
+                                    <a
+                                        href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view_general_results=ratings&view_contributor_results={{ view_contributor_results.value }}"
+                                        role="button"
+                                        class="btn btn-sm btn-light{% if not general_textanswers %} disabled active{% elif view_general_results == ViewGeneralResults.RATINGS %} active{% endif %}"
+                                    >
+                                        {% translate 'Ratings' %}
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                <div class="row mt-1">
+                    <div class="col-auto">
+                        <div class="btn-switch btn-switch-light my-auto d-print-none">
+                            <div class="btn-switch-label">
+                                {% translate 'Contributor results' %}
+                            </div>
+                            <div class="btn-switch btn-group">
+                                <a
+                                    href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view_general_results={{ view_general_results.value }}&view_contributor_results=full"
+                                    role="button"
+                                    class="btn btn-sm btn-light {% if not contributor_textanswers %} disabled {% elif view_contributor_results == ViewContributorResults.FULL %} active {% endif %}"
+                                >
+                                    {% translate 'Ratings and texts' %}
+                                </a>
+                                <a
+                                    href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view_general_results={{ view_general_results.value }}&view_contributor_results=ratings"
+                                    role="button"
+                                    class="btn btn-sm btn-light{% if not contributor_textanswers %} disabled active{% elif view_contributor_results == ViewContributorResults.RATINGS %} active{% endif %}"
+                                >
+                                    {% translate 'Ratings' %}
+                                </a>
+                                <a
+                                    href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view_general_results={{ view_general_results.value }}&view_contributor_results=personal"
+                                    role="button"
+                                    class="btn btn-sm btn-light{% if not contributor_textanswers or not contributor_personal %} disabled{% elif view_contributor_results == ViewContributorResults.PERSONAL %} active{% endif %}"
+                                >
+                                    {% translate 'Only mine' %}
+                                </a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -106,8 +101,8 @@ <h3>{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
         <div class="card-header d-flex">
             <div class="me-auto">{% translate 'Overview' %}</div>
             {% if can_export_text_answers %}
-                <a class="btn btn-sm btn-light d-print-none" href="{% url 'results:evaluation_text_answers_export' evaluation.id %}?view={{ view }}{% if contributor_id is not None %}&contributor_id={{ contributor_id }}{% endif %}" type="button">
-                    {% translate 'Export text answers' %}
+                <a class="btn btn-sm btn-light d-print-none" href="{% url 'results:evaluation_text_answers_export' evaluation.id %}?view_general_results={{ view_general_results.value }}&view_contributor_results={{ view_contributor_results.value }}{% if contributor_id is not None %}&contributor_id={{ contributor_id }}{% endif %}" type="button">
+                    {% translate 'Export visible text answers' %}
                 </a>
             {% endif %}
             {% if evaluation.course.grade_documents.count == 1 and can_download_grades %}

evap/results/tests/test_tools.py

@@ -18,6 +18,8 @@
 )
 from evap.evaluation.tests.tools import TestCase, make_rating_answer_counters
 from evap.results.tools import (
+    ViewContributorResults,
+    ViewGeneralResults,
     cache_results,
     calculate_average_course_distribution,
     calculate_average_distribution,
@@ -562,8 +564,12 @@ def test_contributors_and_delegate_count_in_textanswer_visibility_info(self):
         for user in UserProfile.objects.all():
             represented_users = [user] + list(user.represented_users.all())
             for i, textanswer in enumerate(textanswers):
-                if can_textanswer_be_seen_by(user, represented_users, textanswer, "full"):
-                    if can_textanswer_be_seen_by(user, [user], textanswer, "full"):
+                if can_textanswer_be_seen_by(
+                    user, represented_users, textanswer, ViewGeneralResults.FULL, ViewContributorResults.FULL
+                ):
+                    if can_textanswer_be_seen_by(
+                        user, [user], textanswer, ViewGeneralResults.FULL, ViewContributorResults.FULL
+                    ):
                         users_seeing_contribution[i][0].add(user)
                     else:
                         users_seeing_contribution[i][1].add(user)