X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fufbuilder.inc.php;h=79b918a99ae017a1f99c39da640fcd23c8e9f433;hb=16d2c88314364b5e79936f4262d453dff03abdad;hp=6b437d8318da17689fe568a25cf4eaf15c2ff756;hpb=96f01fba129a8936cb76b9533c24fd5ea918b551;p=platal.git diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index 6b437d8..79b918a 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -166,6 +166,7 @@ class UFB_QuickSearch extends UserFilterBuilder { $fields = array( new UFBF_Quick('quick', 'Recherche rapide'), + new UFBF_NotRegistered('nonins', 'Non inscrits'), ); parent::__construct($fields, $envprefix); } @@ -175,7 +176,12 @@ class UFB_QuickSearch extends UserFilterBuilder // {{{ class UFB_AdvancedSearch class UFB_AdvancedSearch extends UserFilterBuilder { - public function __construct($envprefix = '') + /** Create a UFB_AdvancedSearch. + * @param $include_admin Whether to include 'admin-only' fields + * @param $include_ax Whether to include 'ax-only' fields + * @param $envprefix Optional prefix for form field names. + */ + public function __construct($include_admin = false, $include_ax = false, $envprefix = '') { $fields = array( new UFBF_Name('name', 'Nom'), @@ -187,10 +193,10 @@ class UFB_AdvancedSearch extends UserFilterBuilder new UFBF_Town('city', 'Ville / Code Postal'), new UFBF_Country('countryTxt', 'country', 'Pays'), - new UFBF_AdminArea('region', 'Région'), + new UFBF_AdminArea('administrativearea', 'Région'), + new UFBF_SubAdminArea('subadministrativearea', 'Département'), new UFBF_JobCompany('entreprise', 'Entreprise'), - new UFBF_JobSector('sector', 'Poste'), new UFBF_JobDescription('jobdescription', 'Fonction'), new UFBF_JobCv('cv', 'CV'), new UFBF_JobTerms('jobterm', 'Mots-clefs'), @@ -210,6 +216,11 @@ class UFB_AdvancedSearch extends UserFilterBuilder new UFBF_Mentor('only_referent', 'Référent'), ); + + if ($include_admin || $include_ax) { + $fields[] = new UFBF_SchoolIds('schoolid_ax', 'Matricule AX', UFC_SchoolId::AX); + } + parent::__construct($fields, $envprefix); } } @@ -269,7 +280,7 @@ abstract class UFB_Field return false; } - if (!$this->empty) { + if (!$this->isEmpty()) { $ufc = $this->buildUFC($ufb); if ($ufc != null) { $ufb->addCond($ufc); @@ -322,7 +333,7 @@ abstract class UFBF_Text extends UFB_Field return $this->raise("Le champ %s est trop court (minimum {$this->minlength})."); } else if (strlen($this->val) > $this->maxlength) { return $this->raise("Le champ %s est trop long (maximum {$this->maxlength})."); - } else if (preg_match(":[\]\[<>{}~/§_`|%$^=+]|\*\*:u", $this->val)) { + } else if (preg_match(":[\]\[<>{}~§_`|%$^=]|\*\*:u", $this->val)) { return $this->raise('Le champ %s contient un caractère interdit rendant la recherche impossible.'); } @@ -521,18 +532,8 @@ class UFBF_Quick extends UFB_Field } else { $flags = array('public'); } - if ($ufb->b('with_soundex')) { - $soundex = true; - $st = array(); - foreach ($strings as $string) { - $st[] = soundex_fr($string); - } - } else { - $soundex = false; - $st = $strings; - } $exact =$ufb->b('exact'); - $conds->addChild(new UFC_NameTokens($st, $flags, $soundex, $exact)); + $conds->addChild(new UFC_NameTokens($strings, $flags, $ufb->b('with_soundex'), $exact)); $ufb->addOrder(new UFO_Score()); } @@ -574,6 +575,48 @@ class UFBF_Quick extends UFB_Field } // }}} +// {{{ class UFBF_SchoolIds +class UFBF_SchoolIds extends UFB_Field +{ + // One of UFC_SchoolId types + protected $type; + + public function __construct($envfield, $formtext, $type = UFC_SchoolId::AX) + { + parent::__construct($envfield, $formtext); + $this->type = $type; + } + + protected function check(UserFilterBuilder &$ufb) + { + if ($ufb->blank($this->envfield)) { + $this->empty = true; + return true; + } + + $value = $ufb->t($this->envfield); + $values = explode("\n", $value); + $ids = array(); + foreach ($values as $val) { + if (preg_match('/^[0-9A-Z]{0,8}$/', $val)) { + $ids[] = $val; + } + } + if (count($ids) == 0) { + return $this->raise("Le champ %s ne contient aucune valeur valide."); + } + + $this->val = $ids; + return true; + } + + protected function buildUFC(UserFilterBuilder &$ufb) + { + return new UFC_SchoolId($this->type, $this->val); + } +} +// }}} + // {{{ class UFBF_Name class UFBF_Name extends UFBF_Text { @@ -666,6 +709,22 @@ class UFBF_Sex extends UFBF_Enum } // }}} +// {{{ class UFBF_NotRegistered +// Simple field for selecting only alive, not registered users (for quick search) +class UFBF_NotRegistered extends UFBF_Bool +{ + protected function buildUFC(UserFilterBuilder &$ufb) + { + if ($this->val) { + return new PFC_And( + new PFC_Not(new UFC_Dead()), + new PFC_Not(new UFC_Registered()) + ); + } + } +} +// }}} + // {{{ class UFBF_Registered class UFBF_Registered extends UFBF_Enum { @@ -778,14 +837,14 @@ class UFBF_Country extends UFBF_Mixed // }}} // {{{ class UFBF_AdminArea -class UFBF_AdminArea extends UFBF_Mixed +class UFBF_AdminArea extends UFBF_Index { protected $direnum = DirEnum::ADMINAREAS; protected $onlycurrentfield; - public function __construct($envfieldtext, $envfieldindex, $formtext = '', $onlycurrentfield = 'only_current') + public function __construct($envfield, $formtext = '', $onlycurrentfield = 'only_current') { - parent::__construct($envfieldtext, $envfieldindex, $formtext); + parent::__construct($envfield, $formtext); $this->onlycurrentfield = $onlycurrentfield; } @@ -803,6 +862,32 @@ class UFBF_AdminArea extends UFBF_Mixed } // }}} +// {{{ class UFBF_SubAdminArea +class UFBF_SubAdminArea extends UFBF_Index +{ + protected $direnum = DirEnum::SUBADMINAREAS; + protected $onlycurrentfield; + + public function __construct($envfield, $formtext = '', $onlycurrentfield = 'only_current') + { + parent::__construct($envfield, $formtext); + $this->onlycurrentfield = $onlycurrentfield; + } + + + protected function buildUFC(UserFilterBuilder &$ufb) + { + if ($ufb->isOn($this->onlycurrentfield)) { + $flags = UFC_Address::FLAG_CURRENT; + } else { + $flags = UFC_Address::FLAG_ANY; + } + + return new UFC_AddressField($this->val, UFC_AddressField::FIELD_SUBADMAREA, UFC_Address::TYPE_ANY, $flags); + } +} +// }}} + // {{{ class UFBF_JobCompany class UFBF_JobCompany extends UFBF_Text { @@ -833,29 +918,6 @@ class UFBF_JobCompany extends UFBF_Text } // }}} -// {{{ class UFBF_JobSector -class UFBF_JobSector extends UFBF_Mixed -{ - protected $direnum = DirEnum::SECTORS; - private $onlymentorfield; - - public function __construct($envfieldtext, $envfieldindex, $formtext = '', $onlymentorfield = 'only_referent') - { - parent::__construct($envfieldtext, $envfieldindex, $formtext); - $this->onlymentorfield = $onlymentorfield; - } - - protected function buildUFC(UserFilterBuilder &$ufb) - { - if ($ufb->isOn($this->onlymentorfield)) { - return new UFC_Mentor_Sectorization($this->val, UserFilter::JOB_SUBSECTOR); - } else { - return new UFC_Job_Sectorization($this->val, UserFilter::JOB_SUBSUBSECTOR); - } - } -} -// }}} - // {{{ class UFBF_JobTerms class UFBF_JobTerms extends UFBF_Index { @@ -955,7 +1017,7 @@ class UFBF_Group extends UFBF_Mixed // }}} // {{{ class UFBF_Section -class UFBF_Section extends UFBF_Index +class UFBF_Section extends UFBF_Mixed { protected $direnum = DirEnum::SECTIONS; @@ -1044,6 +1106,11 @@ class UFBF_Networking extends UFBF_Text } } + public function isEmpty() + { + return parent::isEmpty() || $this->nwtype == 0; + } + public function buildUFC(UserFilterBuilder &$ufb) { return new UFC_Networking($this->nwtype, $this->val); @@ -1081,24 +1148,6 @@ class UFBF_MentorTerm extends UFBF_Index } // }}} -// {{{ class UFBF_MentorSectorization -class UFBF_MentorSectorization extends UFBF_Index -{ - protected $type; - - public function __construct($envfield, $formtext = '', $type = UFC_Mentor_Sectorization::SECTOR) - { - parent::__construct($envfield, $formtext); - $this->type = $type; - } - - protected function buildUFC(UserFilterBuilder &$ufb) - { - return new UFC_Mentor_Sectorization($this->val, $this->type); - } -} -// }}} - // {{{ class UFBF_MentorExpertise class UFBF_MentorExpertise extends UFBF_Text {