diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php index b3ac86fa62..96966f3b3e 100755 --- a/main/course_progress/thematic_controller.php +++ b/main/course_progress/thematic_controller.php @@ -366,7 +366,7 @@ class ThematicController $thematic_plan_data = $thematic->get_thematic_plan_data(); // Third column - $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true); + $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true, true); $data['thematic_plan_div'] = $thematic->get_thematic_plan_array($thematic_plan_data); $data['thematic_advance_div'] = $thematic->get_thematic_advance_div($thematic_advance_data); diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php index dee18d7527..1df880b9b1 100755 --- a/main/inc/lib/thematic.lib.php +++ b/main/inc/lib/thematic.lib.php @@ -702,13 +702,15 @@ class Thematic * @param int $thematic_advance_id Thematic advance id (optional), get data by thematic advance list * @param string $course_code Course code (optional) * @param bool $force_session_id Force to have a session id + * @param bool $withLocalTime Force start_date to local time * * @return array $data */ public function get_thematic_advance_list( $thematic_advance_id = null, $course_code = null, - $force_session_id = false + $force_session_id = false, + $withLocalTime = false ) { $course_info = api_get_course_info($course_code); $tbl_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE); @@ -746,6 +748,9 @@ class Thematic // group all data group by thematic id $tmp = []; while ($row = Database::fetch_array($res, 'ASSOC')) { + if($withLocalTime == true) { + $row['start_date'] = api_get_local_time($row['start_date']); + } $tmp[] = $row['thematic_id']; if (in_array($row['thematic_id'], $tmp)) { if ($force_session_id) {