moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-83850-master' of https://github.com/danghieu1407/moodle

Browse source
This commit is contained in:
Huong Nguyen 2025-01-22 10:31:41 +07:00
commit 1414b38e0f
No known key found for this signature in database
GPG key ID: 40D88AB693A3E72A
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
report/progress/index.php
View file

@ -314,14 +314,10 @@ foreach($activities as $activity) {
$datepassed = $activity->completionexpected && $activity->completionexpected <= time(); $datepassed = $activity->completionexpected && $activity->completionexpected <= time();
$datepassedclass = $datepassed ? 'completion-expired' : ''; $datepassedclass = $datepassed ? 'completion-expired' : '';
if ($activity->completionexpected) { if ($activity->completionexpected && !$csv) {
if ($csv) { $datetext = userdate($activity->completionexpected, get_string('strftimedate', 'langconfig'));
$datetext = userdate($activity->completionexpected, "%F %T");
} else {
$datetext = userdate($activity->completionexpected, get_string('strftimedate', 'langconfig'));
}
} else { } else {
$datetext=''; $datetext = get_string('completed');
} }
// Some names (labels) come URL-encoded and can be very long, so shorten them // Some names (labels) come URL-encoded and can be very long, so shorten them