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

…odle
fhuebler · Jan 22, 2025 · 1414b38 · 1414b38
2 parents 2eb108e + 4d3c859
commit 1414b38
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/report/progress/index.php b/report/progress/index.php
@@ -314,14 +314,10 @@ function csv_quote($value) {
     $datepassed = $activity->completionexpected && $activity->completionexpected <= time();
     $datepassedclass = $datepassed ? 'completion-expired' : '';
 
-    if ($activity->completionexpected) {
-        if ($csv) {
-            $datetext = userdate($activity->completionexpected, "%F %T");
-        } else {
-            $datetext = userdate($activity->completionexpected, get_string('strftimedate', 'langconfig'));
-        }
+    if ($activity->completionexpected && !$csv) {
+        $datetext = userdate($activity->completionexpected, get_string('strftimedate', 'langconfig'));
     } else {
-        $datetext='';
+        $datetext = get_string('completed');
     }
 
     // Some names (labels) come URL-encoded and can be very long, so shorten them