Fixes mix in education/degree.
authorStéphane Jacob <sj@m4x.org>
Mon, 13 Dec 2010 14:23:35 +0000 (15:23 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 13 Dec 2010 14:23:35 +0000 (15:23 +0100)
Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax.php

index 8a4f9c9..6b8b373 100644 (file)
@@ -580,20 +580,20 @@ class FusionAxModule extends PLModule
     {
         $page->changeTpl('fusionax/education.tpl');
 
-        $missingEducation = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_diplome)
+        $missingEducation = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_formation)
                                                 FROM  fusionax_formations AS f
-                                               WHERE  f.Intitule_diplome != '' AND NOT EXISTS (SELECT  *
-                                                                                                 FROM  profile_education_enum AS e
-                                                                                                WHERE  f.Intitule_diplome = e.name)");
-        $missingDegree = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_formation)
+                                               WHERE  f.Intitule_formation != '' AND NOT EXISTS (SELECT  *
+                                                                                                   FROM  profile_education_enum AS e
+                                                                                                  WHERE  f.Intitule_formation = e.name)");
+        $missingDegree = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_diplome)
                                              FROM  fusionax_formations AS f
-                                            WHERE  f.Intitule_formation != '' AND NOT EXISTS (SELECT  *
-                                                                                                FROM  profile_education_degree_enum AS e
-                                                                                               WHERE  f.Intitule_formation = e.abbreviation)");
-        $missingCouple = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_diplome) AS edu, f.Intitule_formation AS degree, ee.id AS eduid, de.id AS degreeid
+                                            WHERE  f.Intitule_diplome != '' AND NOT EXISTS (SELECT  *
+                                                                                              FROM  profile_education_degree_enum AS e
+                                                                                             WHERE  f.Intitule_diplome = e.abbreviation)");
+        $missingCouple = XDB::rawIterator("SELECT  DISTINCT(f.Intitule_formation) AS edu, f.Intitule_diplome AS degree, ee.id AS eduid, de.id AS degreeid
                                              FROM  fusionax_formations           AS f
-                                       INNER JOIN  profile_education_enum        AS ee ON (f.Intitule_diplome = ee.name)
-                                       INNER JOIN  profile_education_degree_enum AS de ON (f.Intitule_formation = de.abbreviation)
+                                       INNER JOIN  profile_education_enum        AS ee ON (f.Intitule_formation = ee.name)
+                                       INNER JOIN  profile_education_degree_enum AS de ON (f.Intitule_diplome = de.abbreviation)
                                             WHERE  f.Intitule_diplome != '' AND f.Intitule_formation != ''
                                                    AND NOT EXISTS (SELECT  *
                                                                      FROM  profile_education_degree AS d