Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1675: Relocate button "I can't give feedback" #1706

Merged
merged 10 commits into from
May 13, 2022
Merged

Fix #1675: Relocate button "I can't give feedback" #1706

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
21bc39a
relocate-button
Feb 14, 2022
4563317
Merge branch 'main' of https://github.com/Kakadus/EvaP into main
Feb 14, 2022
079f317
make tabbing work correctly
Feb 28, 2022
bd5552e
fix js pitfall
Kakadus Mar 1, 2022
31f8f39
Merge branch 'e-valuation:main' into relocate-button
Kakadus Mar 5, 2022
998d079
move first entry in loop
May 9, 2022
f5250c7
Merge branch 'e-valuation:main' into relocate-button
Kakadus May 9, 2022
ceb2ac1
first reformat
May 9, 2022
b041078
extract hasTabbingTarget
May 9, 2022
71900b6
Update student-vote.ts
Kakadus May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions evap/student/templates/student_vote.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,11 @@ <h3 class="mb-3">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
{% if label %} &ndash; <span class="fst-italic">{{ label }}</span>{% endif %}
</button>
</div>
<div>
<button type="button" class="btn btn-light btn-sm{% if not preview %} tab-selectable{% endif %}"
data-mark-no-answers-for="{{ contributor.id }}"
{% if preview %}disabled{% endif %}
>
{% blocktrans %}I can't give feedback about this contributor{% endblocktrans %}
</button>
</div>

</div>
<div class="collapse{% if not errors_exist or contributor_has_errors %} show{% endif %}" id="vote-area-{{ contributor.id }}">
<div class="card-body">
{% include 'student_vote_questionnaire_group.html' with questionnaire_group=form_group preview=preview textanswers_visible_to=textanswers_visible_to %}
{% include 'student_vote_questionnaire_group.html' with questionnaire_group=form_group preview=preview textanswers_visible_to=textanswers_visible_to contributor=contributor%}
</div>
</div>
</div>
Expand Down
16 changes: 14 additions & 2 deletions evap/student/templates/student_vote_questionnaire_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{% load evaluation_filters %}

<div class="d-flex">
<h4 class="me-auto">{{ questionnaire_group.0.questionnaire.public_name }}</h4>
{% if contributor %}
<div>
<button type="button" class="btn btn-light btn-sm btn-sm-narrow{% if not preview %} tab-selectable{% endif %}"
data-mark-no-answers-for="{{ contributor.id }}"
{% if preview %}disabled{% endif %}
>
{% blocktrans %}I can't give feedback about this contributor{% endblocktrans %}
</button>
</div>
{% endif%}
</div>
{% for form in questionnaire_group %}
<h4{% if not forloop.first %} class="mt-3"{% endif %}>{{ form.questionnaire.public_name }}</h4>
{% if not forloop.first %}<h4 class="mt-3">{{ form.questionnaire.public_name }}</h4>{% endif %}
{% if form.questionnaire.teaser %}
<p>{{ form.questionnaire.teaser }}</p>
{% endif %}
Expand Down