Tracking: Show progress based on visibles LPs only - refs BT#22396

Author: NicoDucou

main/inc/lib/tracking.lib.php

@@ -3761,6 +3761,9 @@ public static function get_avg_student_progress(
                     null,
                     false,
                     null,
+                    true,
+                    false,
+                    true,
                     true
                 );
                 $lpList = $lpList->get_flat_list();

main/lp/learnpathList.class.php

@@ -45,7 +45,8 @@ public function __construct(
         $categoryId = null,
         $ignoreCategoryFilter = false,
         $ignoreLpVisibility = false,
-        bool $includeSubscribedLp = true
+        bool $includeSubscribedLp = true,
+        bool $showOnlyVisibleToStudent = false
     ) {
         if (empty($courseInfo)) {
             $courseInfo = api_get_course_info();
@@ -164,7 +165,7 @@ public function __construct(
 
             // If option is not true then don't show invisible LP to user
             if ($ignoreLpVisibility === false) {
-                if ($showBlockedPrerequisite !== true && !$isAllowToEdit) {
+                if ($showBlockedPrerequisite !== true && (!$isAllowToEdit || $showOnlyVisibleToStudent)) {
                     $lpVisibility = learnpath::is_lp_visible_for_student(
                         $row->getId(),
                         $user_id,

main/mySpace/myStudents.php

@@ -1274,7 +1274,7 @@
         echo '<tr>
             <th>'.get_lang('Course').'</th>
             <th>'.get_lang('Time').'</th>
-            <th>'.get_lang('Progress').'</th>
+            <th>'.get_lang('Progress').' (*)</th>
             <th>'.get_lang('Score').'</th>
             <th>'.get_lang('AttendancesFaults').'</th>
             <th>'.get_lang('Evaluations').'</th>
@@ -1589,6 +1589,7 @@
         Session::write('export_course_list', $exportCourseList);
         echo '</tbody>';
         echo '</table>';
+        echo '<p>(*) ' . get_lang('progressBasedOnVisiblesLPsInEachCourse') . '</p>';
         echo '</div>';
     }
 } else {

main/tracking/courseLog.php

@@ -696,7 +696,7 @@ function loadGraphs () {
     $courseProgressHeadTitle = ($lpShowMaxProgress ? get_lang('ScormAndLPMaxProgress') : get_lang('ScormAndLPProgressTotalAverage'));
     $table->set_header(
         $headerCounter++,
-        get_lang('CourseProgress').' '.
+        get_lang('CourseProgress').'  (*)  '.
         Display::return_icon('info3.gif', $courseProgressHeadTitle, [], ICON_SIZE_TINY),
         false
     );
@@ -831,6 +831,24 @@ function loadGraphs () {
 
     $html .= '<div id="reporting_table">';
     $html .= $table->return_table();
+    $userIdList = Session::read('user_id_list');
+    if (isset($userIdList[0])) {
+        $lpList = new LearnpathList(
+            $studentId,
+            $courseInfo,
+            $sessionId,
+            null,
+            false,
+            null,
+            true,
+            false,
+            true,
+            true
+        );
+        $lpList = $lpList->get_flat_list();
+        $NbVisibleLps = count($lpList);
+        $html .= '<p>(*) ' . sprintf(get_lang('progressBasedOnXVisiblesLPs'), $NbVisibleLps);
+    }
     $html .= '</div>';
 } else {
     $html .= Display::return_message(get_lang('NoUsersInCourse'), 'warning');