Show skill info in skill wheel - refs BT#9583 #7385

main/inc/ajax/skill.ajax.php

@@ -119,27 +119,19 @@ switch ($action) {
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
         $skill_info = $skill->get_skill_info($id);
         $courses = $skill->get_courses_by_skill($id);
+        $sessions = $skill->getSessionsBySkill($id);
+
         $html = '';
-        if (!empty($courses)) {
+
-            $html = sprintf(
+        if (!empty($courses) || !empty($sessions)) {
-                get_lang('ToGetToLearnXYouWillNeedToTakeOneOfTheFollowingCourses'),
+            Display::display_no_header();
-                '<i>'.$skill_info['name'].'</i>'
+            Display::$global_template->assign('skill', $skill_info);
-            ).'<br />';
+            Display::$global_template->assign('courses', $courses);
-            foreach ($courses as $course) {
+            Display::$global_template->assign('sessions', $sessions);
-                $url = '#';
+
-                $attributes = array('class' => 'course_description_popup', 'rel' => $course['code']);
+            $html = Display::$global_template->fetch('default/skill/skill_info.tpl');
-                $html .=
-                    Display::url(
-                        sprintf(
-                            get_lang('SkillXWithCourseX'),
-                            $skill_info['name'],
-                            $course['title']
-                        ),
-                        $url,
-                        $attributes
-                    ).'<br />';
-            }
         }
+
         echo $html;
         break;
     case 'get_skills_tree_json':

main/inc/lib/skill.lib.php

@@ -531,6 +531,7 @@ class Skill extends Model
         $this->table_course = Database::get_main_table(TABLE_MAIN_COURSE);
         $this->table_skill_rel_skill = Database::get_main_table(TABLE_MAIN_SKILL_REL_SKILL);
         $this->table_gradebook = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
+        $this->sessionTable = Database::get_main_table(TABLE_MAIN_SESSION);
     }
 
     /**
@@ -1201,7 +1202,8 @@ class Skill extends Model
                 ON g.id = sg.gradebook_id
                 INNER JOIN {$this->table_course} c
                 ON c.code = g.course_code
-                WHERE sg.skill_id = $skill_id";
+                WHERE sg.skill_id = $skill_id
+                AND (g.session_id IS NULL OR g.session_id = 0)";
         $result   = Database::query($sql);
 
         return Database::store_result($result, 'ASSOC');
@@ -1371,4 +1373,26 @@ class Skill extends Model
 
         return $list;
     }
+
+    /**
+     * Get the session list where the user can achieve a skill
+     * @param int $skillId The skill id
+     * @return array
+     */
+    public function getSessionsBySkill($skillId)
+    {
+        $skillId = intval($skillId);
+
+        $sql = "SELECT s.id, s.name
+                FROM {$this->table_gradebook} g
+                INNER JOIN {$this->table_skill_rel_gradebook} sg ON g.id = sg.gradebook_id
+                INNER JOIN {$this->sessionTable} s ON g.session_id = s.id
+                WHERE sg.skill_id = $skillId
+                AND g.session_id > 0";
+
+        $result   = Database::query($sql);
+
+        return Database::store_result($result, 'ASSOC');
+    }
+
 }

main/template/default/skill/skill_info.tpl

@@ -0,0 +1,15 @@
+<p>{{ "ToGetToLearnXYouWillNeedToTakeOneOfTheFollowingCourses" | get_lang | format( "<em>" ~ skill.name ~ "</em>") }}</p>
+
+<ul>
+    {% for course in courses %}
+        <li>
+            <a href="#" class="course_description_popup" rel="{{ course.code }}">{{ "SkillXWithCourseX" | get_lang | format(skill.name, course.title) }}</a>
+        </li>
+    {% endfor %}
+
+    {% for session in sessions %}
+        <li>
+            {{ "SkillXWithCourseX" | get_lang | format(skill.name, session.name) }}
+        </li>
+    {% endfor %}
+</ul>

main/template/default/skill/skill_wheel_student.tpl

@@ -92,7 +92,7 @@ $(document).ready(function() {
     });
 
     /* When clicking in a course title */
-    $("#skill_info").on("click", "a.course_description_popup", function(e) {
+    $("#skill_info").on("click", "a.course_description_popup[rel]", function(e) {
         e.preventDefault();
 
         var getCourseInfo = $.ajax(