From d2a563e79bd90a39ecdd32073e9529f75bb157b4 Mon Sep 17 00:00:00 2001 From: Leon Stringer Date: Fri, 21 Jul 2023 15:03:48 +0100 Subject: [PATCH] MDL-45452 report_completion: Excel date format When using either of the CSV download links (spreadsheet format or Excel- compatible format) use an Excel-compatible format for date/times. Co-Authored-By: Ray Morris --- report/completion/index.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/report/completion/index.php b/report/completion/index.php index d114d809e7c..272f0f9a999 100644 --- a/report/completion/index.php +++ b/report/completion/index.php @@ -56,6 +56,11 @@ $PAGE->set_pagelayout('report'); $firstnamesort = ($sort == 'firstname'); $excel = ($format == 'excelcsv'); $csv = ($format == 'csv' || $excel); +if ($csv) { + $dateformat = "%F %T"; +} else { + $dateformat = get_string('strftimedatetimeshort', 'langconfig'); +} // Load CSV library if ($csv) { @@ -592,7 +597,7 @@ foreach ($progress as $user) { $state = COMPLETION_INCOMPLETE; } if ($is_complete) { - $date = userdate($criteria_completion->timecompleted, get_string('strftimedatetimeshort', 'langconfig')); + $date = userdate($criteria_completion->timecompleted, $dateformat); } else { $date = ''; } @@ -640,7 +645,7 @@ foreach ($progress as $user) { $a->state = $describe; if ($is_complete) { - $a->date = userdate($criteria_completion->timecompleted, get_string('strftimedatetimeshort', 'langconfig')); + $a->date = userdate($criteria_completion->timecompleted, $dateformat); } else { $a->date = ''; } @@ -694,7 +699,7 @@ foreach ($progress as $user) { $a = new StdClass; if ($ccompletion->is_complete()) { - $a->date = userdate($ccompletion->timecompleted, get_string('strftimedatetimeshort', 'langconfig')); + $a->date = userdate($ccompletion->timecompleted, $dateformat); } else { $a->date = ''; }