);
}
- public function emptyJob()
+ private function emptyJob()
{
$address = new Address();
$phone = new Phone();
);
}
+ private function fetchJobs(ProfilePage $page)
+ {
+ // Build the jobs tree
+ $jobs = XDB::fetchAllAssoc('SELECT j.id, j.jobid, je.name,
+ j.description, j.email AS w_email,
+ j.email_pub AS w_email_pub,
+ j.url AS w_url, j.pub
+ FROM profile_job AS j
+ LEFT JOIN profile_job_enum AS je ON (j.jobid = je.id)
+ WHERE j.pid = {?}
+ ORDER BY j.id',
+ $page->pid());
+
+ if (empty($jobs)) {
+ return array($this->emptyJob());
+ }
+
+ $compagnies = array();
+ $backtrack = array();
+ foreach ($jobs as $key=>$job) {
+ $compagnies[] = $job['jobid'];
+ $backtrack[$job['jobid']] = $key;
+ }
+
+ $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB));
+ while ($address = $it->next()) {
+ $jobs[$address->jobid]['w_address'] = $address->toFormArray();
+ }
+ $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB));
+ while ($phone = $it->next()) {
+ $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",
+ $page->pid());
+ while ($term = $res->next()) {
+ $jobid = $term['jobid'];
+ if (!isset($backtrack[$jobid])) {
+ continue;
+ }
+ $job =& $jobs[$backtrack[$jobid]];
+ if (!isset($job['terms'])) {
+ $job['terms'] = array();
+ }
+ $job['terms'][] = $term;
+ }
+
+ $phone = new Phone();
+ $address = new Address();
+ foreach ($jobs as $id => &$job) {
+ if (!isset($job['w_phone'])) {
+ $job['w_phone'] = array(0 => $phone->toFormArray());
+ }
+ if (!isset($job['w_address'])) {
+ $job['w_address'] = $address->toFormArray();
+ }
+
+ $job['w_email_new'] = '';
+ if (!isset($job['w_email_pub'])) {
+ $job['w_email_pub'] = 'private';
+ }
+ }
+ return $jobs;
+ }
+
private function cleanJob(ProfilePage &$page, $jobid, array &$job, &$success)
{
if ($job['w_email'] == "new@example.org") {
unset($job['new']);
}
+
+
public function value(ProfilePage &$page, $field, $value, &$success)
{
$entreprise = ProfileValidate::get_typed_requests($page->pid(), 'entreprise');
$init = false;
if (is_null($value)) {
- $value = $page->values['jobs'];
+ $value = $this->fetchJobs($page);
$init = true;
}
$success = true;
- foreach ($value as $key => &$job) {
+ foreach ($value as $key => $job) {
$job['name'] = trim($job['name']);
if ($job['name'] == '' && $entreprise) {
$job['tmp_name'] = $entreprise[$entr_val]->name;
if ($job['description'] == '' && $job['w_url'] == ''
&& $job['w_address']['text'] == '' && $job['w_email'] == ''
&& count($job['w_phone']) >= 1 && $job['w_phone'][0]['display'] == '') {
- array_splice($value, $key, 1);
+ unset($value[$key]);
continue;
}
if ($job['name'] == '' && $entreprise) {
$entreprise[$entr_val - 1]->clean();
}
- array_splice($value, $key, 1);
+ unset($value[$key]);
+ continue;
}
+ $value[$key] = $job;
}
foreach ($value as $key => &$job) {
$address = new Address($job['w_address']);
XDB::execute("DELETE FROM profile_job
WHERE pid = {?}",
$page->pid());
+ XDB::execute("DELETE FROM profile_job_term
+ WHERE pid = {?}",
+ $page->pid());
Address::delete($page->pid(), Address::LINK_JOB);
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']) {
- XDB::execute('INSERT INTO profile_job (pid, id, description, email, url, pub, email_pub, jobid)
+ XDB::execute('INSERT INTO profile_job (pid, id, description, email,
+ url, pub, email_pub, jobid)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $page->pid(), $id, $job['description'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
+ $page->pid(), $id, $job['description'], $job['w_email'],
+ $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
} else {
- XDB::execute('INSERT INTO profile_job (pid, id, description, email, url, pub, email_pub)
+ XDB::execute('INSERT INTO profile_job (pid, id, description, email,
+ url, pub, email_pub)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $page->pid(), $id, $job['description'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub']);
+ $page->pid(), $id, $job['description'], $job['w_email'],
+ $job['w_url'], $job['pub'], $job['w_email_pub']);
}
- $address = new Address(array_merge($job['w_address'], array('pid' => $page->pid(), 'id' => $id, 'type' => Address::LINK_JOB)));
+ $address = new Address(array_merge($job['w_address'],
+ array('pid' => $page->pid(),
+ 'id' => $id,
+ 'type' => Address::LINK_JOB)));
$address->save();
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")';
+ $terms_values[] = XDB::format('({?}, {?}, {?}, {?})',
+ $page->pid(), $id, $term['jtid'], "original");
}
}
}
}
if (count($terms_values) > 0) {
- XDB::execute('INSERT INTO profile_job_term (pid, jid, jtid, computed)
- VALUES '.implode(', ', $terms_values));
+ XDB::execute('REPLACE INTO profile_job_term (pid, jid, jtid, computed)
+ VALUES '.implode(', ', $terms_values));
}
}
$this->pid());
$this->values['cv'] = $res->fetchOneCell();
}
-
- // Build the jobs tree
- $res = XDB::iterRow('SELECT j.id, j.jobid, je.name, j.description, j.email, j.email_pub,
- j.url, j.pub
- FROM profile_job AS j
- LEFT JOIN profile_job_enum AS je ON (j.jobid = je.id)
- WHERE j.pid = {?}
- ORDER BY j.id',
- $this->pid());
- $this->values['jobs'] = array();
-
- $compagnies = array();
- if ($res->numRows() > 0) {
- while (list($id, $jobid, $name, $description, $w_email, $w_emailPub, $w_url, $pub) = $res->next()) {
- $compagnies[] = $jobid;
- $this->values['jobs'][] = array(
- 'id' => $id,
- 'jobid' => $jobid,
- 'name' => $name,
- 'description' => $description,
- 'pub' => $pub,
- 'w_email' => $w_email,
- 'w_email_pub' => $w_emailPub,
- 'w_url' => $w_url,
- );
- }
-
- $it = Address::iterate(array($this->pid()), array(Address::LINK_JOB));
- while ($address = $it->next()) {
- $this->values['jobs'][$address->jobid]['w_address'] = $address->toFormArray();
- }
- $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 ($term = $res->next()) {
- $jobid = $term['jobid'];
- while ($i < $jobNb && $this->values['jobs'][$i]['id'] < $jobid) {
- $i++;
- }
- if ($i >= $jobNb) {
- break;
- }
- $job =& $this->values['jobs'][$i];
- if ($job['id'] != $jobid) {
- continue;
- }
- if (!isset($job['terms'])) {
- $job['terms'] = array();
- }
- $job['terms'][] = $term;
- }
-
- $phone = new Phone();
- $address = new Address();
- foreach ($this->values['jobs'] as $id => &$job) {
- if (!isset($job['w_phone'])) {
- $job['w_phone'] = array(0 => $phone->toFormArray());
- }
- if (!isset($job['w_address'])) {
- $job['w_address'] = $address->toFormArray();
- }
- }
-
- $job['w_email_new'] = '';
- if (!isset($job['w_email_pub'])) {
- $job['w_email_pub'] = 'private';
- }
- } else {
- $this->values['jobs'][] = $this->settings['jobs']->emptyJob();
- }
}
protected function _saveData()
{* *}
{**************************************************************************}
+
<script type="text/javascript" src="javascript/jquery.jstree.js"></script>
{assign var=jobid value="job_"|cat:$i}
{assign var=jobpref value="jobs[`$i`]"}
{assign var=sector_text value="sector_text_"|cat:$i}
{assign var=sector value="sector_"|cat:$i}
{assign var=entreprise value="entreprise_"|cat:$i}
+{if !hasPerm('directory_private') && ($job.pub eq 'private') && !$new}
+{assign var=hiddenjob value=true}
+{else}
+{assign var=hiddenjob value=false}
+{/if}
<div id="{$jobid}">
<input type="hidden" name="{$jobpref}[removed]" value="0" />
<input type="hidden" name="{$jobpref}[new]" value="{if $new}1{else}0{/if}" />
<div style="float: right">
<a href="javascript:restoreJob('{$jobid}','{$jobpref}')">{icon name=arrow_refresh title="Restaure l'emploi"}</a>
</div>
- Restaurer l'entreprise n°{$i+1} : <span id="{$jobid}_grayed_name"></span>
+ Restaurer l'entreprise n°{$i+1} : {if $hiddenjob}(masquée){else}<span id="{$jobid}_grayed_name"></span>{/if}
</th>
</tr>
</table>
<tr>
<th colspan="2" style="text-align: right">
<div class="flags" style="float: left; text-align: left">
- {include file="include/flags.radio.tpl" name="`$jobpref`[pub]" val=$job.pub}
+ {include file="include/flags.radio.tpl" name="`$jobpref`[pub]" val=$job.pub disabled=$hiddenjob}
</div>
Entreprise n°{$i+1} :
+ {if $hiddenjob}
+ (masquée)
+ {if !$job.tmp_name}
+ <input type="hidden" name="{$jobpref}[name]" value="{$job.name}" />
+ {/if}
+ {else}
{if $job.tmp_name}{$job.tmp_name} <small>(en cours de validation)</small>{else}
<input type="text" class="enterpriseName{if $job.name_error} error{/if}" size="35" maxlength="100"
name="{$jobpref}[name]" value="{$job.name}" />
{/if}
+ {/if}
<a href="javascript:removeJob('{$jobid}','{$jobpref}')">
{icon name=cross title="Supprimer cet emploi"}
</a>
</th>
</tr>
{if !$job.tmp_name && !$job.name}
- <tr class="{$entreprise}">
+ <tr class="{$entreprise}" {if $hiddenjob}style="display: none"{/if}>
<td class="center" colspan="2">
- <small>Si ton entreprise ne figure pas dans la liste,
+ <small>Si l'entreprise ne figure pas dans la liste,
<a href="javascript:addEntreprise({$i})">clique ici</a> et complète les informations la concernant.</small>
</td>
</tr>
</tr>
{/if}
- <tr class="pair">
- <td colspan="2" class="center" style="font-style: italic">Ta place dans l'entreprise</td>
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
+ <td colspan="2" class="center" style="font-style: italic">Place dans l'entreprise</td>
</tr>
- <tr class="pair {$sector_text}">
+ <tr class="pair" ${sector_text} {if $hiddenjob}style="display: none"{/if}>
<td class="titre">Mots-clefs</td>
<td class="job_terms">
<input type="text" class="term_search" size="35"/>
</script>
</td>
</tr>
- <tr class="pair">
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
<td colspan="2" class="term_tree">
</td>
</tr>
- <tr class="pair">
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
<td class="titre">Description</td>
<td>
<input type="text" size="35" maxlength="120" {if $job.description_error}class="error"{/if}
name="{$jobpref}[description]" value="{$job.description}" />
</td>
</tr>
- <tr class="pair">
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
<td class="titre">Page perso</td>
<td>
<input type="text" size="35" maxlength="255" {if $job.w_rul}class="error"{/if}
name="{$jobpref}[w_url]" value="{$job.w_url}" />
</td>
</tr>
- <tr class="pair">
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
<td colspan="2">
<div style="float: left">
<div class="titre">Adresse</div>
</div>
</td>
</tr>
+ {if $hiddenjob}
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
+ <td colspan="2">
+ <input type="hidden" name="{$jobpref}[w_email]" value="{$job.w_email}" />
+ <input type="hidden" name="{$jobpref}[w_email_pub]" value="{$job.w_email_pub}" />
+ </td>
+ </tr>
+ {else}
{include file="include/emails.combobox.tpl" name=$jobpref|cat:'[w_email]' val=$job.w_email
class="pair" i=$i error=$job.w_email_error prefix="w_" pub=$job.w_email_pub id=$i}
- <tr class="pair">
+ {/if}
+ <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
<td colspan="2">
{foreach from=$job.w_phone key=t item=phone}
<div id="{"`$jobid`_w_phone_`$t`"}" style="clear: both">
projects / platal.git / commitdiff