From 95b1a6d875b603440469ce8410c9c92176daca7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 13 Dec 2010 15:23:35 +0100 Subject: [PATCH] Fixes mix in education/degree. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/fusionax.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/fusionax.php b/modules/fusionax.php index 8a4f9c9..6b8b373 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -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 -- 2.1.4