rename classes from Formation to Education (UFC, UFBF)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/classes/userfilter.php b/classes/userfilter.php
index ded3262..e7be334 100644 (file)
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -131,11 +131,11 @@ class UFC_Promo implements UserFilterCondition
 }
 // }}}
 
-// {{{ class UFC_Formation
+// {{{ class UFC_EducationSchool
 /** Filters users by formation
  * @param $val The formation to search (either ID or array of IDs)
  */
-class UFC_Formation implements UserFilterCondition
+class UFC_EducationSchool implements UserFilterCondition
 {
     private $val;
 
@@ -155,8 +155,8 @@ class UFC_Formation implements UserFilterCondition
 }
 // }}}
 
-// {{{ class UFC_Diploma
-class UFC_Diploma implements UserFilterCondition
+// {{{ class UFC_EducationDegree
+class UFC_EducationDegree implements UserFilterCondition
 {
     private $diploma;
 
@@ -176,8 +176,8 @@ class UFC_Diploma implements UserFilterCondition
 }
 // }}}
 
-// {{{ class UFC_StudyField
-class UFC_StudyField implements UserFilterCondition
+// {{{ class UFC_EducationField
+class UFC_EducationField implements UserFilterCondition
 {
     private $val;
 

diff --git a/include/directory.enums.inc.php b/include/directory.enums.inc.php
index 5ea6b32..02c013f 100644 (file)
--- a/include/directory.enums.inc.php
+++ b/include/directory.enums.inc.php
@@ -33,9 +33,9 @@ class DirEnum
     const GROUPESX       = 'groupesx';
     const SECTIONS       = 'sections';
 
-    const SCHOOLS        = 'schools';
-    const DEGREES        = 'degrees';
-    const STUDIESDOMAINS = 'studiesdomains';
+    const EDUSCHOOLS     = 'educationschools';
+    const EDUDEGREES     = 'educationdegrees';
+    const EDUFIELDS      = 'educationfields';
 
     const NATIONALITIES  = 'nationalities';
     const COUNTRIES      = 'countries';
@@ -323,8 +323,8 @@ class DE_GroupesX extends DirEnumeration
 
 /** EDUCATION
  */
-// {{{ class DE_Schools
-class DE_Schools extends DirEnumeration
+// {{{ class DE_EducationSchools
+class DE_EducationSchools extends DirEnumeration
 {
     protected $valfield  = 'name';
     protected $valfield2 = 'abbreviation';
@@ -335,8 +335,8 @@ class DE_Schools extends DirEnumeration
 }
 // }}}
 
-// {{{ class DE_Degrees
-class DE_Degrees extends DirEnumeration
+// {{{ class DE_EducationDegrees
+class DE_EducationDegrees extends DirEnumeration
 {
     protected $from = 'profile_education_degree_enum';
     protected $valfield = 'degree';
@@ -389,8 +389,8 @@ class DE_Degrees extends DirEnumeration
 }
 // }}}
 
-// {{{ class DE_StudiesSector
-class DE_StudiesSector extends DirEnumeration
+// {{{ class DE_EducationFields
+class DE_EducationFields extends DirEnumeration
 {
     protected $valfield = 'field';
     protected $from     = 'profile_education_field_enum';

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index a435cac..e76b830 100644 (file)
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -169,9 +169,9 @@ class UFB_AdvancedSearch extends UserFilterBuilder
             new UFBF_Group('groupexTxt', 'groupex', 'Groupe X'),
             new UFBF_Section('sectionTxt', 'section', 'Section'),
 
-            new UFBF_Formation('schoolTxt', 'school', "École d'application"),
-            new UFBF_Diploma('diplomaTxt', 'diploma', 'Diplôme'),
-            new UFBF_StudiesDomain('fieldTxt', 'field', "Domaine d'études"),
+            new UFBF_EducationSchool('schoolTxt', 'school', "École d'application"),
+            new UFBF_EducationDegree('diplomaTxt', 'diploma', 'Diplôme'),
+            new UFBF_EducationField('fieldTxt', 'field', "Domaine d'études"),
 
             new UFBF_Comment('free', 'Commentaire'),
             new UFBF_Phone('phone_number', 'Téléphone'),
@@ -930,38 +930,38 @@ class UFBF_Section extends UFBF_Index
 }
 // }}}
 
-// {{{ class UFBF_Formation
-class UFBF_Formation extends UFBF_Mixed
+// {{{ class UFBF_EducationSchool
+class UFBF_EducationSchool extends UFBF_Mixed
 {
-    protected $direnum = DirEnum::SCHOOLS;
+    protected $direnum = DirEnum::EDUSCHOOLS;
 
     protected function buildUFC(UserFilterBuilder &$ufb)
     {
-        return new UFC_Formation($this->val);
+        return new UFC_EducationSchool($this->val);
     }
 }
 // }}}
 
-// {{{ class UFBF_Diploma
-class UFBF_Diploma extends UFBF_Mixed
+// {{{ class UFBF_EducationDegree
+class UFBF_EducationDegree extends UFBF_Mixed
 {
-    protected $direnum = DirEnum::DEGREES;
+    protected $direnum = DirEnum::EDUDEGREES;
 
     protected function buildUFC(UserFilterBuilder &$ufb)
     {
-        return new UFC_Diploma($this->val);
+        return new UFC_EducationDegree($this->val);
     }
 }
 // }}}
 
-// {{{ class UFBF_StudiesDomain
-class UFBF_StudiesDomain extends UFBF_Mixed
+// {{{ class UFBF_EducationField
+class UFBF_EducationField extends UFBF_Mixed
 {
-    protected $direnum = DirEnum::STUDIESDOMAINS;
+    protected $direnum = DirEnum::EDUFIELDS;
 
     protected function buildUFC(UserFilterBuilder &$ufb)
     {
-        return new UFC_StudyField($this->val);
+        return new UFC_EducationField($this->val);
     }
 }
 // }}}

diff --git a/modules/search.php b/modules/search.php
index dab51c0..a1539b1 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -207,7 +207,7 @@ class SearchModule extends PLModule
             'secteurTxt'         => DirEnum::SECTORS,
             'description'        => DirEnum::JOBDESCRIPTION,
             'nationaliteTxt'     => DirEnum::NATIONALITIES,
-            'schoolTxt'          => DirEnum::SCHOOLS,
+            'schoolTxt'          => DirEnum::EDUSCHOOLS,
         );
         if (!array_key_exists($enums, $type)) {
             exit();
@@ -259,9 +259,9 @@ class SearchModule extends PLModule
             break;
           case 'diploma':
             if (Env::has('school') && Env::i('school') != 0) {
-              $ids = DirEnum::getOptions(DirEnum::DEGREES, Env::i('school'));
+              $ids = DirEnum::getOptions(DirEnum::EDUDEGREES, Env::i('school'));
             } else {
-              $ids = DirEnum::getOptions(DirEnum::DEGREES);
+              $ids = DirEnum::getOptions(DirEnum::EDUDEGREES);
             }
             break;
           case 'groupex':
@@ -278,7 +278,7 @@ class SearchModule extends PLModule
             }
             break;
           case 'school':
-            $ids = DirEnum::getOptions(DirEnum::SCHOOLS);
+            $ids = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
             $page->assign('onchange', 'changeSchool(this.value)');
             break;
           case 'section':