From deb6f27702f16012ecf9042a4c2ccaa0d723a46a Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 5 Oct 2012 10:40:18 +0200 Subject: [PATCH] Fixing course progress date --- main/course_progress/thematic_controller.php | 3 +-- main/inc/lib/thematic.lib.php | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php index 375881bd03..a5c292046b 100644 --- a/main/course_progress/thematic_controller.php +++ b/main/course_progress/thematic_controller.php @@ -180,8 +180,7 @@ class ThematicController { $advance_html = null; if (!empty($data)) { foreach ($data as $advance) { - //DATE_TIME_FORMAT_LONG - $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_ONLY_DAYNAME) . ' ('.$advance['duration'].' '.get_lang('HourShort').')
'.$advance['content'].'
'; + $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG) . ' ('.$advance['duration'].' '.get_lang('HourShort').')
'.$advance['content'].'
'; } } $table[] = array($theme['title'], $plan_html, $advance_html); diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php index 40068947fb..56c624d592 100644 --- a/main/inc/lib/thematic.lib.php +++ b/main/inc/lib/thematic.lib.php @@ -479,7 +479,7 @@ class Thematic } } //DATE_TIME_FORMAT_LONG - $thematic_advance_item = '
'.api_convert_and_format_date($thematic_advance['start_date'], DATE_FORMAT_ONLY_DAYNAME).$session_star.'
'; + $thematic_advance_item = '
'.api_convert_and_format_date($thematic_advance['start_date'], DATE_FORMAT_LONG).$session_star.'
'; // $thematic_advance_item .= '
'.get_lang('DurationInHours').' : '.$thematic_advance['duration'].'
'; $thematic_advance_item .= '
'.$thematic_advance['duration'].' '.get_lang('HourShort').'
'; $thematic_advance_item .= '
'.Security::remove_XSS($thematic_advance['content'], STUDENT).'
'; @@ -743,10 +743,8 @@ class Thematic $data[] = $row; } } - } - - } - + } + } return $data; }