mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-47358 gradereport_history: Improved default natural sorting by time
This commit is contained in:
parent
655e377c45
commit
a5e706e8fe
1 changed files with 20 additions and 2 deletions
|
@ -387,13 +387,31 @@ class tablelog extends \table_sql implements \renderable {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add order by if needed.
|
// Add order by if needed.
|
||||||
if (!$count && $this->get_sql_sort()) {
|
if (!$count && $sqlsort = $this->get_sql_sort()) {
|
||||||
$sql .= " ORDER BY " . $this->get_sql_sort();
|
$sql .= " ORDER BY " . $sqlsort;
|
||||||
}
|
}
|
||||||
|
|
||||||
return array($sql, $params);
|
return array($sql, $params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the SQL fragment to sort by.
|
||||||
|
*
|
||||||
|
* This is overridden to sort by timemodified and ID by default. Many items happen at the same time
|
||||||
|
* and a second sorting by ID is valuable to distinguish the order in which the history happened.
|
||||||
|
*
|
||||||
|
* @return string SQL fragment.
|
||||||
|
*/
|
||||||
|
public function get_sql_sort() {
|
||||||
|
$columns = $this->get_sort_columns();
|
||||||
|
if (count($columns) == 1 && isset($columns['timemodified']) && $columns['timemodified'] == SORT_DESC) {
|
||||||
|
// Add the 'id' column when we are using the default sorting.
|
||||||
|
$columns['id'] = SORT_DESC;
|
||||||
|
return self::construct_order_by($columns);
|
||||||
|
}
|
||||||
|
return parent::get_sql_sort();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Query the reader. Store results in the object for use by build_table.
|
* Query the reader. Store results in the object for use by build_table.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue