X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fskills.inc.php;h=7fed7470a5fa7267b1d61042696e185a8c2f8042;hb=66c4bdaf7813c6dd607a275ab9a2ef163d8b0a51;hp=ad4bef59791ef67a6ae4bb356a692cf9d1bf0eab;hpb=684195f33b11e3067200dd3a9e14304bd7d04463;p=platal.git

diff --git a/modules/profile/skills.inc.php b/modules/profile/skills.inc.php
index ad4bef5..7fed747 100644
--- a/modules/profile/skills.inc.php
+++ b/modules/profile/skills.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileSkill implements ProfileSetting
+class ProfileSettingSkill implements ProfileSetting
 {
     private $table;
     private $skill_field;
@@ -39,7 +39,7 @@ class ProfileSkill implements ProfileSetting
             $res = XDB::iterRow("SELECT  s.id, s.{$this->text_field}, i.level
                                    FROM  profile_{$this->table}_enum AS s
                              INNER JOIN  profile_{$this->table}s AS i ON(s.id = i.{$this->skill_field})
-                                  WHERE  i.uid = {?}",
+                                  WHERE  i.pid = {?}",
                                 $page->pid());
             while (list($sid, $text, $level) = $res->next()) {
                 $value[$sid] = array('text' => $text, 'level' => $level);
@@ -71,22 +71,30 @@ class ProfileSkill implements ProfileSetting
             return;
         }
         foreach ($value as $id=>&$skill) {
-            XDB::execute("INSERT INTO  profile_{$this->table}s (uid, {$this->skill_field}, level)
+            XDB::execute("INSERT INTO  profile_{$this->table}s (pid, {$this->skill_field}, level)
                                VALUES  ({?}, {?}, {?})",
                          $page->pid(), $id, $skill['level']);
         }
     }
+
+    public function getText($value) {
+        $skills = array();
+        foreach ($value as $skill) {
+            $skills[] = 'Compétance : ' . $skill['text'] . ', niveau : ' . $skill['level'];
+        }
+        return implode(' ; ' , $skills);
+    }
 }
 
-class ProfileSkills extends ProfilePage
+class ProfilePageSkills extends ProfilePage
 {
     protected $pg_template = 'profile/skill.tpl';
 
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['competences'] = new ProfileSkill('skill', 'cid', 'text_fr');
-        $this->settings['langues'] = new ProfileSkill('langskill', 'lid', 'langue_fr');
+        $this->settings['competences'] = new ProfileSettingSkill('skill', 'cid', 'text_fr');
+        $this->settings['langues'] = new ProfileSettingSkill('langskill', 'lid', 'langue_fr');
     }
 
     public function _prepare(PlPage &$page, $id)
@@ -97,7 +105,8 @@ class ProfileSkills extends ProfilePage
                                           'bonne connaissance' => 'bonne connaissance',
                                           'expert' => 'expert'));
         $page->assign('lang_list', XDB::iterator("SELECT  id, langue_fr
-                                                    FROM  profile_langskill_enum"));
+                                                    FROM  profile_langskill_enum
+                                                ORDER BY  langue_fr"));
         $page->assign('lang_level', array(1 => 'connaissance basique',
                                           2 => 'maîtrise des bases',
                                           3 => 'maîtrise limitée',