diff --git a/grade/report/grader/lang/en/gradereport_grader.php b/grade/report/grader/lang/en/gradereport_grader.php index ce3aa730bd9..bd008b8e91b 100644 --- a/grade/report/grader/lang/en/gradereport_grader.php +++ b/grade/report/grader/lang/en/gradereport_grader.php @@ -32,5 +32,8 @@ $string['grader:manage'] = 'Manage the grader report'; $string['grader:view'] = 'View the grader report'; $string['pluginname'] = 'Grader report'; $string['preferences'] = 'Grader report preferences'; +$string['summarygrader'] = 'A table with the names of students in the first column, with assessable activities grouped by course and category across the top.'; +$string['summarygraderleft'] = "A table with the names of students in the first column, with student-specific metadata such as email addresses in the others."; +$string['summarygraderright'] = "A table of assessable activities, grouped by course and category across the top."; $string['useractivitygrade'] = '{$a} grade'; $string['useractivityfeedback'] = '{$a} feedback'; diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index d6700dd92f7..91e2f0e1809 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -603,12 +603,18 @@ class grade_report_grader extends grade_report { $levels = count($this->gtree->levels) - 1; - for ($i = 0; $i < $levels; $i++) { - $fillercell = new html_table_cell(); - $fillercell->attributes['class'] = 'fixedcolumn cell topleft'; - $fillercell->text = ' '; - $fillercell->colspan = $colspan; - $row = new html_table_row(array($fillercell)); + $fillercell = new html_table_cell(); + $fillercell->header = true; + $fillercell->attributes['scope'] = 'col'; + $fillercell->attributes['class'] = 'cell topleft'; + $fillercell->text = html_writer::span(get_string('participants'), 'accesshide'); + $fillercell->colspan = $colspan; + $fillercell->rowspan = $levels; + $row = new html_table_row(array($fillercell)); + $rows[] = $row; + + for ($i = 1; $i < $levels; $i++) { + $row = new html_table_row(); $rows[] = $row; } @@ -650,7 +656,7 @@ class grade_report_grader extends grade_report { $userrow->attributes['class'] = 'r'.$this->rowcount++.' '.$rowclasses[$this->rowcount % 2]; $usercell = new html_table_cell(); - $usercell->attributes['class'] = 'user'; + $usercell->attributes['class'] = 'header user'; $usercell->header = true; $usercell->scope = 'row'; @@ -677,7 +683,7 @@ class grade_report_grader extends grade_report { if (has_capability('gradereport/'.$CFG->grade_profilereport.':view', $this->context)) { $userreportcell = new html_table_cell(); $userreportcell->attributes['class'] = 'userreport'; - $userreportcell->header = true; + $userreportcell->header = false; $a = new stdClass(); $a->user = fullname($user); $strgradesforuser = get_string('gradesforuser', 'grades', $a); @@ -688,9 +694,8 @@ class grade_report_grader extends grade_report { foreach ($extrafields as $field) { $fieldcell = new html_table_cell(); - $fieldcell->attributes['class'] = 'header userfield user' . $field; - $fieldcell->header = true; - $fieldcell->scope = 'row'; + $fieldcell->attributes['class'] = 'userfield user' . $field; + $fieldcell->header = false; $fieldcell->text = $user->{$field}; $userrow->cells[] = $fieldcell; } @@ -767,8 +772,9 @@ class grade_report_grader extends grade_report { $fillercell->attributes['class'] = $type . ' ' . $catlevel; $fillercell->colspan = $colspan; $fillercell->text = ' '; - $fillercell->header = true; - $fillercell->scope = 'col'; + + // This is a filler cell; don't use a