L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-80053-main' of https://github.com/Jayce0808/moodle

Browse Source
This commit is contained in:
Mihail Geshoski
2025-09-17 23:34:28 +08:00
parent 212bba0782 50b61a3ee6
commit 2e580f5621
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/grade/lib.php
+1
View File
@@ -2502,6 +2502,7 @@ class grade_tree extends grade_structure {
$this->courseid = $courseid;
$this->levels = array();
$this->context = context_course::instance($courseid);
$this->items = [];
if (!empty($COURSE->id) && $COURSE->id == $this->courseid) {
$course = $COURSE;
public/grade/report/grader/lib.php
+19 -7
View File
@@ -551,13 +551,19 @@ class grade_report_grader extends grade_report {
public function get_max_students_per_page(): int {
global $CFG;
$gradeitemcount = count($this->get_allgradeitems());
if (isset($CFG->maxgradesperpage) && clean_param($CFG->maxgradesperpage, PARAM_INT) > 0) {
$maxgradesperpage = $CFG->maxgradesperpage;
} else {
$maxgradesperpage = self::MAX_GRADES_PER_PAGE;
}
return round($maxgradesperpage / count($this->get_allgradeitems()));
if ($gradeitemcount > 0) {
return round($maxgradesperpage / $gradeitemcount);
} else {
return $maxgradesperpage;
}
}
/**
@@ -662,7 +668,9 @@ class grade_report_grader extends grade_report {
$fillercell->colspan = $colspan;
$fillercell->rowspan = $levels;
$row = new html_table_row(array($fillercell));
$rows[] = $row;
if ($levels >= 1) { // Do not display the filler cell if there are no levels as there will be nothing else in the row.
$rows[] = $row;
}
for ($i = 1; $i < $levels; $i++) {
$row = new html_table_row();
@@ -683,7 +691,6 @@ class grade_report_grader extends grade_report {
$element = ['type' => 'userfield', 'name' => 'fullname'];
$studentheader->text = $arrows['studentname'] .
$this->gtree->get_cell_action_menu($element, 'gradeitem', $this->gpr, $this->baseurl);
$headerrow->cells[] = $studentheader;
foreach ($extrafields as $field) {
@@ -1299,10 +1306,15 @@ class grade_report_grader extends grade_report {
// Extract rows from each side (left and right) and collate them into one row each
foreach ($leftrows as $key => $row) {
$row->cells = array_merge($row->cells, $rightrows[$key]->cells);
$fulltable->data[] = $row;
unset($leftrows[$key]);
unset($rightrows[$key]);
if (isset($rightrows[$key])) {
$row->cells = array_merge($row->cells, $rightrows[$key]->cells);
$fulltable->data[] = $row;
unset($leftrows[$key]);
unset($rightrows[$key]);
} else { // Right row is not set - this is the case of the left side.
$fulltable->data[] = $row;
unset($leftrows[$key]);
}
}
$html .= html_writer::table($fulltable);
return $OUTPUT->container($html, 'gradeparent');