Merge pull request #3401 from carlangas159/chamilo-lms-3008

Course Progress: Incorrect time in Thematic Advance - see #3008

Author: ywarnier

main/course_progress/index.php

@@ -114,6 +114,11 @@
 </script>';
 
 $htmlHeadXtra[] = '<script>
+$(function() {
+    if ($("#div_result").html() !== undefined && $("#div_result").html().length == 0) {
+        $("#div_result").html("0");
+    }
+})
 function datetime_by_attendance(attendance_id, thematic_advance_id) {
 	$.ajax({
 		contentType: "application/x-www-form-urlencoded",
@@ -248,13 +253,13 @@ function check_per_custom_date(obj) {
             $(function () {
                 $('.btn-delete').on('click', function (e) {
                     e.preventDefault();
-                    
+
                     var id = $(this).data('id') || 0;
-                    
+
                     if (!id) {
                         return;
                     }
-                    
+
                     //$('[name=\"title[' + id + ']\"]').val('');
                     CKEDITOR.instances['description[' + id + ']'].setData('');
                 });

main/inc/introductionSection.inc.php

@@ -210,11 +210,20 @@
         $thematic_advance = get_lang('CourseThematicAdvance');
         $thematicScore = $thematic->get_total_average_of_thematic_advances().'%';
         $thematicUrl = api_get_path(WEB_CODE_PATH).'course_progress/index.php?action=thematic_details&'.api_get_cidreq();
+
+        $thematic_advance_info['thematic_id'] = isset($thematic_advance_info['thematic_id']) ? $thematic_advance_info['thematic_id'] : 0;
+        $thematic_advance_info['start_date'] = isset($thematic_advance_info['start_date']) ? $thematic_advance_info['start_date'] : null;
+        $thematic_advance_info['content'] = isset($thematic_advance_info['content']) ? $thematic_advance_info['content'] : '';
+        $thematic_advance_info['duration'] = isset($thematic_advance_info['duration']) ? $thematic_advance_info['duration'] : 0;
+
         $thematic_info = $thematic->get_thematic_list($thematic_advance_info['thematic_id']);
+        $thematic_info['title'] = isset($thematic_info['title']) ? $thematic_info['title'] : '';
 
+        /*
         $thematic_advance_info['start_date'] = api_get_local_time(
             $thematic_advance_info['start_date']
         );
+        */
         $thematic_advance_info['start_date'] = api_format_date(
             $thematic_advance_info['start_date'],
             DATE_TIME_FORMAT_LONG