More fixes see #1791

main/inc/lib/skill.lib.php

@@ -340,7 +340,7 @@ class Skill extends Model {
                 $id_condition = " AND ss.parent_id = $parent_id";
             }
         }
-
+        
         $sql = "SELECT s.id, s.name, s.description, ss.parent_id, ss.relation_type 
                 FROM {$this->table} s INNER JOIN {$this->table_skill_rel_skill} ss ON (s.id = ss.skill_id) $id_condition
                 ORDER BY ss.id, ss.parent_id";
@@ -615,7 +615,7 @@ class Skill extends Model {
         } else {
             $skills = $this->get_all(false, false, null, $skill_id);
         }
-                
+   
         $original_skill = $skills;
 
         //var_dump($skills);
@@ -627,7 +627,9 @@ class Skill extends Model {
                     $skills[1] = array('id' => '1', 'name' => get_lang('Root'), 'parent_id' => '0');
                     $skill_info = $this->get_skill_info($skill_id);
                     $skills[$skill_id] = $skill_info;
-                    $skills[$skill_id]['parent_id'] =  $skill_info['extra']['parent_id'];
+                    //Uncomment code below to hide the searched skill
+                    //$skills[$skill_id]['parent_id'] =  $skill_info['extra']['parent_id'];
+                    $skills[$skill_id]['parent_id'] =  1;
                 }
             }
         }
@@ -642,8 +644,11 @@ class Skill extends Model {
         $family = array();
         
         if (!empty($skills)) {
-            foreach ($skills as &$skill) {
-                
+            foreach ($skills as &$skill) {                
+                if ($skill['parent_id'] == 0) {
+                    $skill['parent_id'] = 'root';
+                }
+/*
                 if (empty($skill_id)) {
                     if ($skill['parent_id'] == 0) {
                         $skill['parent_id'] = 'root';
@@ -653,7 +658,7 @@ class Skill extends Model {
                         $skill['parent_id'] = 'root';                    
                     }
                 }
-                
+  */              
                 //In order to paint all members of a family with the same color
                 if (empty($skill_id)) {
                     if ($skill['parent_id'] == 1) {
@@ -682,7 +687,8 @@ class Skill extends Model {
                 $refs[$skill['id']] = &$skill;
                 $flat_array[$skill['id']] =  &$skill;
             }
-//            var_dump($skills);
+            //var_dump($skills);
+            //var_dump($refs);
             
             //Checking family value
             

main/template/default/skill/skill_wheel.js.tpl

@@ -1,6 +1,6 @@
 <script>
 
-/* Skill wheel settings 	*/
+/* Skill wheel settings */
 
 var url = '{{ url }}';
 var skill_to_load_from_get = '{{ skill_id_to_load }}';	
@@ -29,6 +29,7 @@ color_patterns[14] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.RdPu
 color_patterns[15] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.PuRd[col]);
 color_patterns[16] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.OrRd[col]);
 color_patterns[17] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.YlOrRd[col]);
+col = 3;
 color_patterns[18] = d3.scale.ordinal().domain(my_domain).range(colorbrewer.Greys[col]);
     
 //var normal_fill = d3.scale.category10().domain(my_domain);
@@ -49,7 +50,6 @@ for (i= 0; i < color_loops; i++) {
     colors = $.merge(colors, colors2);
 }
 
-
 /* Interpolate the scales! */
     function arcTween(d, arc, x, y, r) {
         var my = maxY(d),
@@ -126,17 +126,17 @@ bright red for missing skills, in the "Required skills" view for a student when
   
 
     function set_skill_style(d, attribute, searched_skill_id) {
+        //Default stroke
+        return_stroke = 'black';
+        
         //Nice rainbow colors
         return_fill = get_color(d);        
         
-        /*var p = color_patterns[18];
+        //Grey colors using colorbrewer
+        var p = color_patterns[18];
         color = p(depth -1 + d.counter);
-        return_fill = d.color = color;*/
-         
-        
-        //return_fill = 'grey';
-        
-        return_stroke = 'black';
+        return_fill = d.color = color;                
+        //return_fill = 'grey';        
         
         //If user achieved that skill
         if (d.achieved) {
@@ -153,7 +153,7 @@ bright red for missing skills, in the "Required skills" view for a student when
         //console.log(d.id +' - ' + searched_skill_id);
         if (searched_skill_id) {
             if (d.id ==  searched_skill_id) {
-          //      return_fill = '#B94A48';
+                return_fill = '#B94A48';
             }
         }
         
@@ -206,9 +206,7 @@ bright red for missing skills, in the "Required skills" view for a student when
         .each("end", function(e) {
             d3.select(this).style("visibility", isParentOf(d, e) ? null : "hidden");
         });
-        
-        
-        
+                        
         /* Updating icon position */        
         
         icon.transition().duration(duration)
@@ -352,7 +350,7 @@ bright red for missing skills, in the "Required skills" view for a student when
     }    
 
 function load_nodes(load_skill_id, main_depth) {
-
+    
     /** Define constants and size of the wheel */
     /** Total width of the wheel (also counts for the height) */
     var w = 900,

main/template/default/skill/skill_wheel.tpl

@@ -438,7 +438,7 @@ $(document).ready(function() {
                     </select>
                     <br /><br />
                     <div class="btn-group">
-                        <a class="btn load_root" rel="1" href="#">{{ "SkillRoot"|get_lang }}</a>
+                        <a class="btn load_root" rel="0" href="#">{{ "SkillRoot"|get_lang }}</a>
                         <!-- <a id="clear_selection" class="btn">{{ "Clear"|get_lang }}</a> -->	
                     </div>
                     <ul id="skill_holder" class="holder holder_simple">

main/template/default/skill/skill_wheel_student.tpl

@@ -265,7 +265,7 @@ $(document).ready(function() {
                     </select>
                     <br /><br />
                     <div class="btn-group">
-                        <a class="btn load_root" rel="1" href="#">{{ "SkillRoot"|get_lang }}</a>
+                        <a class="btn load_root" rel="0" href="#">{{ "SkillRoot"|get_lang }}</a>
                         <!-- <a id="clear_selection" class="btn">{{ "Clear"|get_lang }}</a> -->	
                     </div>
                     <ul id="skill_holder" class="holder holder_simple">
@@ -280,11 +280,9 @@ $(document).ready(function() {
                 
                 <br />
                 <h3>{{ "Legend"|get_lang }}</h3>                
-                <span class="label label-warning">{{ "SkillsYouCanLearn"|get_lang }}</span><br />
-                <span class="label label-important">{{ "SkillsSearchedFor"|get_lang }}</span><br />                
                 <span class="label label-info">{{ "SkillsYouAcquired"|get_lang }}</span><br />
-                
-                
+                <span class="label label-warning">{{ "SkillsYouCanLearn"|get_lang }}</span><br />
+                <span class="label label-important">{{ "SkillsSearchedFor"|get_lang }}</span><br />
             </div>                
         </div>
             
@@ -293,9 +291,7 @@ $(document).ready(function() {
                 <img src="">
             </div>
         </div>
-</div>
-
-        
+</div>        
 <div id="dialog-course-info" style="display:none;">        
     <div id="course_info">
     </div>