Customizable evaluation results filters #2232
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 this 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,74 @@ | |
| <div class="col"> | ||
| <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3> | ||
| </div> | ||
| <div class="col-auto"> | ||
| <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 %}" | ||
| data-bs-toggle="tooltip" | ||
| data-bs-placement="bottom" | ||
| title="{% blocktranslate %}All results of general questions (including text answers){% endblocktranslate %}" | ||
| > | ||
| {% translate 'Full' %} | ||
| </a> | ||
| <a | ||
|
There was a problem hiding this comment. Users with |
||
| 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 {% endif %} {% if view_general_results == ViewGeneralResults.RATINGS or not general_textanswers %} active{% endif %}" | ||
| data-bs-toggle="tooltip" | ||
| data-bs-placement="bottom" | ||
| title="{% translate 'Only rating results of general questions (without text answers)' %}" | ||
| > | ||
| {% 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> | ||
|
There was a problem hiding this comment. when disabled, "Ratings" should be selected/active and its tooltip should be shown on hover. There was a problem hiding this comment. We added that ratings is selected when the button group is disabled. I think this could be fixed with some js? There was a problem hiding this comment. I think we found a way of having tooltips on disabled buttons in #1931. |
||
| <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 %}" | ||
| data-bs-toggle="tooltip" | ||
| data-bs-placement="bottom" | ||
| title="{% blocktranslate %}All results of contributor questions available for you (including text answers){% endblocktranslate %}" | ||
| > | ||
| {% translate 'Full' %} | ||
| </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 {% endif %} {% if view_contributor_results == ViewContributorResults.RATINGS or not contributor_textanswers %} active{% endif %}" | ||
| data-bs-toggle="tooltip" | ||
| data-bs-placement="bottom" | ||
| title="{% translate 'Only rating results of contributor questions (without text answers)' %}" | ||
| > | ||
| {% 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_personal or not contributor_textanswers %} disabled {% elif view_contributor_results == ViewContributorResults.PERSONAL %} active {% endif %}" | ||
| data-bs-toggle="tooltip" | ||
| data-bs-placement="bottom" | ||
| title="{% translate 'All results of contributor questions regarding yourself, hiding other contributors' %}" | ||
| > | ||
| {% translate 'Personal' %} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
@@ -106,8 +112,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_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 %} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
when disabled, "Ratings" should be selected/active and its tooltip should be shown on hover.
a different tooltip should be shown for "All" when disabled: "You can't see text answers for general questions in this evaluation."