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

Prioritize evaluations with finished grading for review #1668

Merged
merged 8 commits into from
Apr 18, 2022
Merged

Prioritize evaluations with finished grading for review #1668

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d88c2ec
Prioritize evaluations with finished grading for review
PonderKoKo Nov 15, 2021
2057e65
Merge branch 'e-valuation:main' into reviewpriority
PonderKoKo Mar 31, 2022
e50d2ac
Prioritize evaluations with finished grading for review including test
PonderKoKo Mar 31, 2022
4506f94
Reformat through precommit
PonderKoKo Mar 31, 2022
2ac59e7
Revert " Prioritize evaluations with finished grading for review"
PonderKoKo Apr 6, 2022
cfef5f6
Rewrite adding textanswers in test_suggested_evaluation_ordering
PonderKoKo Apr 7, 2022
299f1b2
Use assertIn for test_suggested_evaluation_ordering
PonderKoKo Apr 14, 2022
cdafdca
Merge branch 'reviewpriority' of https://github.com/PonderKoKo/EvaP i…
PonderKoKo Apr 14, 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
8 changes: 7 additions & 1 deletion evap/staff/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,13 @@ def evaluation_textanswers(request, semester_id, evaluation_id):
request.session["review-visited"] = visited

sections = evaluation_sections + contributor_sections
template_data.update(dict(sections=sections, next_evaluations=next_evaluations))
# Evaluations where the grading process is finished should be shown first, need to be sorted in Python
template_data.update(
dict(
sections=sections,
next_evaluations=sorted(next_evaluations, key=lambda e: e.grading_process_is_finished, reverse=True),
richardebeling marked this conversation as resolved.
Show resolved Hide resolved
)
)
return render(request, "staff_evaluation_textanswers_quick.html", template_data)

template_data.update(dict(evaluation_sections=evaluation_sections, contributor_sections=contributor_sections))
Expand Down