Commit 9403ddae authored by Robert Czechowski's avatar Robert Czechowski

Change version number to 1.2

parent b0279054
Pipeline #655 passed with stage
in 14 minutes and 1 second
...@@ -892,7 +892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -892,7 +892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "medal" name = "medal"
version = "1.1.1" version = "1.2.0"
dependencies = [ dependencies = [
"bcrypt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "handlebars-iron 0.25.2 (registry+https://github.com/rust-lang/crates.io-index)",
......
[package] [package]
version = "1.2.0"
name = "medal" name = "medal"
version = "1.1.1"
authors = ["Robert Czechowski <czechowski@bwinf.de>", "Daniel Brüning <bruening@bwinf.de>"] authors = ["Robert Czechowski <czechowski@bwinf.de>", "Daniel Brüning <bruening@bwinf.de>"]
description = "A simple online contest platform" description = "A simple online contest platform"
......
...@@ -738,7 +738,8 @@ impl MedalConnection for Connection { ...@@ -738,7 +738,8 @@ impl MedalConnection for Connection {
WHERE usergroup.admin = $1 WHERE usergroup.admin = $1
AND taskgroup.contest = $2 AND taskgroup.contest = $2
AND taskgroup.active = $3 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 = let gradeinfo =
self.query_map_many(query, &[&session_id, &contest_id, &true], |row| { 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) }, (Grade { taskgroup: row.get(0), user: row.get(1), grade: row.get(2), validated: row.get(3) },
......
...@@ -738,7 +738,8 @@ impl MedalConnection for Connection { ...@@ -738,7 +738,8 @@ impl MedalConnection for Connection {
WHERE usergroup.admin = ?1 WHERE usergroup.admin = ?1
AND taskgroup.contest = ?2 AND taskgroup.contest = ?2
AND taskgroup.active = ?3 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 = let gradeinfo =
self.query_map_many(query, &[&session_id, &contest_id, &true], |row| { 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) }, (Grade { taskgroup: row.get(0), user: row.get(1), grade: row.get(2), validated: row.get(3) },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment