From 9403ddae292959d761773e4f87381c9ee38b3878 Mon Sep 17 00:00:00 2001 From: Robert Czechowski Date: Fri, 17 Apr 2020 16:52:34 +0200 Subject: [PATCH] Change version number to 1.2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/db_conn_postgres.rs | 3 ++- src/db_conn_sqlite_new.rs | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c209e84..7efa57d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -892,7 +892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "medal" -version = "1.1.1" +version = "1.2.0" dependencies = [ "bcrypt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars-iron 0.25.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 2010ce4a..57647d79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] +version = "1.2.0" name = "medal" -version = "1.1.1" authors = ["Robert Czechowski ", "Daniel Brüning "] description = "A simple online contest platform" diff --git a/src/db_conn_postgres.rs b/src/db_conn_postgres.rs index 9f6af29b..9559b247 100644 --- a/src/db_conn_postgres.rs +++ b/src/db_conn_postgres.rs @@ -738,7 +738,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) }, diff --git a/src/db_conn_sqlite_new.rs b/src/db_conn_sqlite_new.rs index b491dba5..5ec4d402 100644 --- a/src/db_conn_sqlite_new.rs +++ b/src/db_conn_sqlite_new.rs @@ -738,7 +738,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