Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bwinf
medal
Commits
9403ddae
Commit
9403ddae
authored
Apr 17, 2020
by
Robert Czechowski
Browse files
Change version number to 1.2
parent
b0279054
Pipeline
#655
passed with stage
in 14 minutes and 1 second
Changes
4
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Cargo.lock
View file @
9403ddae
...
...
@@ -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)",
...
...
Cargo.toml
View file @
9403ddae
[package]
version
=
"1.2.0"
name
=
"medal"
version
=
"1.1.1"
authors
=
[
"Robert Czechowski <czechowski@bwinf.de>"
,
"Daniel Brüning <bruening@bwinf.de>"
]
description
=
"A simple online contest platform"
...
...
src/db_conn_postgres.rs
View file @
9403ddae
...
...
@@ -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
)
},
...
...
src/db_conn_sqlite_new.rs
View file @
9403ddae
...
...
@@ -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
)
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment