mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity

MDL-66298 forumreport_summary: Display full names consistently

Browse Source 
Part of MDL-66076. Display full names and profile links consistent
with other areas of Moodle.
This commit is contained in:
Shamim Rezaie 2019-09-06 04:17:10 +10:00 committed by Jun Pataleta
parent 9eebd58aa2
commit 806d634359
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/forum/report/summary/classes/summary_table.php
View File

@ -160,9 +160,9 @@ class summary_table extends table_sql {
* @return string User's full name.
*/
public function col_fullname($data): string {
$fullname = $data->firstname . ' ' . $data->lastname;
global $OUTPUT;
return $fullname;
return $OUTPUT->user_picture($data, array('size' => 35, 'courseid' => $this->cm->course, 'includefullname' => true));
}
/**
@ -377,18 +377,20 @@ class summary_table extends table_sql {
protected function define_base_sql(): void {
$this->sql = new \stdClass();
$userfields = get_extra_user_fields($this->context);
$userfieldssql = \user_picture::fields('u', $userfields);
// Define base SQL query format.
// Ignores private replies as they are not visible to all participants.
$this->sql->basefields = ' ue.userid AS userid,
e.courseid AS courseid,
f.id as forumid,
SUM(CASE WHEN p.parent = 0 THEN 1 ELSE 0 END) AS postcount,
SUM(CASE WHEN p.parent != 0 THEN 1 ELSE 0 END) AS replycount,
u.firstname,
u.lastname,
SUM(CASE WHEN att.attcount IS NULL THEN 0 ELSE att.attcount END) AS attachmentcount,
MIN(p.created) AS earliestpost,
MAX(p.created) AS latestpost';
e.courseid AS courseid,
f.id as forumid,
SUM(CASE WHEN p.parent = 0 THEN 1 ELSE 0 END) AS postcount,
SUM(CASE WHEN p.parent != 0 THEN 1 ELSE 0 END) AS replycount,
' . $userfieldssql . ',
SUM(CASE WHEN att.attcount IS NULL THEN 0 ELSE att.attcount END) AS attachmentcount,
MIN(p.created) AS earliestpost,
MAX(p.created) AS latestpost';
$this->sql->basefromjoins = ' {enrol} e
JOIN {user_enrolments} ue ON ue.enrolid = e.id
@ -409,7 +411,7 @@ class summary_table extends table_sql {
$this->sql->basewhere = 'e.courseid = :courseid';
$this->sql->basegroupby = 'ue.userid, e.courseid, f.id, u.firstname, u.lastname';
$this->sql->basegroupby = 'ue.userid, e.courseid, f.id, u.id';
if ($this->logreader) {
$this->fill_log_summary_temp_table($this->context->id);