diff --git a/evap/staff/tests/test_views.py b/evap/staff/tests/test_views.py index 46d7b3d8c5..1d09d6fc51 100644 --- a/evap/staff/tests/test_views.py +++ b/evap/staff/tests/test_views.py @@ -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, @@ -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() diff --git a/evap/staff/views.py b/evap/staff/views.py index b8a1b9f4e3..5523d40733 100644 --- a/evap/staff/views.py +++ b/evap/staff/views.py @@ -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)