Skip to content

GitLab

Commit 161a5929 authored by Robert Czechowski's avatar Robert Czechowski
Browse files

Add database field 'active' for 'taskgroup'. Reset it before contest/task... 

Add database field 'active' for 'taskgroup'. Reset it before contest/task updating, so taskgroups can be removed from contests again. Fixes #12.
parent 75a08bfc
Pipeline #476 failed with stages
in 30 minutes and 40 seconds
Hide whitespace changes
Inline Side-by-side
migrations/postgres/0002_alter_taskgroup_add_active.sql 0 → 100644
View file @ 161a5929
ALTER TABLE taskgroup ADD COLUMN active BOOL;
migrations/sqlite_v2/0002_alter_taskgroup_add_active.sql 0 → 100644
View file @ 161a5929
ALTER TABLE taskgroup ADD COLUMN active INTEGER;
src/db_conn.base.rs
View file @ 161a5929
...@@ -74,15 +74,15 @@ impl MedalObject<Connection> for Taskgroup { ...@@ -74,15 +74,15 @@ impl MedalObject<Connection> for Taskgroup {
let id = match self.get_id() { let id = match self.get_id() {
Some(id) => { Some(id) => {
let query = "UPDATE taskgroup let query = "UPDATE taskgroup
SET contest = $1, name = $2, positionalnumber = $3 SET contest = $1, name = $2, active = $3, positionalnumber = $4
WHERE id = $4"; WHERE id = $5";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber, &id]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber, &id]).unwrap();
id id
} }
None => { None => {
let query = "INSERT INTO taskgroup (contest, name, positionalnumber) let query = "INSERT INTO taskgroup (contest, name, active, positionalnumber)
VALUES ($1, $2, $3)"; VALUES ($1, $2, $3, $4)";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber]).unwrap();
conn.get_last_id().unwrap() conn.get_last_id().unwrap()
} }
}; };
...@@ -613,9 +613,10 @@ impl MedalConnection for Connection { ...@@ -613,9 +613,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = $1 WHERE contest = $1
ORDER BY id ASC"; AND active = $2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
...@@ -633,9 +634,10 @@ impl MedalConnection for Connection { ...@@ -633,9 +634,10 @@ impl MedalConnection for Connection {
JOIN usergroup ON student.managed_by = usergroup.id JOIN usergroup ON student.managed_by = usergroup.id
WHERE usergroup.admin = $1 WHERE usergroup.admin = $1
AND taskgroup.contest = $2 AND taskgroup.contest = $2
ORDER BY usergroup.id, student.id, taskgroup.id ASC"; AND taskgroup.active = $3
ORDER BY usergroup.id, student.id, taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_id, &contest_id], |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) },
Group { id: Some(row.get(4)), Group { id: Some(row.get(4)),
name: row.get(5), name: row.get(5),
...@@ -692,9 +694,10 @@ impl MedalConnection for Connection { ...@@ -692,9 +694,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = $1 WHERE contest = $1
ORDER BY id ASC"; AND active = $2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
let n_tasks = tasknames.len(); let n_tasks = tasknames.len();
...@@ -708,9 +711,10 @@ impl MedalConnection for Connection { ...@@ -708,9 +711,10 @@ impl MedalConnection for Connection {
JOIN session ON session.id = grade.session JOIN session ON session.id = grade.session
WHERE session.session_token = $1 WHERE session.session_token = $1
AND taskgroup.contest = $2 AND taskgroup.contest = $2
ORDER BY taskgroup.id ASC"; AND taskgroup.active = $3
ORDER BY taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_token, &contest_id], |row| Grade { taskgroup: row.get(0), self.query_map_many(query, &[&session_token, &contest_id, &true], |row| Grade { taskgroup: row.get(0),
user: row.get(1), user: row.get(1),
grade: row.get(2), grade: row.get(2),
validated: row.get(3) }) validated: row.get(3) })
...@@ -789,9 +793,10 @@ impl MedalConnection for Connection { ...@@ -789,9 +793,10 @@ impl MedalConnection for Connection {
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
JOIN task ON taskgroup.id = task.taskgroup JOIN task ON taskgroup.id = task.taskgroup
WHERE contest.id = $1 WHERE contest.id = $1
AND taskgroup.active = $2
ORDER BY taskgroup.positionalnumber"; ORDER BY taskgroup.positionalnumber";
let taskgroupcontest = let taskgroupcontest =
self.query_map_many(query, &[&contest_id], |row| { self.query_map_many(query, &[&contest_id, &true], |row| {
(Contest { id: Some(contest_id), (Contest { id: Some(contest_id),
location: row.get(0), location: row.get(0),
filename: row.get(1), filename: row.get(1),
...@@ -807,6 +812,7 @@ impl MedalConnection for Connection { ...@@ -807,6 +812,7 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(9)), Taskgroup { id: Some(row.get(9)),
contest: contest_id, contest: contest_id,
name: row.get(10), name: row.get(10),
active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Task { id: Some(row.get(11)), taskgroup: row.get(9), location: row.get(12), stars: row.get(13) }) Task { id: Some(row.get(11)), taskgroup: row.get(9), location: row.get(12), stars: row.get(13) })
...@@ -834,8 +840,9 @@ impl MedalConnection for Connection { ...@@ -834,8 +840,9 @@ impl MedalConnection for Connection {
taskgroup.name taskgroup.name
FROM contest FROM contest
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
WHERE contest.id = $1"; WHERE contest.id = $1
let taskgroupcontest = self.query_map_many(query, &[&contest_id], |row| { AND taskgroup.active = $2";
let taskgroupcontest = self.query_map_many(query, &[&contest_id, &true], |row| {
(Contest { id: Some(contest_id), (Contest { id: Some(contest_id),
location: row.get(0), location: row.get(0),
filename: row.get(1), filename: row.get(1),
...@@ -851,6 +858,7 @@ impl MedalConnection for Connection { ...@@ -851,6 +858,7 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(9)), Taskgroup { id: Some(row.get(9)),
contest: contest_id, contest: contest_id,
name: row.get(10), name: row.get(10),
active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }) tasks: Vec::new() })
}) })
...@@ -910,9 +918,9 @@ impl MedalConnection for Connection { ...@@ -910,9 +918,9 @@ impl MedalConnection for Connection {
.unwrap() .unwrap()
} }
fn get_task_by_id_complete(&self, task_id: i32) -> (Task, Taskgroup, Contest) { fn get_task_by_id_complete(&self, task_id: i32) -> (Task, Taskgroup, Contest) {
let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, contest.id, contest.location, let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id,
contest.filename, contest.name, contest.duration, contest.public, contest.start_date, contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.end_date, contest.min_grade, contest.max_grade contest.start_date, contest.end_date, contest.min_grade, contest.max_grade
FROM contest FROM contest
JOIN taskgroup ON taskgroup.contest = contest.id JOIN taskgroup ON taskgroup.contest = contest.id
JOIN task ON task.taskgroup = taskgroup.id JOIN task ON task.taskgroup = taskgroup.id
...@@ -922,18 +930,19 @@ impl MedalConnection for Connection { ...@@ -922,18 +930,19 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(2)), Taskgroup { id: Some(row.get(2)),
contest: row.get(4), contest: row.get(4),
name: row.get(3), name: row.get(3),
active: row.get(4),
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Contest { id: Some(row.get(4)), Contest { id: Some(row.get(5)),
location: row.get(5), location: row.get(6),
filename: row.get(6), filename: row.get(7),
name: row.get(7), name: row.get(8),
duration: row.get(8), duration: row.get(9),
public: row.get(9), public: row.get(10),
start: row.get(10), start: row.get(11),
end: row.get(11), end: row.get(12),
min_grade: row.get(12), min_grade: row.get(13),
max_grade: row.get(13), max_grade: row.get(14),
positionalnumber: None, positionalnumber: None,
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
...@@ -1112,4 +1121,5 @@ impl MedalConnection for Connection { ...@@ -1112,4 +1121,5 @@ impl MedalConnection for Connection {
} }
fn reset_all_contest_visibilities(&self) { self.execute("UPDATE contest SET public = $1", &[&false]).unwrap(); } fn reset_all_contest_visibilities(&self) { self.execute("UPDATE contest SET public = $1", &[&false]).unwrap(); }
fn reset_all_taskgroup_visibilities(&self) { self.execute("UPDATE taskgroup SET active = $1", &[&false]).unwrap(); }
} }
src/db_conn.rs
View file @ 161a5929
...@@ -53,6 +53,7 @@ pub trait MedalConnection { ...@@ -53,6 +53,7 @@ pub trait MedalConnection {
fn get_debug_information(&self) -> String; fn get_debug_information(&self) -> String;
fn reset_all_contest_visibilities(&self); fn reset_all_contest_visibilities(&self);
fn reset_all_taskgroup_visibilities(&self);
} }
pub trait MedalObject<T: MedalConnection> { pub trait MedalObject<T: MedalConnection> {
......
src/db_conn_postgres.rs
View file @ 161a5929
...@@ -170,15 +170,15 @@ impl MedalObject<Connection> for Taskgroup { ...@@ -170,15 +170,15 @@ impl MedalObject<Connection> for Taskgroup {
let id = match self.get_id() { let id = match self.get_id() {
Some(id) => { Some(id) => {
let query = "UPDATE taskgroup let query = "UPDATE taskgroup
SET contest = $1, name = $2, positionalnumber = $3 SET contest = $1, name = $2, active = $3, positionalnumber = $4
WHERE id = $4"; WHERE id = $5";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber, &id]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber, &id]).unwrap();
id id
} }
None => { None => {
let query = "INSERT INTO taskgroup (contest, name, positionalnumber) let query = "INSERT INTO taskgroup (contest, name, active, positionalnumber)
VALUES ($1, $2, $3)"; VALUES ($1, $2, $3, $4)";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber]).unwrap();
conn.get_last_id().unwrap() conn.get_last_id().unwrap()
} }
}; };
...@@ -709,9 +709,10 @@ impl MedalConnection for Connection { ...@@ -709,9 +709,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = $1 WHERE contest = $1
ORDER BY id ASC"; AND active = $2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
...@@ -729,9 +730,10 @@ impl MedalConnection for Connection { ...@@ -729,9 +730,10 @@ impl MedalConnection for Connection {
JOIN usergroup ON student.managed_by = usergroup.id JOIN usergroup ON student.managed_by = usergroup.id
WHERE usergroup.admin = $1 WHERE usergroup.admin = $1
AND taskgroup.contest = $2 AND taskgroup.contest = $2
ORDER BY usergroup.id, student.id, taskgroup.id ASC"; AND taskgroup.active = $3
ORDER BY usergroup.id, student.id, taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_id, &contest_id], |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) },
Group { id: Some(row.get(4)), Group { id: Some(row.get(4)),
name: row.get(5), name: row.get(5),
...@@ -788,9 +790,10 @@ impl MedalConnection for Connection { ...@@ -788,9 +790,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = $1 WHERE contest = $1
ORDER BY id ASC"; AND active = $2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
let n_tasks = tasknames.len(); let n_tasks = tasknames.len();
...@@ -804,12 +807,13 @@ impl MedalConnection for Connection { ...@@ -804,12 +807,13 @@ impl MedalConnection for Connection {
JOIN session ON session.id = grade.session JOIN session ON session.id = grade.session
WHERE session.session_token = $1 WHERE session.session_token = $1
AND taskgroup.contest = $2 AND taskgroup.contest = $2
ORDER BY taskgroup.id ASC"; AND taskgroup.active = $3
ORDER BY taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_token, &contest_id], |row| Grade { taskgroup: row.get(0), self.query_map_many(query, &[&session_token, &contest_id, &true], |row| Grade { taskgroup: row.get(0),
user: row.get(1), user: row.get(1),
grade: row.get(2), grade: row.get(2),
validated: row.get(3) }) validated: row.get(3) })
.unwrap(); .unwrap();
let gradeinfo_iter = gradeinfo.iter(); let gradeinfo_iter = gradeinfo.iter();
...@@ -885,9 +889,10 @@ impl MedalConnection for Connection { ...@@ -885,9 +889,10 @@ impl MedalConnection for Connection {
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
JOIN task ON taskgroup.id = task.taskgroup JOIN task ON taskgroup.id = task.taskgroup
WHERE contest.id = $1 WHERE contest.id = $1
AND taskgroup.active = $2
ORDER BY taskgroup.positionalnumber"; ORDER BY taskgroup.positionalnumber";
let taskgroupcontest = let taskgroupcontest =
self.query_map_many(query, &[&contest_id], |row| { self.query_map_many(query, &[&contest_id, &true], |row| {
(Contest { id: Some(contest_id), (Contest { id: Some(contest_id),
location: row.get(0), location: row.get(0),
filename: row.get(1), filename: row.get(1),
...@@ -903,6 +908,7 @@ impl MedalConnection for Connection { ...@@ -903,6 +908,7 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(9)), Taskgroup { id: Some(row.get(9)),
contest: contest_id, contest: contest_id,
name: row.get(10), name: row.get(10),
active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Task { id: Some(row.get(11)), taskgroup: row.get(9), location: row.get(12), stars: row.get(13) }) Task { id: Some(row.get(11)), taskgroup: row.get(9), location: row.get(12), stars: row.get(13) })
...@@ -930,8 +936,9 @@ impl MedalConnection for Connection { ...@@ -930,8 +936,9 @@ impl MedalConnection for Connection {
taskgroup.name taskgroup.name
FROM contest FROM contest
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
WHERE contest.id = $1"; WHERE contest.id = $1
let taskgroupcontest = self.query_map_many(query, &[&contest_id], |row| { AND taskgroup.active = $2";
let taskgroupcontest = self.query_map_many(query, &[&contest_id, &true], |row| {
(Contest { id: Some(contest_id), (Contest { id: Some(contest_id),
location: row.get(0), location: row.get(0),
filename: row.get(1), filename: row.get(1),
...@@ -947,6 +954,7 @@ impl MedalConnection for Connection { ...@@ -947,6 +954,7 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(9)), Taskgroup { id: Some(row.get(9)),
contest: contest_id, contest: contest_id,
name: row.get(10), name: row.get(10),
active: true,
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }) tasks: Vec::new() })
}) })
...@@ -1006,9 +1014,9 @@ impl MedalConnection for Connection { ...@@ -1006,9 +1014,9 @@ impl MedalConnection for Connection {
.unwrap() .unwrap()
} }
fn get_task_by_id_complete(&self, task_id: i32) -> (Task, Taskgroup, Contest) { fn get_task_by_id_complete(&self, task_id: i32) -> (Task, Taskgroup, Contest) {
let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, contest.id, contest.location, let query = "SELECT task.location, task.stars, taskgroup.id, taskgroup.name, taskgroup.active, contest.id,
contest.filename, contest.name, contest.duration, contest.public, contest.start_date, contest.location, contest.filename, contest.name, contest.duration, contest.public,
contest.end_date, contest.min_grade, contest.max_grade contest.start_date, contest.end_date, contest.min_grade, contest.max_grade
FROM contest FROM contest
JOIN taskgroup ON taskgroup.contest = contest.id JOIN taskgroup ON taskgroup.contest = contest.id
JOIN task ON task.taskgroup = taskgroup.id JOIN task ON task.taskgroup = taskgroup.id
...@@ -1018,18 +1026,19 @@ impl MedalConnection for Connection { ...@@ -1018,18 +1026,19 @@ impl MedalConnection for Connection {
Taskgroup { id: Some(row.get(2)), Taskgroup { id: Some(row.get(2)),
contest: row.get(4), contest: row.get(4),
name: row.get(3), name: row.get(3),
active: row.get(4),
positionalnumber: None, positionalnumber: None,
tasks: Vec::new() }, tasks: Vec::new() },
Contest { id: Some(row.get(4)), Contest { id: Some(row.get(5)),
location: row.get(5), location: row.get(6),
filename: row.get(6), filename: row.get(7),
name: row.get(7), name: row.get(8),
duration: row.get(8), duration: row.get(9),
public: row.get(9), public: row.get(10),
start: row.get(10), start: row.get(11),
end: row.get(11), end: row.get(12),
min_grade: row.get(12), min_grade: row.get(13),
max_grade: row.get(13), max_grade: row.get(14),
positionalnumber: None, positionalnumber: None,
taskgroups: Vec::new() }) taskgroups: Vec::new() })
}) })
...@@ -1208,4 +1217,5 @@ impl MedalConnection for Connection { ...@@ -1208,4 +1217,5 @@ impl MedalConnection for Connection {
} }
fn reset_all_contest_visibilities(&self) { self.execute("UPDATE contest SET public = $1", &[&false]).unwrap(); } fn reset_all_contest_visibilities(&self) { self.execute("UPDATE contest SET public = $1", &[&false]).unwrap(); }
fn reset_all_taskgroup_visibilities(&self) { self.execute("UPDATE taskgroup SET active = $1", &[&false]).unwrap(); }
} }
src/db_conn_sqlite_new.rs
View file @ 161a5929
...@@ -170,15 +170,15 @@ impl MedalObject<Connection> for Taskgroup { ...@@ -170,15 +170,15 @@ impl MedalObject<Connection> for Taskgroup {
let id = match self.get_id() { let id = match self.get_id() {
Some(id) => { Some(id) => {
let query = "UPDATE taskgroup let query = "UPDATE taskgroup
SET contest = ?1, name = ?2, positionalnumber = ?3 SET contest = ?1, name = ?2, active = ?3, positionalnumber = ?4
WHERE id = ?4"; WHERE id = ?5";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber, &id]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber, &id]).unwrap();
id id
} }
None => { None => {
let query = "INSERT INTO taskgroup (contest, name, positionalnumber) let query = "INSERT INTO taskgroup (contest, name, active, positionalnumber)
VALUES (?1, ?2, ?3)"; VALUES (?1, ?2, ?3, ?4)";
conn.execute(query, &[&self.contest, &self.name, &self.positionalnumber]).unwrap(); conn.execute(query, &[&self.contest, &self.name, &self.active, &self.positionalnumber]).unwrap();
conn.get_last_id().unwrap() conn.get_last_id().unwrap()
} }
}; };
...@@ -709,9 +709,10 @@ impl MedalConnection for Connection { ...@@ -709,9 +709,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = ?1 WHERE contest = ?1
ORDER BY id ASC"; AND active = ?2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
...@@ -729,9 +730,10 @@ impl MedalConnection for Connection { ...@@ -729,9 +730,10 @@ impl MedalConnection for Connection {
JOIN usergroup ON student.managed_by = usergroup.id JOIN usergroup ON student.managed_by = usergroup.id
WHERE usergroup.admin = ?1 WHERE usergroup.admin = ?1
AND taskgroup.contest = ?2 AND taskgroup.contest = ?2
ORDER BY usergroup.id, student.id, taskgroup.id ASC"; AND taskgroup.active = ?3
ORDER BY usergroup.id, student.id, taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_id, &contest_id], |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) },
Group { id: Some(row.get(4)), Group { id: Some(row.get(4)),
name: row.get(5), name: row.get(5),
...@@ -788,9 +790,10 @@ impl MedalConnection for Connection { ...@@ -788,9 +790,10 @@ impl MedalConnection for Connection {
let query = "SELECT id, name let query = "SELECT id, name
FROM taskgroup FROM taskgroup
WHERE contest = ?1 WHERE contest = ?1
ORDER BY id ASC"; AND active = ?2
ORDER BY positionalnumber";
let tasknames: Vec<(i32, String)> = let tasknames: Vec<(i32, String)> =
self.query_map_many(query, &[&contest_id], |row| (row.get(0), row.get(1))).unwrap(); self.query_map_many(query, &[&contest_id, &true], |row| (row.get(0), row.get(1))).unwrap();
let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new(); let mut taskindex: ::std::collections::BTreeMap<i32, usize> = ::std::collections::BTreeMap::new();
let n_tasks = tasknames.len(); let n_tasks = tasknames.len();
...@@ -804,12 +807,13 @@ impl MedalConnection for Connection { ...@@ -804,12 +807,13 @@ impl MedalConnection for Connection {
JOIN session ON session.id = grade.session JOIN session ON session.id = grade.session
WHERE session.session_token = ?1 WHERE session.session_token = ?1
AND taskgroup.contest = ?2 AND taskgroup.contest = ?2
ORDER BY taskgroup.id ASC"; AND taskgroup.active = ?3
ORDER BY taskgroup.positionalnumber";
let gradeinfo = let gradeinfo =
self.query_map_many(query, &[&session_token, &contest_id], |row| Grade { taskgroup: row.get(0), self.query_map_many(query, &[&session_token, &contest_id, &true], |row| Grade { taskgroup: row.get(0),
user: row.get(1), user: row.get(1),
grade: row.get(2), grade: row.get(2),
validated: row.get(3) }) validated: row.get(3) })
.unwrap(); .unwrap();
let gradeinfo_iter = gradeinfo.iter(); let gradeinfo_iter = gradeinfo.iter();
...@@ -885,9 +889,10 @@ impl MedalConnection for Connection { ...@@ -885,9 +889,10 @@ impl MedalConnection for Connection {
JOIN taskgroup ON contest.id = taskgroup.contest JOIN taskgroup ON contest.id = taskgroup.contest
JOIN task ON taskgroup.id = task.taskgroup JOIN task ON taskgroup.id = task.taskgroup
WHERE contest.id = ?1 WHERE contest.id = ?1
AND taskgroup.active = ?2
ORDER BY taskgroup.positionalnumber"; ORDER BY taskgroup.positionalnumber";
let taskgroupcontest = let taskgroupcontest =
self.query_map_many(query, &[&contest_id], |row| { self.query_map_many(query, &[&contest_id, &true], |row| {