From 310522bb934ac889aa19fb5f9c49773a4200b135 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 28 Sep 2018 12:54:55 +1200 Subject: [PATCH] Add user profile image to teacher marking page. --- classes/output/mobile.php | 7 +++++-- db/mobile.php | 2 +- mobilestyles.css | 4 ++++ templates/mobile_teacher_form.mustache | 26 +++++++++++++++----------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/classes/output/mobile.php b/classes/output/mobile.php index b2c2d1f..0650093 100644 --- a/classes/output/mobile.php +++ b/classes/output/mobile.php @@ -353,7 +353,7 @@ class mobile { * @return array HTML, javascript and other data */ public static function mobile_teacher_form($args) { - global $OUTPUT, $DB, $CFG; + global $OUTPUT, $DB, $CFG, $PAGE; require_once($CFG->dirroot.'/mod/attendance/locallib.php'); @@ -405,7 +405,10 @@ class mobile { $data['users'] = array(); $users = $att->get_users($att->get_session_info($sessid)->groupid, 0); foreach ($users as $user) { - $data['users'][] = array('userid' => $user->id, 'fullname' => $user->fullname); + $userpicture = new \user_picture($user); + $userpicture->size = 1; // Size f1. + $profileimageurl = $userpicture->get_url($PAGE)->out(false); + $data['users'][] = array('userid' => $user->id, 'fullname' => $user->fullname, 'profileimageurl' => $profileimageurl); // Generate args to use in submission button here. $data['btnargs'] .= ', status'. $user->id. ': CONTENT_OTHERDATA.status'. $user->id; } diff --git a/db/mobile.php b/db/mobile.php index 25aab26..afac2dd 100644 --- a/db/mobile.php +++ b/db/mobile.php @@ -36,7 +36,7 @@ $addons = [ 'method' => 'mobile_view_activity', 'styles' => [ 'url' => '/mod/attendance/mobilestyles.css', - 'version' => 21 + 'version' => 22 ] ] ], diff --git a/mobilestyles.css b/mobilestyles.css index 4588ed1..93c150f 100644 --- a/mobilestyles.css +++ b/mobilestyles.css @@ -23,4 +23,8 @@ .attendance_mobile_user_form .messages .label, .attendance_mobile_view_page .messages .label { white-space: normal; +} + +.attendance_mobile_teacher_form .attendance_user_row { + padding-bottom: 5px; } \ No newline at end of file diff --git a/templates/mobile_teacher_form.mustache b/templates/mobile_teacher_form.mustache index d4d5c0f..635c58f 100644 --- a/templates/mobile_teacher_form.mustache +++ b/templates/mobile_teacher_form.mustache @@ -59,22 +59,26 @@ <%/messages%> <%/showmessage%> <%#users%> - - -

<% fullname %>

-
-
- - - <%#statuses%> - + + + + + + +

<% fullname %>

+ +
+ + <%#statuses%> + <% acronym %> - <%/statuses%> - + <%/statuses%> +
+ <%/users%>