X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofilefields.inc.php;h=2de1e6ba4d30890344f85fdc622cf90e053a8fef;hb=54722967b9b605dca8cff67fc3a050194beba368;hp=c456d04aefb19531b9c085e63e6bf4fa55b49acb;hpb=3c985c085f0e966ce2a0198d957fbafa2269ac82;p=platal.git diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index c456d04..2de1e6b 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -1,6 +1,6 @@ 'ProfileMedals', Profile::FETCH_NETWORKING => 'ProfileNetworking', Profile::FETCH_PHONES => 'ProfilePhones', - Profile::FETCH_MENTOR_SECTOR => 'ProfileMentoringSectors', Profile::FETCH_MENTOR_COUNTRY => 'ProfileMentoringCountries', + Profile::FETCH_JOB_TERMS => 'ProfileJobTerms', + Profile::FETCH_MENTOR_TERMS => 'ProfileMentoringTerms', ); /** The profile to which this field belongs @@ -46,7 +47,8 @@ abstract class ProfileField * @param $pids An array of pids * @param $visibility The level of visibility fetched fields must have * @return a PlIterator yielding data suitable for a "new ProfileBlah($data)" - * XXX MUST be reimplemented for each kind of ProfileField + * + * MUST be reimplemented for each kind of ProfileField. */ public static function fetchData(array $pids, ProfileVisibility $visibility) { @@ -91,6 +93,9 @@ class ProfileFieldIterator implements PlIterator public function __construct($cls, array $pids, ProfileVisibility $visibility) { + if (is_numeric($cls) && isset(ProfileField::$fields[$cls])) { + $cls = ProfileField::$fields[$cls]; + } $this->data = call_user_func(array($cls, 'fetchData'), $pids, $visibility); $this->cls = $cls; } @@ -123,72 +128,6 @@ class ProfileFieldIterator implements PlIterator } // }}} -// {{{ class Phone -class Phone -{ - const TYPE_FAX = 'fax'; - const TYPE_FIXED = 'fixed'; - const TYPE_MOBILE = 'mobile'; - public $type; - - public $search; - public $display; - public $comment = ''; - - const LINK_JOB = 'job'; - const LINK_ADDRESS = 'address'; - const LINK_PROFILE = 'user'; - const LINK_COMPANY = 'hq'; - public $link_type; - public $link_id; - - /** Fields are : - * $type, $search, $display, $link_type, $link_id, $comment, $pid, $id - */ - public function __construct($data) - { - foreach ($data as $key => $val) { - $this->$key = $val; - } - } - - public function hasFlags($flags) { - return $this->hasType($flags) && $this->hasLink($flags); - } - - /** Returns true if this phone's type matches the flags - */ - public function hasType($flags) { - $flags = $flags & Profile::PHONE_TYPE_ANY; - return ( - ($flags == Profile::PHONE_TYPE_ANY) - || - (($flags & Profile::PHONE_TYPE_FAX) && $this->type == self::TYPE_FAX) - || - (($flags & Profile::PHONE_TYPE_FIXED) && $this->type == self::TYPE_FIXED) - || - (($flags & Profile::PHONE_TYPE_MOBILE) && $this->type == self::TYPE_MOBILE) - ); - } - - /** Returns true if this phone's link matches the flags - */ - public function hasLink($flags) { - $flags = $flags & Profile::PHONE_LINK_ANY; - return ( - ($flags == Profile::PHONE_LINK_ANY) - || - (($flags & Profile::PHONE_LINK_COMPANY) && $this->link_type == self::LINK_COMPANY) - || - (($flags & Profile::PHONE_LINK_JOB) && $this->link_type == self::LINK_JOB) - || - (($flags & Profile::PHONE_LINK_ADDRESS) && $this->link_type == self::LINK_ADDRESS) - || - (($flags & Profile::PHONE_LINK_PROFILE) && $this->link_type == self::LINK_PROFILE) - ); - } -} -// }}} // {{{ class Company class Company { @@ -209,16 +148,16 @@ class Company } } - public function setPhone(Phone &$phone) + public function setPhone(Phone $phone) { if ($phone->link_type == Phone::LINK_COMPANY && $phone->link_id == $this->id) { $this->phone = $phone; } } - public function setAddress(Address &$address) + public function setAddress(Address $address) { - if ($address->link_type == Address::LINK_COMPANY && $address->link_id == $this->id) { + if ($address->type == Address::LINK_COMPANY && $address->jobid == $this->id) { $this->address = $address; } } @@ -226,14 +165,26 @@ class Company } // }}} // {{{ class Job +/** profile_job describes a Job, links to: + * - a Profile, through `pid` + * - a Company, through `jobid` + * The `id` field is the id of this job in the list of the jobs of its profile + * + * For the documentation of the phone table, please see classes/phone.php. + * For the documentation of the address table, please see classes/address.php. + * + * The possible relations are as follow: + * A Job is linked to a Company and a Profile + */ class Job { public $pid; public $id; public $company = null; - private $phones = array(); - private $address = null; + public $phones = array(); + public $address = null; + public $terms = array(); public $jobid; @@ -241,10 +192,6 @@ class Job public $user_site; public $user_email; - public $sector; - public $subsector; - public $subsubsector; - /** Fields are: * pid, id, company_id, description, url, email */ @@ -254,6 +201,14 @@ class Job $this->$key = $val; } $this->company = CompanyList::get($this->jobid); + if (is_null($this->company)) { + $entreprises = ProfileValidate::get_typed_requests($this->pid, 'entreprise'); + foreach ($entreprises as $entreprise) { + if ($entreprise->id == $this->id) { + $this->company = new Company(array('name' => $entreprise->name)); + } + } + } } public function phones() @@ -266,75 +221,42 @@ class Job return $this->address; } - public function addPhone(Phone &$phone) + public function addPhone(Phone $phone) { if ($phone->link_type == Phone::LINK_JOB && $phone->link_id == $this->id && $phone->pid == $this->pid) { - $this->phones[] = $phone; + $this->phones[$phone->uniqueId()] = $phone; } } public function setAddress(Address $address) { - if ($address->link_id == Address::LINK_JOB && $address->link_id == $this->id && $address->pid == $this->pid) { + if ($address->type == Address::LINK_JOB && $address->id == $this->id && $address->pid == $this->pid) { $this->address = $address; } } + + public function addTerm(JobTerm $term) + { + $this->terms[$term->jtid] = $term; + } } // }}} -// {{{ class Address -class Address +// {{{ class JobTerm +class JobTerm { - const LINK_JOB = 'job'; - const LINK_COMPANY = 'hq'; - const LINK_PROFILE = 'home'; - - public $flags; - public $link_id; - public $link_type; - - public $text; - public $postalCode; - public $latitude; - public $longitude; - - public $locality; - public $subAdministrativeArea; - public $administrativeArea; - public $country; - - public $comment; - - private $phones = array(); + public $jtid; + public $full_name; + public $pid; + public $jid; /** Fields are: - * pîd, id, link_id, link_type, flags, text, postcode, country + * pid, jid, jtid, full_name */ public function __construct($data) { foreach ($data as $key => $val) { $this->$key = $val; } - $this->flags = new PlFlagSet($this->flags); - } - - public function addPhone(Phone &$phone) - { - if ($phone->link_type == Phone::LINK_ADDRESS && $phone->link_id == $this->id && $phone->pid == $this->pid) { - $this->phones[] = $phone; - } - } - - public function phones() - { - return $this->phones; - } - - public function hasFlag($flag) - { - if (!$this->flags instanceof PlFlagSet) { - $this->flags = new PlFlagSet($this->flags); - } - return $this->flags->hasFlag($flag); } } // }}} @@ -416,7 +338,7 @@ class ProfileEducation extends ProfileField $data = XDB::iterator('SELECT pe.id, pe.pid, pe.entry_year, pe.grad_year, pe.program, pe.flags, pee.name AS school, pee.abbreviation AS school_short, - pee.url AS school_url, gc.countryFR AS country, + pee.url AS school_url, gc.country, pede.degree, pede.abbreviation AS degree_short, pede.level AS degree_level, pefe.field FROM profile_education AS pe @@ -466,20 +388,23 @@ class ProfileNetworking extends ProfileField { private $networks = array(); - public function __construct(PlIterator $it) + public function __construct(PlInnerSubIterator $it) { + $this->pid = $it->value(); while ($network = $it->next()) { - $this->networks[$network['nwid']] = $network['address']; + $network['network_type'] = new PlFlagSet($network['network_type']); + $this->networks[$network['id']] = $network; } } public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pid, nwid, address, network_type - FROM profile_networking + $data = XDB::iterator('SELECT pid, id, address, pne.nwid, pne.network_type, pne.link, pne.name + FROM profile_networking AS pn + LEFT JOIN profile_networking_enum AS pne USING(nwid) WHERE pid IN {?} AND pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', - network_type, nwid', + pn.nwid, id', $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); @@ -490,17 +415,15 @@ class ProfileNetworking extends ProfileField $nws = array(); $nb = 0; foreach ($this->networks as $id => $nw) { - // XXX hardcoded reference to web site index - if ( - (($flags & Profile::NETWORKING_WEB) && $nw['network_type'] == 0) - || - (! ($flags & Profile::NETWORKING_WEB)) - ) { + if (($flags & Profile::NETWORKING_WEB) && $nw['network_type']->hasFlag('web') || + ($flags & Profile::NETWORKING_IM) && $nw['network_type']->hasFlag('im') || + ($flags & Profile::NETWORKING_SOCIAL) && $nw['network_type']->hasFlag('social') || + ($flags == Profile::NETWORKING_ALL)) { $nws[$id] = $nw; ++$nb; - } - if ($nb >= $limit) { - break; + if (isset($limit) && $nb >= $limit) { + break; + } } } return $nws; @@ -551,33 +474,6 @@ class ProfileCorps extends ProfileField } } // }}} -// {{{ class ProfileMentoringSectors [ Field ] -class ProfileMentoringSectors extends ProfileField -{ - public $sectors = array(); - - public function __construct(PlInnerSubIterator $it) - { - $this->pid = $it->value(); - while ($sector = $it->next()) { - $this->sectors[] = $sector; - } - } - - public static function fetchData(array $pids, ProfileVisibility $visibility) - { - $data = XDB::iterator('SELECT pms.pid, pjse.name AS sector, pjsse.name AS subsector - FROM profile_mentor_sector AS pms - LEFT JOIN profile_job_sector_enum AS pjse ON (pjse.id = pms.sectorid) - LEFT JOIN profile_job_subsector_enum AS pjsse ON (pjsse.id = pms.subsectorid) - WHERE pms.pid IN {?} - ORDER BY ' . XDB::formatCustomOrder('pms.pid', $pids), - $pids); - - return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); - } -} -// }}} // {{{ class ProfileMentoringCountries [ Field ] class ProfileMentoringCountries extends ProfileField { @@ -593,7 +489,7 @@ class ProfileMentoringCountries extends ProfileField public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.countryFR AS name + $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.country AS name FROM profile_mentor_country AS pmc LEFT JOIN geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pmc.country) WHERE pmc.pid IN {?} @@ -604,80 +500,56 @@ class ProfileMentoringCountries extends ProfileField } } // }}} - -/** Loading of data for a Profile : - * 1) load jobs, addresses, phones - * 2) attach phones to addresses, jobs and profiles - * 3) attach addresses to jobs and profiles - */ - // {{{ class ProfileAddresses [ Field ] class ProfileAddresses extends ProfileField { private $addresses = array(); - public function __construct(PlIterator $it) + public function __construct(PlInnerSubIterator $it) { - if ($it instanceof PlInnerSubIterator) { - $this->pid = $it->value(); - } - - while ($addr = $it->next()) { - $this->addresses[] = new Address($addr); + $this->pid = $it->value(); + while ($address = $it->next()) { + $this->addresses[] = new Address($address); } } public function get($flags, $limit = null) { - $res = array(); + $addresses = array(); $nb = 0; - foreach ($this->addresses as $addr) { - if ( - ($flags & Profile::ADDRESS_ALL) - || - (($flags & Profile::ADDRESS_MAIN) && $addr->hasFlag('current')) - || - (($flags & Profile::ADDRESS_POSTAL) && $addr->hasFlag('mail')) - || - (($flags & Profile::ADDRESS_PERSO) && $addr->link_type == 'home') - || - (($flags & Profile::ADDRESS_PRO) && $addr->link_type == 'job') + foreach ($this->addresses as $address) { + if ((($flags & Profile::ADDRESS_MAIN) && $address->hasFlag('current')) + || (($flags & Profile::ADDRESS_POSTAL) && $address->hasFlag('mail')) + || (($flags & Profile::ADDRESS_PERSO) && $address->type == Address::LINK_PROFILE) + || (($flags & Profile::ADDRESS_PRO) && $address->type == Address::LINK_JOB) ) { - $res[] = $addr; - $nb++; + $addresses[] = $address; + ++$nb; } if ($limit != null && $nb == $limit) { break; } } - return $res; + return $addresses; } public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pa.id, pa.pid, pa.flags, pa.type AS link_type, - IF(pa.type = \'home\', pid, jobid) AS link_id, - pa.text, pa.postalCode, pa.latitude, pa.longitude, pa.comment, - gl.name AS locality, gas.name AS subAdministrativeArea, - ga.name AS administrativeArea, gc.countryFR AS country - FROM profile_addresses AS pa - LEFT JOIN geoloc_localities AS gl ON (gl.id = pa.localityId) - LEFT JOIN geoloc_administrativeareas AS ga ON (ga.id = pa.administrativeAreaId) - LEFT JOIN geoloc_administrativeareas AS gas ON (gas.id = pa.subAdministrativeAreaId) - LEFT JOIN geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pa.countryId) - WHERE pa.pid in {?} AND pa.pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility->levels()); - - return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + $it = Address::iterate($pids, array(), array(), $visibility->levels()); + return PlIteratorUtils::subIterator($it->value(), PlIteratorUtils::arrayValueCallback('pid')); } public function addPhones(ProfilePhones $phones) { - $p = $phones->get(0); + $p = $phones->get(Profile::PHONE_LINK_ADDRESS | Profile::PHONE_TYPE_ANY); foreach ($p as $phone) { - if ($phone->link_type == Phone::LINK_ADDRESS && array_key_exists($phone->link_id, $this->addresses)) { - $this->addresses[$phone->link_id]->addPhone($phone); + /* We must iterate on the addresses because id is not uniq thus, + * $this->addresse[$phone->link_id] is invalid. + */ + foreach ($this->addresses as $address) { + if ($address->type == Address::LINK_PROFILE && $address->id == $phone->link_id) { + $address->addPhone($phone); + } } } } @@ -714,12 +586,8 @@ class ProfilePhones extends ProfileField public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT tel_type AS type, search_tel AS search, display_tel AS display, link_type, comment, pid - FROM profile_phones - WHERE pid IN {?} AND pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility->levels()); - return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + $it = Phone::iterate($pids, array(), array(), $visibility->levels()); + return PlIteratorUtils::subIterator($it->value(), PlIteratorUtils::arrayValueCallback('pid')); } } // }}} @@ -739,17 +607,11 @@ class ProfileJobs extends ProfileField public static function fetchData(array $pids, ProfileVisibility $visibility) { CompanyList::preload($pids); - $data = XDB::iterator('SELECT pj.id, pj.pid, pj.description, pj.url as user_site, - IF(pj.email_pub IN {?}, pj.email, NULL) AS user_email, - pj.jobid, pjse.name AS sector, pjsse.name AS subsector, - pjssse.name AS subsubsector - FROM profile_job AS pj - LEFT JOIN profile_job_sector_enum AS pjse ON (pjse.id = pj.sectorid) - LEFT JOIN profile_job_subsector_enum AS pjsse ON (pjsse.id = pj.subsectorid) - LEFT JOIN profile_job_subsubsector_enum AS pjssse ON (pjssse.id = pj.subsubsectorid) - WHERE pj.pid IN {?} AND pj.pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', - pj.id', + $data = XDB::iterator('SELECT id, pid, description, url as user_site, jobid, + IF(email_pub IN {?}, email, NULL) AS user_email + FROM profile_job + WHERE pid IN {?} AND pub IN {?} + ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', id', $visibility->levels(), $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -770,10 +632,10 @@ class ProfileJobs extends ProfileField public function addPhones(ProfilePhones $phones) { - $p = $phones->get(0); + $p = $phones->get(Profile::PHONE_LINK_JOB | Profile::PHONE_TYPE_ANY); foreach ($p as $phone) { if ($phone->link_type == Phone::LINK_JOB && array_key_exists($phone->link_id, $this->jobs)) { - $this->jobs[$phone->link_id]->addPhones($phone); + $this->jobs[$phone->link_id]->addPhone($phone); } } } @@ -782,8 +644,8 @@ class ProfileJobs extends ProfileField { $a = $addresses->get(Profile::ADDRESS_PRO); foreach ($a as $address) { - if ($address->link_type == Address::LINK_JOB && array_key_exists($address->link_id, $this->jobs)) { - $this->jobs[$address->link_id]->setAddress($address); + if ($address->type == Address::LINK_JOB && array_key_exists($address->id, $this->jobs)) { + $this->jobs[$address->id]->setAddress($address); } } } @@ -794,9 +656,64 @@ class ProfileJobs extends ProfileField $this->company = $companies[$job->jobid]; } } + + public function addJobTerms(ProfileJobTerms $jobterms) + { + $terms = $jobterms->get(); + foreach ($terms as $term) { + if ($this->pid == $term->pid && array_key_exists($term->jid, $this->jobs)) { + $this->jobs[$term->jid]->addTerm($term); + } + } + } } // }}} +// {{{ class ProfileJobTerms [ Field ] +class ProfileJobTerms extends ProfileField +{ + private $jobterms = array(); + public function __construct(PlInnerSubIterator $it) + { + $this->pid = $it->value(); + while ($term = $it->next()) { + $this->jobterms[] = new JobTerm($term); + } + } + + public function get() + { + return $this->jobterms; + } + + public static function fetchData(array $pids, ProfileVisibility $visibility) + { + $data = XDB::iterator('SELECT jt.jtid, jte.full_name, jt.pid, jt.jid + FROM profile_job_term AS jt + INNER JOIN profile_job AS j ON (jt.pid = j.pid AND jt.jid = j.id) + LEFT JOIN profile_job_term_enum AS jte USING(jtid) + WHERE jt.pid IN {?} AND j.pub IN {?} + ORDER BY ' . XDB::formatCustomOrder('jt.pid', $pids), + $pids, $visibility->levels()); + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } +} +// }}} +// {{{ class ProfileMentoringTerms [ Field ] +class ProfileMentoringTerms extends ProfileJobTerms +{ + public static function fetchData(array $pids, ProfileVisibility $visibility) + { + $data = XDB::iterator('SELECT mt.jtid, jte.full_name, mt.pid + FROM profile_mentor_term AS mt + LEFT JOIN profile_job_term_enum AS jte USING(jtid) + WHERE mt.pid IN {?} + ORDER BY ' . XDB::formatCustomOrder('mt.pid', $pids), + $pids); + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } +} +// }}} // {{{ class CompanyList class CompanyList { @@ -824,14 +741,25 @@ class CompanyList LEFT JOIN profile_addresses AS pa ON (pje.id = pa.jobid AND pa.type = \'hq\') ' . $join . ' ' . $where); + $newcompanies = array(); while ($row = $it->next()) { $cp = new Company($row); $addr = new Address($row); $cp->setAddress($addr); + if (!array_key_exists($row['id'], self::$companies)) { + $newcompanies[] = $row['id']; + } self::$companies[$row['id']] = $cp; } - // TODO: add phones to addresses + // Add phones to hq + if (count($newcompanies)) { + $it = Phone::iterate(array(), array(Phone::LINK_COMPANY), $newcompanies); + while ($phone = $it->next()) { + self::$companies[$phone->link_id]->setPhone($phone); + } + } + if (count($pids) == 0) { self::$fullload = true; } @@ -842,7 +770,10 @@ class CompanyList if (!array_key_exists($id, self::$companies)) { self::preload(); } - return self::$companies[$id]; + if (isset(self::$companies[$id])) { + return self::$companies[$id]; + } + return null; } }