mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master-MDL-67467' of https://github.com/yao9394/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2019-12-30 09:59:20 +08:00
commit 857fabb618
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
report/progress/index.php
View File

@ -315,7 +315,11 @@ foreach($activities as $activity) {
$datepassedclass = $datepassed ? 'completion-expired' : ''; $datepassedclass = $datepassed ? 'completion-expired' : '';
if ($activity->completionexpected) { if ($activity->completionexpected) {
$datetext=userdate($activity->completionexpected,get_string('strftimedate','langconfig')); if ($csv) {
$datetext = userdate($activity->completionexpected, "%F %T");
} else {
$datetext = userdate($activity->completionexpected, get_string('strftimedate', 'langconfig'));
}
} else { } else {
$datetext=''; $datetext='';
} }
@ -415,6 +419,9 @@ foreach($progress as $user) {
$fulldescribe=get_string('progress-title','completion',$a); $fulldescribe=get_string('progress-title','completion',$a);
if ($csv) { if ($csv) {
if ($date != '') {
$date = userdate($thisprogress->timemodified, "%F %T");
}
print $sep.csv_quote($describe).$sep.csv_quote($date); print $sep.csv_quote($describe).$sep.csv_quote($date);
} else { } else {
$celltext = $OUTPUT->pix_icon('i/' . $completionicon, s($fulldescribe)); $celltext = $OUTPUT->pix_icon('i/' . $completionicon, s($fulldescribe));