mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-11 19:16:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-82545_main' of https://github.com/marxjohnson/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-09-12 10:46:36 +07:00
commit 48f6e57073
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grade/report/grader/index.php
View File

@ -28,6 +28,10 @@ require_once($CFG->dirroot.'/user/renderer.php');
require_once($CFG->dirroot.'/grade/lib.php');
require_once($CFG->dirroot.'/grade/report/grader/lib.php');
// This report may require a lot of memory and time on large courses.
raise_memory_limit(MEMORY_HUGE);
set_time_limit(120);
$courseid = required_param('id', PARAM_INT); // course id
$page = optional_param('page', 0, PARAM_INT); // active page
$edit = optional_param('edit', -1, PARAM_BOOL); // sticky editting mode
@ -192,8 +196,9 @@ if ($studentsperpage) {
$pagingoptions = array_unique($pagingoptions);
sort($pagingoptions);
$pagingoptions = array_combine($pagingoptions, $pagingoptions);
if ($numusers > grade_report_grader::MAX_STUDENTS_PER_PAGE) {
$pagingoptions['0'] = grade_report_grader::MAX_STUDENTS_PER_PAGE;
$maxusers = $report->get_max_students_per_page();
if ($numusers > $maxusers) {
$pagingoptions['0'] = $maxusers;
} else {
$pagingoptions['0'] = get_string('all');
}
@ -216,7 +221,7 @@ $footercontent = html_writer::div(
);
// The number of students per page is always limited even if it is claimed to be unlimited.
$studentsperpage = $studentsperpage ?: grade_report_grader::MAX_STUDENTS_PER_PAGE;
$studentsperpage = $studentsperpage ?: $maxusers;
$footercontent .= html_writer::div(
$OUTPUT->paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl),
'col'

30
grade/report/grader/lib.php
View File

@ -102,9 +102,20 @@ class grade_report_grader extends grade_report {
*/
public $canviewhidden;
/** @var int Maximum number of students that can be shown on one page */
/**
* @var int Maximum number of students that can be shown on one page
* @deprecated Since Moodle 4.5 MDL-84245. Use grade_report_grader::get_max_students_per_page() instead.
*/
#[\core\attribute\deprecated('grade_report_grader::get_max_students_per_page()', since: '4.5', mdl: 'MDL-84245')]
public const MAX_STUDENTS_PER_PAGE = 5000;
/**
* @var int The maximum number of grades that can be shown on one page.
*
* More than this causes issues for the browser due to the size of the page.
*/
public const MAX_GRADES_PER_PAGE = 200000;
/** @var int[] List of available options on the pagination dropdown */
public const PAGINATION_OPTIONS = [20, 100];
@ -466,9 +477,10 @@ class grade_report_grader extends grade_report {
$this->userwheresql
$this->groupwheresql
ORDER BY $sort";
// We never work with unlimited result. Limit the number of records by MAX_STUDENTS_PER_PAGE if no other limit is specified.
// We never work with unlimited result. Limit the number of records by $this->get_max_students_per_page() if no other limit
// is specified.
$studentsperpage = ($this->get_students_per_page() && !$allusers) ?
$this->get_students_per_page() : static::MAX_STUDENTS_PER_PAGE;
$this->get_students_per_page() : $this->get_max_students_per_page();
$this->users = $DB->get_records_sql($sql, $params, $studentsperpage * $this->page, $studentsperpage);
if (empty($this->users)) {
@ -526,6 +538,18 @@ class grade_report_grader extends grade_report {
return $this->allgradeitems;
}
/**
* Return the maximum number of students we can display per page.
*
* This is based on the number of grade items on the course, to limit the overall number of grades displayed on a single page.
* Trying to display too many grades causes browser issues.
*
* @return int
*/
public function get_max_students_per_page(): int {
return round(static::MAX_GRADES_PER_PAGE / count($this->get_allgradeitems()));
}
/**
* we supply the userids in this query, and get all the grades
* pulls out all the grades, this does not need to worry about paging