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

Merge branch 'MDL-59702' of https://github.com/andrewhancox/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2017-08-22 11:01:30 +08:00
parent b4b61be922 6a8e25ef18
commit ea8b25c51f
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/locallib.php
+39 -11
View File
@@ -704,10 +704,12 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
list($esql, $params) = get_enrolled_sql($context, '', $currentgroup, true);
list($sort, $sortparams) = users_order_by_sql('u');
$extrafields = get_extra_user_fields($context);
$params['a1lessonid'] = $lesson->id;
$params['b1lessonid'] = $lesson->id;
$params['c1lessonid'] = $lesson->id;
$ufields = user_picture::fields('u');
$ufields = user_picture::fields('u', $extrafields);
$sql = "SELECT DISTINCT $ufields
FROM {user} u
JOIN (
@@ -895,16 +897,35 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
$table = new html_table();
$headers = [get_string('name')];
foreach ($extrafields as $field) {
$headers[] = get_user_field_name($field);
}
$headers [] = get_string('attempts', 'lesson');
// Set up the table object.
if ($data->lessonscored) {
$table->head = array(get_string('name'), get_string('attempts', 'lesson'), get_string('highscore', 'lesson'));
} else {
$table->head = array(get_string('name'), get_string('attempts', 'lesson'));
$headers [] = get_string('highscore', 'lesson');
}
$table->align = array('center', 'left', 'left');
$table->wrap = array('nowrap', 'nowrap', 'nowrap');
$colcount = count($headers);
$table->head = $headers;
$table->align = [];
$table->align = array_pad($table->align, $colcount, 'center');
$table->align[$colcount - 1] = 'left';
if ($data->lessonscored) {
$table->align[$colcount - 2] = 'left';
}
$table->wrap = [];
$table->wrap = array_pad($table->wrap, $colcount, 'nowrap');
$table->attributes['class'] = 'standardtable generaltable';
$table->size = array(null, '70%', null);
// print out the $studentdata array
// going through each student that has attempted the lesson, so, each student should have something to be displayed
@@ -991,14 +1012,21 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
}
// get line breaks in after each attempt
$attempts = implode("<br />\n", $attempts);
$row = [$studentname];
foreach ($extrafields as $field) {
$row[] = $student->$field;
}
$row[] = $attempts;
if ($data->lessonscored) {
// Add the grade if the lesson is graded.
$table->data[] = array($studentname, $attempts, $bestgrade . "%");
} else {
// This lesson does not have a grade.
$table->data[] = array($studentname, $attempts);
$row[] = $bestgrade."%";
}
$table->data[] = $row;
// Add the student data.
$dataforstudent->id = $student->id;
$dataforstudent->fullname = $studentname;