X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=3f543a3facde83e8da15282ff37984304c93f619;hb=043bbacf7d5ceaeba4db582ac0ea7c75d6f13c80;hp=4c4e38e3aa81894d607d5485e0bfcf7ea51cd328;hpb=2b921a8064ea14cd554f03e5f561eb98e79a9246;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 4c4e38e..3f543a3 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -24,10 +24,8 @@ require_once('user.func.inc.php');
 global $globals;
 
 @$globals->search->result_where_statement = '
-    LEFT JOIN  applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)
-    LEFT JOIN  applis_def     AS ad0 ON (ad0.id = ai0.aid)
-    LEFT JOIN  applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
-    LEFT JOIN  applis_def     AS ad1 ON (ad1.id = ai1.aid)
+    LEFT JOIN  profile_education       AS edu ON (u.user_id = edu.uid)
+    LEFT JOIN  profile_education_enum  AS ede ON (ede.id = edu.eduid)
     LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
     LEFT JOIN  emploi_secteur AS es  ON (e.secteur = es.id)
     LEFT JOIN  fonctions_def  AS ef  ON (e.fonction = ef.id)
@@ -185,8 +183,10 @@ class MinificheView extends MultipageView
                 IF(n1.nat='',n1.pays,n1.nat) AS nat1, n1.a2 AS iso3166_1,
                 IF(n2.nat='',n2.pays,n2.nat) AS nat2, n2.a2 AS iso3166_2,
                 IF(n3.nat='',n3.pays,n3.nat) AS nat3, n3.a2 AS iso3166_3,
-                ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
-                ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
+                ede0.name AS eduname0, ede0.url AS eduurl0, edd0.degree AS edudegree0, edu0.grad_year AS edugrad_year0, f0.field AS edufield0,
+                ede1.name AS eduname1, ede1.url AS eduurl1, edd1.degree AS edudegree1, edu1.grad_year AS edugrad_year1, f1.field AS edufield1,
+                ede2.name AS eduname2, ede2.url AS eduurl2, edd2.degree AS edudegree2, edu2.grad_year AS edugrad_year2, f2.field AS edufield2,
+                ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3, edu3.grad_year AS edugrad_year3, f3.field AS edufield3,
                 adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region,
                 (COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
                 nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort" .
@@ -201,10 +201,22 @@ class MinificheView extends MultipageView
                  LEFT JOIN  geoloc_pays    AS n1  ON (u.nationalite = n1.a2)
                  LEFT JOIN  geoloc_pays    AS n2  ON (u.nationalite2 = n2.a2)
                  LEFT JOIN  geoloc_pays    AS n3  ON (u.nationalite3 = n3.a2)
-                 LEFT JOIN  applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)
-                 LEFT JOIN  applis_def     AS ad0 ON (ad0.id = ai0.aid)
-                 LEFT JOIN  applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
-                 LEFT JOIN  applis_def     AS ad1 ON (ad1.id = ai1.aid)
+                 LEFT JOIN  profile_education             AS edu0 ON (u.user_id = edu0.uid AND edu0.id = 0)
+                 LEFT JOIN  profile_education_enum        AS ede0 ON (ede0.id = edu0.eduid)
+                 LEFT JOIN  profile_education_degree_enum AS edd0 ON (edd0.id = edu0.degreeid)
+                 LEFT JOIN  profile_education_field_enum  AS f0   ON (f0.id = edu0.fieldid)
+                 LEFT JOIN  profile_education             AS edu1 ON (u.user_id = edu1.uid AND edu1.id = 1)
+                 LEFT JOIN  profile_education_enum        AS ede1 ON (ede1.id = edu1.eduid)
+                 LEFT JOIN  profile_education_degree_enum AS edd1 ON (edd1.id = edu1.degreeid)
+                 LEFT JOIN  profile_education_field_enum  AS f1   ON (f1.id = edu1.fieldid)
+                 LEFT JOIN  profile_education             AS edu2 ON (u.user_id = edu2.uid AND edu2.id = 2)
+                 LEFT JOIN  profile_education_enum        AS ede2 ON (ede2.id = edu2.eduid)
+                 LEFT JOIN  profile_education_degree_enum AS edd2 ON (edd2.id = edu2.degreeid)
+                 LEFT JOIN  profile_education_field_enum  AS f2   ON (f2.id = edu2.fieldid)
+                 LEFT JOIN  profile_education             AS edu3 ON (u.user_id = edu3.uid AND edu3.id = 3)
+                 LEFT JOIN  profile_education_enum        AS ede3 ON (ede3.id = edu3.eduid)
+                 LEFT JOIN  profile_education_degree_enum AS edd3 ON (edd3.id = edu3.degreeid)
+                 LEFT JOIN  profile_education_field_enum  AS f3   ON (f3.id = edu3.fieldid)
                  LEFT JOIN  adresses       AS adr ON (u.user_id = adr.uid
                                                       AND FIND_IN_SET('active', adr.statut)".(S::logged() ? "" : " AND adr.pub = 'public'").")
                  LEFT JOIN  geoloc_pays    AS gp  ON (adr.country = gp.a2)