MDL-60938 mod_choice: Fix rendering of users for choice results

This commit is contained in:
Jun Pataleta 2017-12-15 12:07:57 +13:00
parent 95b7be7f05
commit af6c39045e

View file

@ -222,32 +222,30 @@ class mod_choice_renderer extends plugin_renderer_base {
$optionusers = ''; $optionusers = '';
foreach ($options->user as $user) { foreach ($options->user as $user) {
$data = ''; $data = '';
if (empty($user->imagealt)){ if (empty($user->imagealt)) {
$user->imagealt = ''; $user->imagealt = '';
} }
$userfullname = fullname($user, $choices->fullnamecapability); $userfullname = fullname($user, $choices->fullnamecapability);
$mediabody = ''; $checkbox = '';
if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) { if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) {
$checkboxid = 'attempt-user'.$user->id.'-option'.$optionid; $checkboxid = 'attempt-user' . $user->id . '-option' . $optionid;
$attemptaction = html_writer::label($userfullname . ' ' . $optionsnames[$optionid], $checkbox .= html_writer::label($userfullname . ' ' . $optionsnames[$optionid],
$checkboxid, false, array('class' => 'accesshide')); $checkboxid, false, array('class' => 'accesshide'));
if ($optionid > 0) { if ($optionid > 0) {
$attemptaction .= html_writer::checkbox('attemptid[]', $user->answerid, '', null, $checkboxname = 'attemptid[]';
array('id' => $checkboxid)); $checkboxvalue = $user->answerid;
} else { } else {
$attemptaction .= html_writer::checkbox('userid[]', $user->id, '', null, $checkboxname = 'userid[]';
array('id' => $checkboxid)); $checkboxvalue = $user->id;
} }
$mediabody .= html_writer::tag('div', $attemptaction, array('class'=>'media-left media-middle p-t-1')); $checkbox .= html_writer::checkbox($checkboxname, $checkboxvalue, '', null,
array('id' => $checkboxid, 'class' => 'm-r-1'));
} }
$userimage = $this->output->user_picture($user, array('courseid' => $choices->courseid)); $userimage = $this->output->user_picture($user, array('courseid' => $choices->courseid, 'link' => false));
$mediabody .= html_writer::tag('div', $userimage, array('class' => 'media-left media-middle')); $profileurl = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $choices->courseid));
$profilelink = html_writer::link($profileurl, $userimage . $userfullname);
$userlink = new moodle_url('/user/view.php', array('id'=>$user->id,'course' => $choices->courseid)); $data .= html_writer::div($checkbox . $profilelink, 'm-b-1');
$name = html_writer::tag('a', $userfullname, array('href' => $userlink));
$mediabody .= html_writer::tag('div', $name, array('class' => 'media-body media-middle'));
$data .= html_writer::tag('div', $mediabody, array('class' => 'media m-b-1'));
$optionusers .= $data; $optionusers .= $data;
} }