vscode hat komische dinge in results_evaluation_detail.html gemacht, …

…aber jetzt geht wieder
e-valuation · Jul 2, 2024 · 0127464 · 0127464
1 parent beb2bfb
commit 0127464
Showing 1 changed file with 0 additions and 68 deletions.
diff --git a/evap/results/templates/results_evaluation_detail.html b/evap/results/templates/results_evaluation_detail.html
@@ -33,68 +33,6 @@
                 <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
             </div>
             <div class="col-auto">
-<<<<<<< HEAD
-                <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">
@@ -169,7 +107,6 @@ <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                                 {% endif %}
                             </div>
                         </div>
->>>>>>> 88479241 (alle changes ohne tests)
                     </div>
                 </div>
             </div>
@@ -182,13 +119,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 %}
-<<<<<<< HEAD
-                <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_text={{ view_general_text }}&view_contributor_results={{ view_contributor_results }}{% if contributor_id is not None %}&contributor_id={{ contributor_id }}{% endif %}" type="button"> <!--müssen wir den link auch noch ändern? view zu view_general_text und view_contributor_results hinzufügen? hab ich jetzt ma gemacht-->
                     {% trans 'Export text answers' %}
->>>>>>> 88479241 (alle changes ohne tests)
                 </a>
             {% endif %}
             {% if evaluation.course.grade_documents.count == 1 and can_download_grades %}