More fixes see #1791

main/inc/lib/skill.lib.php

@@ -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;
                 }
             }
         }
@@ -643,7 +645,10 @@ class Skill extends Model {
         
         if (!empty($skills)) {
             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) {
@@ -683,6 +688,7 @@ class Skill extends Model {
                 $flat_array[$skill['id']] =  &$skill;
             }
             //var_dump($skills);
+            //var_dump($refs);
             
             //Checking family value
             

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

@@ -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,18 +126,18 @@ 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 = d.color = color;                
         //return_fill = 'grey';        
         
-        return_stroke = 'black';
-        
         //If user achieved that skill
         if (d.achieved) {
             return_fill = '#3A87AD';
@@ -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';
             }
         }
         
@@ -207,8 +207,6 @@ bright red for missing skills, in the "Required skills" view for a student when
             d3.select(this).style("visibility", isParentOf(d, e) ? null : "hidden");
         });
                         
-        
-        
         /* Updating icon position */        
         
         icon.transition().duration(duration)

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-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 />
-                <span class="label label-info">{{ "SkillsYouAcquired"|get_lang }}</span><br />
-                
-                
             </div>                
         </div>
             
@@ -294,8 +292,6 @@ $(document).ready(function() {
             </div>
         </div>
 </div>        
-
-        
 <div id="dialog-course-info" style="display:none;">        
     <div id="course_info">
     </div>