From f0ba13d41f1747d6a34f54655f17dfefd2774c49 Mon Sep 17 00:00:00 2001 From: Dave Cooper Date: Tue, 23 Sep 2014 15:05:22 +0800 Subject: [PATCH] MDL-32275 enrol: Last site access column now shows last course access Conflicts: user/index.php --- enrol/locallib.php | 17 ++++++++++++----- enrol/users.php | 4 ++-- lang/en/moodle.php | 3 +++ user/index.php | 11 ++++++++--- user/profile.php | 4 ++-- user/view.php | 2 +- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/enrol/locallib.php b/enrol/locallib.php index 6ad641f3b0d..e674823bd67 100644 --- a/enrol/locallib.php +++ b/enrol/locallib.php @@ -1099,19 +1099,26 @@ class course_enrolment_manager { */ private function prepare_user_for_display($user, $extrafields, $now) { $details = array( - 'userid' => $user->id, - 'courseid' => $this->get_course()->id, - 'picture' => new user_picture($user), - 'firstname' => fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context())), - 'lastseen' => get_string('never'), + 'userid' => $user->id, + 'courseid' => $this->get_course()->id, + 'picture' => new user_picture($user), + 'firstname' => fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context())), + 'lastseen' => get_string('never'), + 'lastcourseaccess' => get_string('never'), ); foreach ($extrafields as $field) { $details[$field] = $user->{$field}; } + // Last time user has accessed the site. if ($user->lastaccess) { $details['lastseen'] = format_time($now - $user->lastaccess); } + + // Last time user has accessed the course. + if ($user->lastseen) { + $details['lastcourseaccess'] = format_time($now - $user->lastseen); + } return $details; } diff --git a/enrol/users.php b/enrol/users.php index b82ebe4bad5..49421ef0d50 100644 --- a/enrol/users.php +++ b/enrol/users.php @@ -186,7 +186,7 @@ foreach ($extrafields as $field) { $fields = array( 'userdetails' => $userdetails, - 'lastseen' => get_string('lastaccess'), + 'lastcourseaccess' => get_string('lastcourseaccess'), 'role' => get_string('roles', 'role'), 'group' => get_string('groups', 'group'), 'enrol' => get_string('enrolmentinstances', 'enrol') @@ -196,7 +196,7 @@ $fields = array( if (!has_capability('moodle/course:viewhiddenuserfields', $context)) { $hiddenfields = array_flip(explode(',', $CFG->hiddenuserfields)); if (isset($hiddenfields['lastaccess'])) { - unset($fields['lastseen']); + unset($fields['lastcourseaccess']); } if (isset($hiddenfields['groups'])) { unset($fields['group']); diff --git a/lang/en/moodle.php b/lang/en/moodle.php index c5cee2d8929..b006dcd4bb4 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -766,6 +766,7 @@ $string['first'] = 'First'; $string['firstaccess'] = 'First access'; $string['firstname'] = 'First name'; $string['firstnamephonetic'] = 'First name - phonetic'; +$string['firstsiteaccess'] = 'First access to site'; $string['firsttime'] = 'Is this your first time here?'; $string['folder'] = 'Folder'; $string['folderclosed'] = 'Closed folder'; @@ -994,11 +995,13 @@ $string['language'] = 'Language'; $string['languagegood'] = 'This language pack is up-to-date! :-)'; $string['last'] = 'Last'; $string['lastaccess'] = 'Last access'; +$string['lastcourseaccess'] = 'Last access to course'; $string['lastedited'] = 'Last edited'; $string['lastlogin'] = 'Last login'; $string['lastmodified'] = 'Last modified'; $string['lastname'] = 'Surname'; $string['lastnamephonetic'] = 'Surname - phonetic'; +$string['lastsiteaccess'] = 'Last access to site'; $string['lastyear'] = 'Last year'; $string['latestlanguagepack'] = 'Check for latest language pack on moodle.org'; $string['layouttable'] = 'Layout table'; diff --git a/user/index.php b/user/index.php index ba65cb89587..bc33973d7fd 100644 --- a/user/index.php +++ b/user/index.php @@ -341,7 +341,12 @@ } if (!isset($hiddenfields['lastaccess'])) { $tablecolumns[] = 'lastaccess'; - $tableheaders[] = get_string('lastaccess'); + if ($course->id == SITEID) { + // Exception case for viewing participants on site home. + $tableheaders[] = get_string('lastsiteaccess'); + } else { + $tableheaders[] = get_string('lastcourseaccess'); + } } if ($bulkoperations && $mode === MODE_USERDETAILS) { @@ -354,8 +359,8 @@ $table->define_headers($tableheaders); $table->define_baseurl($baseurl->out()); - if (!isset($hiddenfields['lastaccess'])) { - $table->sortable(true, 'lastaccess', SORT_DESC); + if (!isset($hiddenfields['lastcourseaccess'])) { + $table->sortable(true, 'lastcourseaccess', SORT_DESC); } else { $table->sortable(true, 'firstname', SORT_ASC); } diff --git a/user/profile.php b/user/profile.php index c7b3be712c1..fb0f305bbe6 100644 --- a/user/profile.php +++ b/user/profile.php @@ -395,7 +395,7 @@ if (!isset($hiddenfields['firstaccess'])) { } else { $datestring = get_string("never"); } - echo html_writer::tag('dt', get_string('firstaccess')); + echo html_writer::tag('dt', get_string('firstsiteaccess')); echo html_writer::tag('dd', $datestring); } if (!isset($hiddenfields['lastaccess'])) { @@ -404,7 +404,7 @@ if (!isset($hiddenfields['lastaccess'])) { } else { $datestring = get_string("never"); } - echo html_writer::tag('dt', get_string('lastaccess')); + echo html_writer::tag('dt', get_string('lastsiteaccess')); echo html_writer::tag('dd', $datestring); } diff --git a/user/view.php b/user/view.php index c2e2bd95bcc..14e80bf5e12 100644 --- a/user/view.php +++ b/user/view.php @@ -272,7 +272,7 @@ if (!isset($hiddenfields['lastaccess'])) { } else { $datestring = get_string("never"); } - echo html_writer::tag('dt', get_string('lastaccess')); + echo html_writer::tag('dt', get_string('lastcourseaccess')); echo html_writer::tag('dd', $datestring); }