Fix wrong categories in exercise report see BT#15086

main/exercise/exercise.class.php

@@ -7510,9 +7510,9 @@ class Exercise
                 INNER JOIN $TBL_QUESTIONS q
                 ON (e.question_id = q.id AND e.c_id = q.c_id)
                 INNER JOIN $categoryRelTable catRel
-                ON (catRel.question_id = e.question_id)
+                ON (catRel.question_id = e.question_id AND catRel.c_id = e.c_id)
                 INNER JOIN $categoryTable cat
-                ON (cat.id = catRel.category_id)
+                ON (cat.id = catRel.category_id AND cat.c_id = e.c_id)
                 WHERE
                   e.c_id = {$this->course_id} AND
                   e.exercice_id	= ".intval($this->id);

main/mySpace/exercise_category_report.php

@@ -35,7 +35,7 @@ $(document).ready( function() {
         var value = option.id;        
         var selectedDate = $("#start_date").datepicker({ dateFormat: \'dd,MM,yyyy\' }).val();        
         window.location.replace("'.$currentUrl.'?start_date="+selectedDate+"&course_id="+value);
-    });	
+    });
 });
 </script>';
 
@@ -94,7 +94,11 @@ if ($form->validate() && !empty($courseInfo)) {
     $exerciseId = isset($values['exercise_id']) ? $values['exercise_id'] : 0;
     $startDate = Security::remove_XSS($values['start_date']);
     $exportFilename = 'exercise_results_report_'.$exerciseId.'_'.$courseInfo['code'];
-    $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_results_report&exercise_id='.$exerciseId.'&start_date='.$startDate.'&cidReq='.$courseInfo['code'].'&export_filename='.$exportFilename;
+    $url = api_get_path(WEB_AJAX_PATH).
+        'model.ajax.php?a=get_exercise_results_report&exercise_id='.$exerciseId.
+        '&start_date='.$startDate.'&cidReq='.$courseInfo['code'].
+        '&course_id='.$courseId.
+        '&export_filename='.$exportFilename;
 
     $categoryList = TestCategory::getListOfCategoriesIDForTest($exerciseId, $courseId);
     $columns = [