X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fdirenum.php;h=8a3829db4c1770e9c3cc246fb2c32dd4fd07a888;hb=af56031899164e06d9f08c5591dea06f54cb5243;hp=bbb2869d3f958d056b3409bbb664013eedcdaba6;hpb=d101a069d4d197e27fafac9f773e623eee140849;p=platal.git

diff --git a/classes/direnum.php b/classes/direnum.php
index bbb2869..8a3829d 100644
--- a/classes/direnum.php
+++ b/classes/direnum.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -29,9 +29,6 @@ class DirEnum
      * Each of these consts contains the basename of the class (its full name
      * being DE_$basename).
      */
-    const NAMETYPES      = 'nametypes';
-    const NAMES          = 'names';
-
     const BINETS         = 'binets';
     const GROUPESX       = 'groupesx';
     const SECTIONS       = 'sections';
@@ -40,14 +37,18 @@ class DirEnum
     const EDUDEGREES     = 'educationdegrees';
     const EDUFIELDS      = 'educationfields';
 
-    const CORPS          = 'corps';
+    const CURRENTCORPS   = 'currentcorps';
+    const ORIGINCORPS    = 'origincorps';
     const CORPSRANKS     = 'corpsranks';
 
-    const NATIONALITIES  = 'nationalities';
-    const COUNTRIES      = 'countries';
-    const ADMINAREAS     = 'adminareas';
-    const SUBADMINAREAS  = 'subadminareas';
-    const LOCALITIES     = 'localities';
+    const NATIONALITIES       = 'nationalities';
+    const POSTALCODES         = 'postalcodes';
+    const SUBLOCALITIES       = 'sublocalities';
+    const LOCALITIES          = 'localities';
+    const ADMNISTRATIVEAREAS3 = 'admnistrativeareas3';
+    const ADMNISTRATIVEAREAS2 = 'admnistrativeareas2';
+    const ADMNISTRATIVEAREAS1 = 'admnistrativeareas1';
+    const COUNTRIES           = 'countries';
 
     const COMPANIES      = 'companies';
     const JOBDESCRIPTION = 'jobdescription';
@@ -330,37 +331,38 @@ abstract class DE_WithSuboption extends DirEnumeration
 
     protected $suboptions = null;
 
-    protected function loadOptions()
+    protected function _fetchSubOptions($subid)
     {
-        $opts = XDB::fetchAllAssoc('id', 'SELECT ' . $this->valfield . ' AS field,
-                                                 ' . $this->optfield . ' AS subid,
-                                                 ' . $this->idfield . ' AS id
-                                            FROM ' . $this->from . '
-                                                 ' . $this->join . '
-                                                 ' . $this->where . '
-                                        GROUP BY ' . $this->valfield . '
-                                        ORDER BY ' . $this->valfield);
-        $this->options = array();
-        $this->suboptions = array();
-        foreach ($opts as $id => $opt) {
-            $this->options[$id] = $opt['field'];
-            if (!array_key_exists($opt['subid'], $this->suboptions)) {
-                $this->suboptions[$opt['subid']] = array();
-            }
-            $this->suboptions[$opt['subid']][$id] = $opt['field'];
+        if (is_null($this->suboptions)) {
+            $this->loadSubOptions($subid);
         }
     }
 
+    protected function loadSubOptions($subid)
+    {
+        $where = ($this->where == '') ? '' : $this->where . ' AND ';
+        $this->suboptions = XDB::fetchAllAssoc('id', 'SELECT ' . $this->valfield . ' AS field,
+                                                             ' . $this->idfield . ' AS id
+                                                        FROM ' . $this->from . '
+                                                             ' . $this->join . '
+                                                       WHERE ' . $where . $this->optfield . ' = ' . $subid . '
+                                                    GROUP BY ' . $this->valfield . '
+                                                    ORDER BY ' . $this->valfield);
+    }
+
     public function getOptions($subid = null)
     {
-        $this->_fetchOptions();
         if ($subid == null) {
+            $this->_fetchOptions();
             return $this->options;
-        } else if (array_key_exists($subid, $this->suboptions)) {
-            return $this->suboptions[$subid];
-        } else {
-            return array();
         }
+
+        $this->_fetchSubOptions($subid);
+        if (is_array($this->suboptions)) {
+            return $this->suboptions;
+        }
+
+        return array();
     }
 
     public function getOptionsIter($subid = null)
@@ -432,29 +434,6 @@ abstract class DE_WithSuboption extends DirEnumeration
 }
 // }}}
 
-// {{{ class DE_NameTypes
-// returns 'system' names ('lastname', 'lastname_marital', ...)
-class DE_NameTypes extends DirEnumeration
-{
-    public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION;
-
-    protected $from     = 'profile_name_enum';
-    protected $valfield = 'type';
-}
-// }}}
-
-// {{{ class DE_Names
-// returns 'system' names ('lastname', 'lastname_marital', ...)
-class DE_Names extends DirEnumeration
-{
-    public $capabilities = 0x005; // self::HAS_OPTIONS | self::SAVE_IN_SESSION;
-
-    protected $from     = 'profile_name_enum';
-    protected $idfield  = 'type';
-    protected $valfield = 'name';
-}
-// }}}
-
 /** GROUPS
  */
 // {{{ class DE_Binets
@@ -498,6 +477,7 @@ class DE_GroupesX extends DirEnumeration
 // {{{ class DE_EducationSchools
 class DE_EducationSchools extends DirEnumeration
 {
+    protected $ac_beginwith = false;
     protected $idfield   = 'profile_education_enum.id';
     protected $valfield  = 'profile_education_enum.name';
     protected $valfield2 = 'profile_education_enum.abbreviation';
@@ -509,7 +489,7 @@ class DE_EducationSchools extends DirEnumeration
 // }}}
 
 // {{{ class DE_EducationDegrees
-class DE_EducationDegrees extends DirEnumeration
+class DE_EducationDegrees extends DE_WithSuboption
 {
     public $capabilities = self::HAS_OPTIONS;
 
@@ -533,18 +513,32 @@ class DE_EducationFields extends DirEnumeration
 }
 // }}}
 
-// {{{ class DE_Corps
-class DE_Corps extends DirEnumeration
+// {{{ class DE_CurrentCorps
+class DE_CurrentCorps extends DirEnumeration
 {
     protected $idfield   = 'profile_corps_enum.id';
     protected $valfield  = 'profile_corps_enum.name';
     protected $valfield2 = 'profile_corps_enum.abbrev';
     protected $from      = 'profile_corps_enum';
+    protected $where     = 'WHERE profile_corps_enum.still_exists = 1';
 
     protected $ac_unique = 'profile_corps.pid';
     protected $ac_join   = 'INNER JOIN profile_corps ON (profile_corps.current_corpsid = profile_corps_enum.id)';
 }
 // }}}
+//
+// {{{ class DE_OriginCorps
+class DE_OriginCorps extends DirEnumeration
+{
+    protected $idfield   = 'profile_corps_enum.id';
+    protected $valfield  = 'profile_corps_enum.name';
+    protected $valfield2 = 'profile_corps_enum.abbrev';
+    protected $from      = 'profile_corps_enum';
+
+    protected $ac_unique = 'profile_corps.pid';
+    protected $ac_join   = 'INNER JOIN profile_corps ON (profile_corps.original_corpsid = profile_corps_enum.id)';
+}
+// }}}
 
 // {{{ class DE_CorpsRanks
 class DE_CorpsRanks extends DirEnumeration
@@ -565,8 +559,8 @@ class DE_CorpsRanks extends DirEnumeration
 class DE_Nationalities extends DirEnumeration
 {
     protected $idfield   = 'geoloc_countries.iso_3166_1_a2';
-    protected $valfield  = 'geoloc_countries.nationalityFR';
-    protected $valfield2 = 'geoloc_countries.nationality';
+    protected $valfield  = 'geoloc_countries.nationality';
+    protected $valfield2 = 'geoloc_countries.nationalityEn';
     protected $from      = 'geoloc_countries';
     protected $join      = 'INNER JOIN profiles ON (geoloc_countries.iso_3166_1_a2 IN (profiles.nationality1, profiles.nationality2, profiles.nationality3))';
 
@@ -575,55 +569,60 @@ class DE_Nationalities extends DirEnumeration
 }
 // }}}
 
-// {{{ class DE_Countries
-class DE_Countries extends DirEnumeration
+// {{{ class DE_AddressesComponents
+class DE_AddressesComponents extends DirEnumeration
 {
-    protected $idfield   = 'geoloc_countries.iso_3166_1_a2';
-    protected $valfield  = 'geoloc_countries.country';
-    protected $valfield2 = 'geoloc_countries.countryEn';
-    protected $from      = 'geoloc_countries';
+    protected $idfield   = 'profile_addresses_components_enum.id';
+    protected $valfield  = 'profile_addresses_components_enum.long_name';
+    protected $from      = 'profile_addresses_components_enum';
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryId)';
-    protected $ac_unique = 'profile_addresses.pid';
+    protected $ac_join   = 'INNER JOIN profile_addresses_components ON (profile_addresses_components.component_id = profile_addresses_components_enum.id)';
+    protected $ac_unique = 'profile_addresses_components.pid';
 }
 // }}}
+// {{{ class DE_AddressesComponents extensions
+class DE_Countries extends DE_AddressesComponents
+{
+    protected $where = 'WHERE  FIND_IN_SET(\'country\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'country\', profile_addresses_components_enum.types)';
+}
 
-// {{{ class DE_AdminAreas
-class DE_AdminAreas extends DE_WithSuboption
+class DE_Admnistrativeareas1 extends DE_AddressesComponents
 {
-    protected $idfield   = 'geoloc_administrativeareas.id';
-    protected $optfield  = 'geoloc_administrativeareas.country';
-    protected $valfield  = 'geoloc_administrativeareas.name';
-    protected $from      = 'geoloc_administrativeareas';
+    protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)';
+}
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.administrativeAreaId = geoloc_administrativeareas.id)';
-    protected $ac_unique = 'profile_addresses.pid';
+class DE_Admnistrativeareas2 extends DE_AddressesComponents
+{
+    protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)';
 }
-// }}}
 
-// {{{ class DE_SubAdminAreas
-class DE_SubAdminAreas extends DE_WithSuboption
+class DE_Admnistrativeareas3 extends DE_AddressesComponents
 {
-    protected $idfield   = 'geoloc_subadministrativeareas.id';
-    protected $optfield  = 'geoloc_subadministrativeareas.administrativearea';
-    protected $valfield  = 'geoloc_subadministrativeareas.name';
-    protected $from      = 'geoloc_subadministrativeareas';
+    protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)';
+}
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.subadministrativeAreaId = geoloc_subadministrativeareas.id)';
-    protected $ac_unique = 'profile_addresses.pid';
+class DE_Localities extends DE_AddressesComponents
+{
+    protected $where = 'WHERE  FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)';
 }
-// }}}
 
-// {{{ class DE_Localities
-class DE_Localities extends DirEnumeration
+class DE_Sublocalities extends DE_AddressesComponents
 {
-    protected $idfield   = 'geoloc_localities.id';
-    protected $valfield  = 'geoloc_localities.name';
-    protected $from      = 'geoloc_localities';
+    protected $where = 'WHERE  FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)';
+}
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.localityID = geoloc_localities.id)';
-    protected $ac_unique = 'profile_addresses.pid';
+class DE_Postalcodes extends DE_AddressesComponents
+{
+    protected $where = 'WHERE  FIND_IN_SET(\'postal_code\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'postal_code\', profile_addresses_components_enum.types)';
 }
+
 // }}}
 
 /** JOBS