Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/auth/courses_controller.php

@@ -914,8 +914,10 @@ class CoursesController
                 $catName = $cat->getName();
             }
 
-            $coachId = $session->getGeneralCoach()->getId();
-            $coachName = $session->getGeneralCoach()->getCompleteName();
+            $generalCoach = $session->getGeneralCoach();
+            $coachId = $generalCoach ? $generalCoach->getId() : 0;
+            $coachName = $generalCoach ? $session->getGeneralCoach()->getCompleteName() : '';
+
             $actions = null;
             if (api_is_platform_admin()) {
                 $actions = api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$session->getId();
@@ -931,7 +933,9 @@ class CoursesController
                 'nbr_courses' => $session->getNbrCourses(),
                 'nbr_users' => $session->getNbrUsers(),
                 'coach_id' => $coachId,
-                'coach_url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId,
+                'coach_url' => $generalCoach
+                    ? api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId
+                    : '',
                 'coach_name' => $coachName,
                 'coach_avatar' => UserManager::getUserPicture(
                     $coachId,

main/inc/lib/api.lib.php

@@ -1631,7 +1631,12 @@ function api_get_user_info(
         $userFromSession = Session::read('_user');
 
         if (isset($userFromSession)) {
-            if ($cacheAvailable === true) {
+            if ($cacheAvailable === true &&
+                (
+                    empty($userFromSession['is_anonymous']) &&
+                    (isset($userFromSession['status']) && $userFromSession['status'] != ANONYMOUS)
+                )
+            ) {
                 $apcVar = api_get_configuration_value('apc_prefix').'userinfo_'.$userFromSession['user_id'];
                 if (apcu_exists($apcVar)) {
                     if ($updateCache) {

main/inc/lib/tracking.lib.php

@@ -7497,6 +7497,7 @@ class TrackingCourseLog
 
         if (!in_array($direction, ['ASC', 'DESC'])) {
             $direction = 'ASC';
+            var_dump($direction);
         }
 
         $column = intval($column);

main/template/default/auth/session_catalog.tpl

@@ -100,7 +100,7 @@
                                     	</a>
                                 	</h4>
                             	</div>
-                            	{% if show_tutor %}
+                            	{% if show_tutor and item.coach_id %}
                             	<div class="block-author">
                                 	<div class="author-card">
                                     	<a href="{{ item.coach_url }}" class="ajax" data-title="{{ item.coach_name }}">

main/template/default/session/about.tpl

@@ -14,7 +14,7 @@
                 <div class="row">
                     <div class="col-md-8">
                         <h2 class="session-title">{{ session.name }}</h2>
-                        {% if show_tutor %}
+                        {% if show_tutor and session.generalCoach %}
                             <div class="session-tutor">
                                 <em class="fa fa-user"></em> {{ 'SessionGeneralCoach'|get_lang }}:
                                 <em>{{ session.generalCoach.getCompleteName() }}</em>

main/tracking/courseLog.php

@@ -331,10 +331,13 @@ if ($showReporting) {
         $html .= '</ul>';
     }
 }
+//Load Orden
+$trackingColumn = isset($_GET['users_tracking_column']) ? $_GET['users_tracking_column'] : null;
+$trackingDirection = isset($_GET['users_tracking_direction']) ? $_GET['users_tracking_direction'] : null;
 
 // Show the charts part only if there are students subscribed to this course/session
 if ($nbStudents > 0) {
-    $usersTracking = TrackingCourseLog::get_user_data(null, $nbStudents, null, 'DESC', false);
+    $usersTracking = TrackingCourseLog::get_user_data(null, $nbStudents, $trackingColumn, $trackingDirection, false);
     $numberStudentsCompletedLP = 0;
     $averageStudentsTestScore = 0;
     $scoresDistribution = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];