Replace sectors by job terms in profile and search (job and mentoring).
[platal.git] / modules / profile / jobs.inc.php
index a61d179..30cc3f4 100644 (file)
@@ -72,7 +72,7 @@ class ProfileSettingJob extends ProfileSettingGeocoding
                 'changed'                 => '0',
                 'removed'                 => '0',
             ),
-            'hq_phone'         => '',
+            'hq_fixed'         => '',
             'hq_fax'           => '',
             'subSubSectorName' => null,
             'sector'           => '0',
@@ -109,7 +109,8 @@ class ProfileSettingJob extends ProfileSettingGeocoding
                 'tel'     => '',
                 'pub'     => 'private',
                 'comment' => '',
-            )),
+            ),
+            'terms'            => array()),
         );
     }
 
@@ -147,6 +148,26 @@ class ProfileSettingJob extends ProfileSettingGeocoding
                 list($job['sector'], $job['subSector'], $job['subSubSector']) = $res->fetchOneRow();
             }
         }
+        if (count($job['terms'])) {
+            $termsid = array();
+            foreach ($job['terms'] as $term) {
+                if (!$term['full_name']) {
+                    $termsid[] = $term['jtid'];
+                }
+            }
+            if (count($termsid)) {
+                $res = XDB::query("SELECT  jtid, full_name
+                                    FROM  profile_job_term_enum
+                                   WHERE  jtid IN {?}",
+                                 $termsid);
+                $term_id_to_name = $res->fetchAllAssoc('jtid', false);
+                foreach ($job['terms'] as &$term) {
+                    if (!$term['full_name']) {
+                        $term['full_name'] = $term_id_to_name[$term['jtid']];
+                    }
+                }
+            }
+        }
         if ($job['name']) {
             $res = XDB::query("SELECT  id
                                  FROM  profile_job_enum
@@ -168,11 +189,7 @@ class ProfileSettingJob extends ProfileSettingGeocoding
             }
         }
         $job['w_address']['pub'] = $this->pub->value($page, 'address_pub', $job['w_address']['pub'], $s);
-        if (!isset($job['w_phone'])) {
-            $job['w_phone'] = array();
-        }
-        $profiletel = new ProfileSettingPhones('pro', $jobid);
-        $job['w_phone'] = $profiletel->value($page, 'tel', $job['w_phone'], $s);
+        $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s);
 
         unset($job['removed']);
         unset($job['new']);
@@ -229,19 +246,15 @@ class ProfileSettingJob extends ProfileSettingGeocoding
 
     public function save(ProfilePage &$page, $field, $value)
     {
-        // TODO: use address and phone classes to update profile_job_enum and profile_phones once they are done.
-
-        require_once 'profil.func.inc.php';
-
+        // TODO: use address class to update profile_job_enum once it is done.
         XDB::execute("DELETE FROM  profile_job
                             WHERE  pid = {?}",
                      $page->pid());
         XDB::execute("DELETE FROM  profile_addresses
                             WHERE  pid = {?} AND type = 'job'",
                      $page->pid());
-        XDB::execute("DELETE FROM  profile_phones
-                            WHERE  pid = {?} AND link_type = 'pro'",
-                     $page->pid());
+        Phone::deletePhones($page->pid(), Phone::LINK_JOB);
+        $terms_values = array();
         foreach ($value as $id => &$job) {
             if (isset($job['name']) && $job['name']) {
                 if (isset($job['jobid']) && $job['jobid']) {
@@ -259,21 +272,29 @@ class ProfileSettingJob extends ProfileSettingGeocoding
                 }
                 $address = new ProfileSettingAddress();
                 $address->saveAddress($page->pid(), $id, $job['w_address'], 'job');
-                $profiletel = new ProfileSettingPhones('pro', $id);
-                $profiletel->saveTels($page->pid(), 'tel', $job['w_phone']);
+                Phone::savePhones($job['w_phone'], $page->pid(), Phone::LINK_JOB, $id);
+                if (isset($job['terms'])) {
+                    foreach ($job['terms'] as $term) {
+                        $terms_values[] = '('.XDB::escape($page->pid()).', '. XDB::escape($id).', '.XDB::escape($term['jtid']).', "original")';
+                    }
+                }
             }
         }
+        if (count($terms_values) > 0) {
+            XDB::execute('INSERT INTO  profile_job_term (pid, jid, jtid, computed)
+                               VALUES  '.implode(', ', $terms_values));
+        }
     }
 
     public function getText($value) {
         $jobs = array();
         foreach ($value as $id => $job) {
             $address = new ProfileSettingAddress();
-            $phones = new ProfileSettingPhones('pro', $id);
+            $phones = Phone::formArrayToString($job['w_phone']);
             $jobs[] = 'Entreprise : ' . $job['name'] . ', secteur : ' . $job['subSubSectorName']
                     . ', description : ' . $job['description'] . ', web : ' . $job['w_url']
                     . ', email : ' . $job['w_email']
-                    . ', ' . $phones->getText($job['w_phone']) . ', ' .  $address->getText($job['w_address']);
+                    . ($phones ? ', ' . $phones : '') . ', ' .  $address->getText($job['w_address']);
         }
         return implode(' ; ' , $jobs);
     }
@@ -424,15 +445,20 @@ class ProfileSettingJobs extends ProfilePage
                 );
             }
 
-            $res = XDB::iterator("SELECT  link_id AS jobid, tel_type AS type, pub, display_tel AS tel, comment
-                                    FROM  profile_phones
-                                   WHERE  pid = {?} AND link_type = 'pro'
-                                ORDER BY  link_id",
+            $it = Phone::iterate(array($this->pid()), array(Phone::LINK_JOB));
+            while ($phone = $it->next()) {
+                $this->values['jobs'][$phone->linkId()]['w_phone'][$phone->id()] = $phone->toFormArray();
+            }
+            $res = XDB::iterator("SELECT  e.jtid, e.full_name, j.jid AS jobid
+                                    FROM  profile_job_term_enum AS e
+                              INNER JOIN  profile_job_term AS j USING(jtid)
+                                   WHERE  pid = {?}
+                                ORDER BY  j.jid",
                                  $this->pid());
             $i = 0;
             $jobNb = count($this->values['jobs']);
-            while ($phone = $res->next()) {
-                $jobid = $phone['jobid'];
+            while ($term = $res->next()) {
+                $jobid = $term['jobid'];
                 while ($i < $jobNb && $this->values['jobs'][$i]['id'] < $jobid) {
                     $i++;
                 }
@@ -440,29 +466,25 @@ class ProfileSettingJobs extends ProfilePage
                     break;
                 }
                 $job =& $this->values['jobs'][$i];
-                if (!isset($job['w_phone'])) {
-                    $job['w_phone'] = array();
+                if ($job['id'] != $jobid) {
+                    continue;
                 }
-                if ($job['id'] == $jobid) {
-                    $job['w_phone'][] = $phone;
+                if (!isset($job['terms'])) {
+                    $job['terms'] = array();
                 }
+                $job['terms'][] = $term;
             }
+
             foreach ($this->values['jobs'] as $id => &$job) {
+                $phone = new Phone();
                 if (!isset($job['w_phone'])) {
-                    $job['w_phone'] = array(
-                        0 => array(
-                            'type'    => 'fixed',
-                            'tel'     => '',
-                            'pub'     => 'private',
-                            'comment' => '',
-                        )
-                    );
+                    $job['w_phone'] = array(0 => $phone->toFormArray());
                 }
             }
+
             $job['w_email_new'] = '';
-            if (!isset($job['hq_phone'])) {
-                $job['hq_phone'] = '';
+            if (!isset($job['hq_fixed'])) {
+                $job['hq_fixed'] = '';
             }
             if (!isset($job['hq_fax'])) {
                 $job['hq_fax'] = '';
@@ -513,7 +535,7 @@ class ProfileSettingJobs extends ProfilePage
     public function _prepare(PlPage &$page, $id)
     {
         require_once 'emails.combobox.inc.php';
-        fill_email_combobox($page, $this->owner, $this->profile);
+        fill_email_combobox($page, $this->owner);
 
         $res = XDB::query("SELECT  id, name AS label
                              FROM  profile_job_sector_enum");