Get last acquired skill by course on session - refs BT#10372 #TMI

main/inc/lib/course.lib.php

@@ -3817,11 +3817,15 @@ class CourseManager
         $session_accessible = true,
         $load_dirs = false
     ) {
+        $entityManager = Database::getManager();
         $user_id = api_get_user_id();
         $course_info = api_get_course_info_by_id($course['real_id']);
         $status_course = CourseManager::get_user_in_course_status($user_id, $course_info['code']);
         $course_info['status'] = empty($session_id) ? $status_course : STUDENT;
         $course_info['id_session'] = $session_id;
+        $objUser = $entityManager->find('ChamiloUserBundle:User', $user_id);
+        $objCourse = $entityManager->find('ChamiloCoreBundle:Course', $course['real_id']);
+        $objSession = $entityManager->find('ChamiloCoreBundle:Session', $session_id);
 
         /*$date_start = $sess[$course_info['id_session']]['access_start_date'];
         $date_end = $sess[$course_info['id_session']]['access_end_date'];*/
@@ -4019,9 +4023,23 @@ class CourseManager
                 'active' => $active,
                 'session_category_id' => $session_category_id
             );
+
+            if (api_get_setting('allow_skills_tool') === 'true') {
+                $skill = $entityManager
+                    ->getRepository('ChamiloCoreBundle:Skill')
+                    ->getLastByUser($objUser, $objCourse, $objSession);
+
+                $output['skill'] = null;
+
+                if ($skill) {
+                    $output['skill']['name'] = $skill->getName();
+                    $output['skill']['icon'] = $skill->getIcon();
+                }
+            }
         } else {
             $output = array($course_info['user_course_cat'], $html);
         }
+        var_dump($output);
         return $output;
     }
 

main/inc/lib/userportal.lib.php

@@ -1181,7 +1181,7 @@ class IndexManager
                             $this->tpl->assign('gamification_mode', $gamificationModeIsActive);
 
                             $sessions_with_no_category .= $this->tpl->fetch(
-                                "{$this->tpl->templateFolder}/user_portal/session.tpl"
+                                $this->tpl->get_template('/user_portal/session.tpl')
                             );
 
                             $sessionCount++;
@@ -1281,7 +1281,7 @@ class IndexManager
 
                                 $this->tpl->assign('session', $sessionParams);
                                 $html_sessions .= $this->tpl->fetch(
-                                    "{$this->tpl->templateFolder}/user_portal/session.tpl"
+                                    $this->tpl->get_template('user_portal/session.tpl')
                                 );
 
                                 $sessionCount++;