Fixes the email combobox when a new job is added.

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index f0b6b1b..21b3ed9 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -39,6 +39,7 @@ class ProfileModule extends PLModule
             'profile/networking'         => $this->make_hook('networking',                 AUTH_PUBLIC),
             'profile/ajax/job'           => $this->make_hook('ajax_job',                   AUTH_COOKIE, 'user', NO_AUTH),
             'profile/ajax/secteur'       => $this->make_hook('ajax_secteur',               AUTH_COOKIE, 'user', NO_AUTH),
+            'profile/ajax/ssecteur'      => $this->make_hook('ajax_ssecteur',              AUTH_COOKIE, 'user', NO_AUTH),
             'profile/ajax/skill'         => $this->make_hook('ajax_skill',                 AUTH_COOKIE, 'user', NO_AUTH),
             'profile/ajax/searchname'    => $this->make_hook('ajax_searchname',            AUTH_COOKIE, 'user', NO_AUTH),
             'javascript/education.js'    => $this->make_hook('education_js',               AUTH_COOKIE),
@@ -463,23 +464,41 @@ class ProfileModule extends PLModule
         $page->assign('i', $id);
         $page->assign('job', array());
         $page->assign('new', true);
-        $page->assign('secteurs', XDB::iterator("SELECT  id, label
-                                                   FROM  emploi_secteur"));
-        $page->assign('fonctions', XDB::iterator("SELECT  id, fonction_fr, FIND_IN_SET('titre', flags) AS title
-                                                    FROM  fonctions_def
-                                                ORDER BY  id"));
-    }
-
-    function handler_ajax_secteur(&$page, $id, $sect, $ssect = -1)
+        $res = XDB::query("SELECT  id, label
+                             FROM  emploi_secteur");
+        $page->assign('secteurs', $res->fetchAllAssoc());
+        $res = XDB::query("SELECT  id, fonction_fr, FIND_IN_SET('titre', flags) AS title
+                             FROM  fonctions_def
+                         ORDER BY  id");
+        $page->assign('fonctions', $res->fetchAllAssoc());
+        require_once "emails.combobox.inc.php";
+        fill_email_combobox($page);
+    }
+
+    function handler_ajax_secteur(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1)
     {
         header('Content-Type: text/html; charset=utf-8');
-        $res = XDB::iterator("SELECT  id, label
-                                FROM  emploi_ss_secteur
-                               WHERE  secteur = {?}", $sect);
+        $res = XDB::iterator("SELECT  id, name AS label, FIND_IN_SET('optgroup', flags) AS optgroup
+                                FROM  profile_job_subsector_enum
+                               WHERE  sectorid = {?}", $sect);
         $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN);
         $page->assign('id', $id);
         $page->assign('ssecteurs', $res);
         $page->assign('sel', $ssect);
+        $page->assign('jobid', $jobid);
+        $page->assign('jobpref', $jobpref);
+    }
+
+    function handler_ajax_ssecteur(&$page, $id, $ssect, $sssect = -1)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $res = XDB::iterator("SELECT  id, name AS label
+                                FROM  profile_job_subsubsector_enum
+                               WHERE  subsectorid = {?}", $ssect);
+        $page->changeTpl('profile/jobs.soussecteur.tpl', NO_SKIN);
+        $page->assign('id', $id);
+        $page->assign('sssecteurs', $res);
+        $page->assign('sel', $sssect);
     }
 
     function handler_ajax_skill(&$page, $cat, $id)
@@ -517,14 +536,17 @@ class ProfileModule extends PLModule
 
         require_once 'validations.inc.php';
 
-        $res = XDB::query(
-                "SELECT  u.promo, u.promo_sortie
-                   FROM  auth_user_md5  AS u
-                  WHERE  user_id={?}", S::v('uid'));
+        $res = XDB::query("SELECT  e.entry_year, e.grad_year, d.promo_display, FIND_IN_SET('femme', u.flags) AS sexe
+                             FROM  auth_user_md5     AS u
+                       INNER JOIN  profile_display   AS d ON (d.uid = u.user_id)
+                       INNER JOIN  profile_education AS e ON (e.uid = u.user_id AND FIND_IN_SET('primary', e.flags))
+                            WHERE  u.user_id = {?}", S::v('uid'));
 
-        list($promo, $promo_sortie_old) = $res->fetchOneRow();
+        list($promo, $promo_sortie_old, $promo_display, $sexe) = $res->fetchOneRow();
         $page->assign('promo_sortie_old', $promo_sortie_old);
-        $page->assign('promo',  $promo);
+        $page->assign('promo', $promo);
+        $page->assign('promo_display', $promo_display);
+        $page->assign('sexe', $sexe);
 
         if (!Env::has('promo_sortie')) {
             return;
@@ -535,18 +557,18 @@ class ProfileModule extends PLModule
         $promo_sortie = Env::i('promo_sortie');
 
         if ($promo_sortie < 1000 || $promo_sortie > 9999) {
-            $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres');
+            $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres.');
         }
         elseif ($promo_sortie < $promo + 3) {
-            $page->trigError('Trop tôt');
+            $page->trigError('Trop tôt !');
         }
         elseif ($promo_sortie == $promo_sortie_old) {
             $page->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.');
         }
         elseif ($promo_sortie == $promo + 3) {
-            XDB::execute(
-                "UPDATE  auth_user_md5 set promo_sortie={?}
-                  WHERE  user_id={?}", $promo_sortie, S::v('uid'));
+            XDB::execute("UPDATE  profile_education
+                             SET  grad_year = {?}
+                           WHERE  uid = {?} AND FIND_IN_SET('primary', flags)", $promo_sortie, S::v('uid'));
                 $page->trigSuccess('Ton statut "orange" a été supprimé.');
                 $page->assign('promo_sortie_old', $promo_sortie);
         }