diff --git a/local/mylearningservice/externallib.php b/local/mylearningservice/externallib.php index cc05874b14e..be709637ae1 100644 --- a/local/mylearningservice/externallib.php +++ b/local/mylearningservice/externallib.php @@ -62,9 +62,15 @@ function($favourite) { } $enrolrecords = $DB->get_records_sql(" - SELECT ue.timestart,ue.timeend + SELECT ue.timestart, cc.timecompleted ,ula.timeaccess FROM {user_enrolments} ue JOIN {enrol} e ON ue.enrolid = e.id + LEFT JOIN {course_completions} cc + ON cc.userid = ue.userid + AND cc.course = e.courseid + LEFT JOIN {user_lastaccess} ula + ON ula.userid = ue.userid + AND ula.courseid = e.courseid WHERE ue.userid = :userid AND e.courseid = :courseid ORDER BY ue.timestart DESC ", [ @@ -77,7 +83,8 @@ function($favourite) { if (!empty($enrolrecords)) { $firstrecord = reset($enrolrecords); // Gets first item $enroltime = (int)$firstrecord->timestart; - $enrolendtime=(int)$firstrecord->timeend; + $enrolendtime=(int)$firstrecord->timecompleted; + $lastaccessdate =(int)$firstrecord->timeaccess; } if(!empty($months)) { @@ -220,7 +227,8 @@ function($favourite) { 'timemodified' => $course->timemodified, 'certificateenabled'=>$hascertificate, 'totalactivities' => $totalactivities, - 'completedactivities'=>$completedactivities + 'completedactivities'=>$completedactivities, + 'lastaccessdate'=>$lastaccessdate ]; if ($returnusercount) { @@ -286,6 +294,7 @@ public static function get_recent_courses_returns() { 'certificateenabled' => new external_value(PARAM_BOOL, 'Whether the course has certificate.', VALUE_OPTIONAL), 'totalactivities' => new external_value(PARAM_INT, 'total activities', VALUE_OPTIONAL), 'completedactivities' => new external_value(PARAM_INT, 'completed activities count', VALUE_OPTIONAL), + 'lastaccessdate' => new external_value(PARAM_INT, 'Timestamp when the user access the course last', VALUE_OPTIONAL), ) ) ); diff --git a/local/mylearningservice/version.php b/local/mylearningservice/version.php index b5f971bd933..007a62b5e8c 100644 --- a/local/mylearningservice/version.php +++ b/local/mylearningservice/version.php @@ -2,7 +2,7 @@ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'local_mylearningservice'; -$plugin->version = 2025073105; +$plugin->version = 2025073106; $plugin->requires = 2024100290; $plugin->maturity = MATURITY_STABLE; $plugin->release = '1.0';