From 84e6d62103a328fdc8ef8a546c7177d9a6945b9e Mon Sep 17 00:00:00 2001
From: Robert Czechowski <czechowski@bwinf.de>
Date: Wed, 1 Apr 2020 11:46:32 +0200
Subject: [PATCH] Sort results by after sorting by name to fix mashup of grades
 when two participations with the same (last)name occur

---
 src/db_conn.base.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/db_conn.base.rs b/src/db_conn.base.rs
index d8e78f93..76767a03 100644
--- a/src/db_conn.base.rs
+++ b/src/db_conn.base.rs
@@ -642,7 +642,8 @@ impl MedalConnection for Connection {
                      WHERE usergroup.admin = $1
                      AND taskgroup.contest = $2
                      AND taskgroup.active = $3
-                     ORDER BY usergroup.id, sgrade, student.lastname, taskgroup.positionalnumber";
+                     ORDER BY usergroup.id, sgrade, student.lastname, student.firstname, student.id,
+                              taskgroup.positionalnumber";
         let gradeinfo =
             self.query_map_many(query, &[&session_id, &contest_id, &true], |row| {
                     (Grade { taskgroup: row.get(0), user: row.get(1), grade: row.get(2), validated: row.get(3) },
-- 
GitLab