L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-74183-311' of https://github.com/ericmerrill/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2022-03-21 12:41:17 +01:00
parent 0b463d4203 109bac00c8
commit a15d2100b4
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/task/completion_daily_task.php
+33 -3
View File
@@ -121,10 +121,40 @@ class completion_daily_task extends scheduled_task {
if ($prev->completionid) {
$completion->id = $prev->completionid;
}
$completion->mark_enrolled();
if (debugging()) {
mtrace('Marked started user ' . $prev->userid . ' in course ' . $prev->course);
try {
$completion->mark_enrolled();
if (debugging()) {
mtrace('Marked started user '.$prev->userid.' in course '.$prev->course);
}
} catch (\dml_write_exception $e) {
// Most likely this happened because the completion object was created while we were working.
// So get the record and make sure it has a time enrolled set.
if (debugging()) {
mtrace('Exception while marking started user '.$prev->userid.' in course '.$prev->course.', retrying');
}
$params = ['userid' => $completion->userid, 'course' => $completion->course];
$existing = new \completion_completion($params);
if (!empty($existing->id) && empty($existing->timeenrolled)) {
$existing->timeenrolled = $completion->timeenrolled;
try {
$existing->mark_enrolled();
} catch (\Exception $e) {
// Catch everything, so we can continue on to other records.
if (debugging()) {
mtrace('Exception again while marking started user '.$prev->userid.' in course '.$prev->course.
': '.$e->getMessage()."\n".$e->getTraceAsString());
}
}
}
} catch (\Exception $e) {
// Catch anything else, so we can continue on to other records.
if (debugging()) {
mtrace('Exception while marking started user '.$prev->userid.' in course '.$prev->course.
': '.$e->getMessage()."\n".$e->getTraceAsString());
}
}
} else if ($prev && $current) {
// Else, if this record is for the same user/course use oldest timeenrolled.