Skip to content

GitLab

Commit d9203824 authored by Robert Czechowski's avatar Robert Czechowski
Browse files

Add some orderings in group and admin interface

parent 1266bf24
Pipeline #1173 passed with stages
in 23 minutes and 57 seconds
Hide whitespace changes
Inline Side-by-side
src/db_conn.base.rs
View file @ d9203824
......@@ -683,7 +683,8 @@ impl MedalConnection for Connection {
let query = "SELECT id, grade, validated, nonvalidated_grade, value, date, needs_validation
FROM submission
WHERE task = $1
AND session = $2";
AND session = $2
ORDER BY date";
self.query_map_many(query, &[&task, &session_id], |row| Submission { id: Some(row.get(0)),
task,
session_user: session_id,
......@@ -1361,7 +1362,8 @@ impl MedalConnection for Connection {
street, zip, city, nation, grade, sex, is_admin, is_teacher, oauth_provider,
oauth_foreign_id, salt
FROM session
WHERE managed_by = $1";
WHERE managed_by = $1
ORDER BY id";
group.members = self.query_map_many(query, &[&group_id], |row| SessionUser { id: row.get(0),
session_token: row.get(1),
csrf_token: row.get(2),
......@@ -1478,6 +1480,7 @@ impl MedalConnection for Connection {
FROM session
WHERE firstname ILIKE $1
AND lastname ILIKE $2
ORDER BY id DESC
LIMIT 30";
Ok(self.query_map_many(query, &[&firstname, &lastname], |row| (row.get(0), row.get(1), row.get(2)))
.unwrap())
......
src/db_conn_postgres.rs
View file @ d9203824
......@@ -802,7 +802,8 @@ impl MedalConnection for Connection {
let query = "SELECT id, grade, validated, nonvalidated_grade, value, date, needs_validation
FROM submission
WHERE task = $1
AND session = $2";
AND session = $2
ORDER BY date";
self.query_map_many(query, &[&task, &session_id], |row| Submission { id: Some(row.get(0)),
task,
session_user: session_id,
......@@ -1480,7 +1481,8 @@ impl MedalConnection for Connection {
street, zip, city, nation, grade, sex, is_admin, is_teacher, oauth_provider,
oauth_foreign_id, salt
FROM session
WHERE managed_by = $1";
WHERE managed_by = $1
ORDER BY id";
group.members = self.query_map_many(query, &[&group_id], |row| SessionUser { id: row.get(0),
session_token: row.get(1),
csrf_token: row.get(2),
......@@ -1597,6 +1599,7 @@ impl MedalConnection for Connection {
FROM session
WHERE firstname ILIKE $1
AND lastname ILIKE $2
ORDER BY id DESC
LIMIT 30";
Ok(self.query_map_many(query, &[&firstname, &lastname], |row| (row.get(0), row.get(1), row.get(2)))
.unwrap())
......
src/db_conn_sqlite_new.rs
View file @ d9203824
......@@ -802,7 +802,8 @@ impl MedalConnection for Connection {
let query = "SELECT id, grade, validated, nonvalidated_grade, value, date, needs_validation
FROM submission
WHERE task = ?1
AND session = ?2";
AND session = ?2
ORDER BY date";
self.query_map_many(query, &[&task, &session_id], |row| Submission { id: Some(row.get(0)),
task,
session_user: session_id,
......@@ -1480,7 +1481,8 @@ impl MedalConnection for Connection {
street, zip, city, nation, grade, sex, is_admin, is_teacher, oauth_provider,
oauth_foreign_id, salt
FROM session
WHERE managed_by = ?1";
WHERE managed_by = ?1
ORDER BY id";
group.members = self.query_map_many(query, &[&group_id], |row| SessionUser { id: row.get(0),
session_token: row.get(1),
csrf_token: row.get(2),
......@@ -1597,6 +1599,7 @@ impl MedalConnection for Connection {
FROM session
WHERE firstname LIKE ?1
AND lastname LIKE ?2
ORDER BY id DESC
LIMIT 30";
Ok(self.query_map_many(query, &[&firstname, &lastname], |row| (row.get(0), row.get(1), row.get(2)))
.unwrap())
......
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