Exercise: fix option 'show_exercise_attempts_in_all_user_sessions' to show results in the sessions - refs BT#21478

main/exercise/pending.php

@@ -305,7 +305,7 @@ if (empty($statusId)) {
 
 $url = api_get_path(WEB_AJAX_PATH).
     'model.ajax.php?a=get_exercise_pending_results&filter_by_user='.$filter_user.
-    '&course_id='.$courseId.'&exercise_id='.$exerciseId.'&status='.$statusId;
+    '&course_id='.$courseId.'&exercise_id='.$exerciseId.'&status='.$statusId.'&showAttemptsInSessions='.$showAttemptsInSessions;
 $action_links = '';
 
 $officialCodeInList = api_get_setting('show_official_code_exercise_result_list');

main/inc/ajax/model.ajax.php

@@ -649,6 +649,7 @@ switch ($action) {
         $courseId = $_REQUEST['course_id'] ?? 0;
         $exerciseId = $_REQUEST['exercise_id'] ?? 0;
         $status = $_REQUEST['status'] ?? 0;
+        $showAttemptsInSessions = $_REQUEST['showAttemptsInSessions'] ? true : false;
         if (isset($_GET['filter_by_user']) && !empty($_GET['filter_by_user'])) {
             $filter_user = (int) $_GET['filter_by_user'];
             if (empty($whereCondition)) {
@@ -683,7 +684,8 @@ switch ($action) {
             '',
             false,
             true,
-            $status
+            $status,
+            $showAttemptsInSessions
         );
 
         break;
@@ -1619,7 +1621,8 @@ switch ($action) {
             false,
             false,
             true,
-            $status
+            $status,
+            $showAttemptsInSessions
         );
 
         break;

main/inc/lib/course.lib.php

@@ -3196,6 +3196,7 @@ class CourseManager
             $sql = "SELECT DISTINCT (c.code),
                         c.id as real_id,
                         c.category_code AS category,
+                        c.title as title,
                         s.id as session_id,
                         s.name as session_name
                     FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." scu

main/inc/lib/exercise.lib.php

@@ -2226,7 +2226,8 @@ HOTSPOT;
         $courseCode = '',
         $showSession = false,
         $searchAllTeacherCourses = false,
-        $status = 0
+        $status = 0,
+        $showAttemptsInSessions = false
     ) {
         return self::get_exam_results_data(
             null,
@@ -2244,7 +2245,8 @@ HOTSPOT;
             false,
             false,
             $searchAllTeacherCourses,
-            $status
+            $status,
+            $showAttemptsInSessions
         );
     }
 
@@ -2531,7 +2533,8 @@ HOTSPOT;
         $roundValues = false,
         $getOnlyIds = false,
         $searchAllTeacherCourses = false,
-        $status = 0
+        $status = 0,
+        $showAttemptsInSessions = false
     ) {
         //@todo replace all this globals
         global $filter;
@@ -2573,7 +2576,7 @@ HOTSPOT;
                 return [];
             }
         } else {
-            $courses = CourseManager::get_courses_list_by_user_id(api_get_user_id(), false, false, false);
+            $courses = CourseManager::get_courses_list_by_user_id(api_get_user_id(), $showAttemptsInSessions, false, false);
 
             if (empty($courses)) {
                 return [];