Reports: Add LP progress report per session / course see BT#17613

main/inc/ajax/myspace.ajax.php

@@ -2,10 +2,13 @@
 
 /* For licensing terms, see /license.txt */
 
+use ChamiloSession as Session;
+
 /**
  * Responses to AJAX calls.
  */
 require_once __DIR__.'/../global.inc.php';
+
 $action = $_GET['a'];
 
 // Access restrictions.
@@ -17,9 +20,78 @@ if (!$is_allowedToTrack) {
 }
 
 switch ($action) {
-    // At this date : 23/02/2017, a minor review can't determine where is used this case 'access_detail'
+    case 'lp_global_report':
+        $userId = (int) $_REQUEST['user_id'];
+        if (empty($userId)) {
+            exit;
+        }
+
+        $cacheAvailable = api_get_configuration_value('apc');
+        $table = null;
+        $variable = 'lp_global_report_'.$userId;
+        if ($cacheAvailable) {
+            if (apcu_exists($variable)) {
+                $table = apcu_fetch($variable);
+            }
+        }
+
+        if (!empty($table)) {
+            echo $table;
+            exit;
+        }
+
+        $sessionCategoryList = UserManager::get_sessions_by_category($userId, false);
+        $total = 0;
+        $totalAverage = 0;
+        $table = new HTML_Table(['class' => 'data_table']);
+        $row = 0;
+        $col = 0;
+        foreach ($sessionCategoryList as $category) {
+            $sessionList = $category['sessions'];
+            foreach ($sessionList as $session) {
+                $courses = $session['courses'];
+                $sessionId = $session['session_id'];
+                $session['session_name'];
+                $totalCourse = 0;
+                $totalSessionAverage = 0;
+                foreach ($courses as &$course) {
+                    $average = Tracking::get_avg_student_progress($userId, $course['course_code'], [], $sessionId);
+                    $course['average'] = $average;
+                    $totalSessionAverage += $average;
+                    $totalAverage += $average;
+                    $total++;
+                    $totalCourse++;
+                    $total++;
+                }
+
+                $row++;
+                $table->setCellContents($row, 0, $session['session_name']);
+                $table->setCellContents($row, 1, round($totalSessionAverage/count($courses), 2));
+                $table->setCellContents($row, 2, '');
+                $row++;
+                foreach ($courses as &$course) {
+                    $table->setCellContents($row, 0, $session['session_name'].'-'.count($courses));
+                    $table->setCellContents($row, 1, $course['title']);
+                    $table->setCellContents($row, 2, $course['average']);
+                    $row++;
+                }
+            }
+        }
+
+        $table->setCellContents(0, 0, get_lang('Global'));
+        $table->setCellContents(0, 1, round($totalAverage/$total, 2));
+        $result = $table->toHtml();
+
+        if ($cacheAvailable) {
+            apcu_store($variable, $result, 60);
+        }
+
+        echo $result;
+
+        break;
     case 'access_detail':
-        $user_id = intval($_REQUEST['student']);
+        // At this date : 23/02/2017, a minor review can't determine where is used this case 'access_detail'.
+        $user_id = (int) $_REQUEST['student'];
         $course_code = Security::remove_XSS($_REQUEST['course']);
         $type = Security::remove_XSS($_REQUEST['type']);
         $range = Security::remove_XSS($_REQUEST['range']);

main/inc/lib/course.lib.php

@@ -6106,7 +6106,7 @@ class CourseManager
     public static function getCourseUsers($filterByActive = null)
     {
         // This would return only the users from real courses:
-        $userList = self::get_user_list_from_course_code(
+        return self::get_user_list_from_course_code(
             api_get_course_id(),
             api_get_session_id(),
             null,
@@ -6120,8 +6120,6 @@ class CourseManager
             [],
             $filterByActive
         );
-
-        return $userList;
     }
 
     /**
@@ -6175,7 +6173,7 @@ class CourseManager
             'users',
             get_lang('Users'),
             $result,
-            ['select_all_checkbox' => true]
+            ['select_all_checkbox' => true, 'id' => 'users']
         );
     }
 

main/inc/lib/tracking.lib.php

@@ -2557,7 +2557,7 @@ class Tracking
      *                                   [sum_of_progresses, number] if it is set to true
      * @param bool      $onlySeriousGame Optional. Limit average to lp on seriousgame mode
      *
-     * @return float Average progress of the user in this course
+     * @return float Average progress of the user in this course from 0 to 100
      */
     public static function get_avg_student_progress(
         $studentId,

main/inc/lib/usermanager.lib.php

@@ -3471,10 +3471,7 @@ class UserManager
             $coachList = SessionManager::getCoachesBySession($session_id);
             $categoryStart = $row['session_category_date_start'] ? $row['session_category_date_start']->format('Y-m-d') : '';
             $categoryEnd = $row['session_category_date_end'] ? $row['session_category_date_end']->format('Y-m-d') : '';
-            $courseList = self::get_courses_list_by_session(
+            $courseList = self::get_courses_list_by_session($user_id, $session_id);
-                $user_id,
-                $session_id
-            );
             $daysLeft = SessionManager::getDayLeftInSession($row, $user_id);
 
             // User portal filters:
@@ -3856,6 +3853,7 @@ class UserManager
         session_rel_course_user table if there are courses registered
         to our user or not */
         $sql = "SELECT DISTINCT
+                    c.title,
                     c.visibility,
                     c.id as real_id,
                     c.code as course_code,
@@ -3893,6 +3891,7 @@ class UserManager
 
         if (api_is_allowed_to_create_course()) {
             $sql = "SELECT DISTINCT
+                        c.title,
                         c.visibility,
                         c.id as real_id,
                         c.code as course_code,