Fixes addresses related DirEnum.

[platal.git] / classes / direnum.php

diff --git a/classes/direnum.php b/classes/direnum.php
index 5ed7807..0b51cb6 100644 (file)
--- a/classes/direnum.php
+++ b/classes/direnum.php
@@ -40,14 +40,17 @@ 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 SUBLOCALITIES       = 'sublocalities';
+    const LOCALITIES          = 'localities';
+    const ADMNISTRATIVEAREAS3 = 'admnistrativeareas3';
+    const ADMNISTRATIVEAREAS2 = 'admnistrativeareas2';
+    const ADMNISTRATIVEAREAS1 = 'admnistrativeareas1';
+    const COUNTRIES           = 'countries';
 
     const COMPANIES      = 'companies';
     const JOBDESCRIPTION = 'jobdescription';
@@ -498,6 +501,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';
@@ -533,18 +537,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
@@ -575,55 +593,54 @@ 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_AdminAreas
-class DE_AdminAreas extends DE_WithSuboption
+// {{{ class DE_AddressesComponents extensions
+class DE_Countries 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(\'country\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'country\', 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_Admnistrativeareas1 extends DE_AddressesComponents
+{
+    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)';
 }
-// }}}
 
-// {{{ class DE_SubAdminAreas
-class DE_SubAdminAreas extends DE_WithSuboption
+class DE_Admnistrativeareas2 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_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)';
+}
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.subadministrativeAreaId = geoloc_subadministrativeareas.id)';
-    protected $ac_unique = 'profile_addresses.pid';
+class DE_Admnistrativeareas3 extends DE_AddressesComponents
+{
+    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)';
 }
-// }}}
 
-// {{{ class DE_Localities
-class DE_Localities extends DirEnumeration
+class DE_Localities extends DE_AddressesComponents
 {
-    protected $idfield   = 'geoloc_localities.id';
-    protected $valfield  = 'geoloc_localities.name';
-    protected $from      = 'geoloc_localities';
+    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)';
+}
 
-    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.localityID = geoloc_localities.id)';
-    protected $ac_unique = 'profile_addresses.pid';
+class DE_Sublocalities extends DE_AddressesComponents
+{
+    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)';
 }
+
 // }}}
 
 /** JOBS