Skip to content

Order entries in grade reminder view by responsible #2706

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

Merged
janno42 merged 1 commit into from
Apr 27, 2026
+14 −7
Merged

Order entries in grade reminder view by responsible #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions evap/staff/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,13 +1075,18 @@ class TestGradeReminderView(WebTestStaffMode):
@classmethod
def setUpTestData(cls):
cls.manager = make_manager()
cls.responsible = baker.make(UserProfile, first_name_given="Bastius", last_name="Quid")
cls.responsible1 = baker.make(UserProfile, first_name_given="Bastius", last_name="Quid")
cls.responsible2 = baker.make(UserProfile, first_name_given="Bastius", last_name="Klum")
cls.semester = baker.make(Semester)
cls.url = reverse("staff:semester_grade_reminder", args=[cls.semester.pk])

course_args = {"responsibles": [cls.responsible], "gets_no_grade_documents": False, "semester": cls.semester}
cls.course1 = baker.make(Course, name_en="A-Course1", name_de="Z-Course1", **course_args)
cls.course2 = baker.make(Course, name_en="Z-Course2", name_de="A-Course2", **course_args)
course_args = {"gets_no_grade_documents": False, "semester": cls.semester}
cls.course1 = baker.make(
Course, name_en="A-Course1", name_de="Z-Course1", responsibles=[cls.responsible1], **course_args
)
cls.course2 = baker.make(
Course, name_en="Z-Course2", name_de="A-Course2", responsibles=[cls.responsible2], **course_args
)

baker.make(
Evaluation,
Expand Down Expand Up @@ -1122,8 +1127,8 @@ def test_reminders(self):
body = page.body.decode()
self.assertEqual(body.count("Z-Course2"), 1)

# courses should be ordered
self.assertLess(body.index("A-Course1"), body.index("Z-Course2"))
# responsibles should be ordered
self.assertLess(body.index("Z-Course2"), body.index("A-Course1"))

self.manager.language = "de"
self.manager.save()
Expand Down
4 changes: 3 additions & 1 deletion evap/staff/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,9 @@ def semester_grade_reminder(request, semester_id: int) -> HttpResponse:

template_data = {
"semester": semester,
"responsibles_and_courses_without_final_grades": responsibles_and_courses_without_final_grades.items(),
"responsibles_and_courses_without_final_grades": sorted(
responsibles_and_courses_without_final_grades.items(), key=lambda t: t[0].ordering_key()
),
}
return render(request, "staff_semester_grade_reminder.html", template_data)

Expand Down