diff --git a/main/newscorm/lp_report.php b/main/newscorm/lp_report.php index f54cc625cf..cc25321d74 100644 --- a/main/newscorm/lp_report.php +++ b/main/newscorm/lp_report.php @@ -4,7 +4,8 @@ /** * Report from students for learning path */ -require_once '../inc/global.inc.php'; + +require_once __DIR__.'/../inc/global.inc.php'; $isAllowedToEdit = api_is_allowed_to_edit(null, true); @@ -55,6 +56,7 @@ $lpInfo = Database::select( ); $userList = []; +$showEmail = api_get_setting('show_email_addresses'); if (!empty($users)) { foreach ($users as $user) { @@ -96,6 +98,7 @@ if (!empty($users)) { 'id' => $user['user_id'], 'first_name' => $userInfo['firstname'], 'last_name' => $userInfo['lastname'], + 'email' => $showEmail === 'true' ? $userInfo['email'] : '', 'lp_time' => api_time_to_hms($lpTime), 'lp_score' => is_numeric($lpScore) ? "$lpScore%" : $lpScore, 'lp_progress' => "$lpProgress%", @@ -125,6 +128,7 @@ $template->assign('user_list', $userList); $template->assign('session_id', api_get_session_id()); $template->assign('course_code', api_get_course_id()); $template->assign('lp_id', $lpId); +$template->assign('show_email', $showEmail === 'true'); $layout = $template->get_template('learnpath/report.tpl'); diff --git a/main/template/default/learnpath/report.tpl b/main/template/default/learnpath/report.tpl index 4bd1a9a625..bfa07191b6 100644 --- a/main/template/default/learnpath/report.tpl +++ b/main/template/default/learnpath/report.tpl @@ -4,6 +4,9 @@ {{ 'FirstName'|get_lang }} {{ 'LastName'|get_lang }} + {% if show_email %} + {{ 'Email'|get_lang }} + {% endif %} {{ 'ScormTime'|get_lang }} {{ 'Progress'|get_lang }} {{ 'ScormScore'|get_lang }} @@ -16,12 +19,15 @@ {{ user.first_name }} {{ user.last_name }} + {% if show_email %} + {{ user.email }} + {% endif %} {{ user.lp_time }} {{ user.lp_progress }} {{ user.lp_score }} {{ user.lp_last_connection }} - + @@ -34,19 +40,16 @@ $(document).on('ready', function () { $('tr td button').on('click', function (e) { e.preventDefault(); - var self = $(this); var userId = self.data('id') || 0; var trHead = self.parents('tr'); var trDetail = trHead.next(); - if (self.is('.active')) { self.removeClass('active'); trDetail.html('').addClass('hide'); } else { self.addClass('active'); - var newTD = $('', { colspan: 7 });