results page fixes

evap/locale/de/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: EvaP\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-02-19 14:09+0100\n"
-"PO-Revision-Date: 2019-02-19 14:20+0100\n"
+"PO-Revision-Date: 2019-02-19 22:02+0100\n"
 "Last-Translator: Johannes Wolf <johannes-wolf@posteo.de>\n"
 "Language-Team: Johannes Wolf (janno42)\n"
 "Language: de\n"
@@ -2219,7 +2219,7 @@ msgstr "Noten"
 #: evap/student/templates/student_index.html:5
 #: evap/student/templates/student_vote.html:8
 msgid "Evaluation"
-msgstr "Bewertung"
+msgstr "Evaluierung"
 
 #: evap/results/templates/results_evaluation_detail.html:97
 #: evap/results/templates/results_evaluation_detail.html:121

evap/results/views.py

@@ -135,7 +135,7 @@ def index(request):
         additional_evaluations = get_evaluations_with_course_result_attributes(additional_evaluations)
         evaluations += additional_evaluations
 
-    evaluations.sort(key=lambda evaluation: (evaluation.full_name, evaluation.course.semester.pk))  # evaluations must be sorted for regrouping them in the template
+    evaluations.sort(key=lambda evaluation: (evaluation.course.semester.pk, evaluation.full_name))  # evaluations must be sorted for regrouping them in the template
 
     evaluation_pks = [evaluation.pk for evaluation in evaluations]
     degrees = Degree.objects.filter(courses__evaluations__pk__in=evaluation_pks).distinct()