X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fapplis.func.inc.php;h=c5b39155ea9a9440bf81597ec252faf7361838cf;hb=043bbacf7d5ceaeba4db582ac0ea7c75d6f13c80;hp=82235db5ca4ef462c2b32faaddbe644de7f3754c;hpb=dc4cca93c80e52642c8134a570fecee217221d8a;p=platal.git

diff --git a/include/applis.func.inc.php b/include/applis.func.inc.php
index 82235db..c5b3915 100644
--- a/include/applis.func.inc.php
+++ b/include/applis.func.inc.php
@@ -19,73 +19,142 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function applis_options($current=0) {
-    $html = '<option value="-1"></option>';
-    $res  = XDB::iterator("select * from applis_def order by text");
+function applis_options($current=0)
+{
+    $html = '<option value = "-1"></option>';
+    $res  = XDB::iterator("SELECT  *
+                             FROM  profile_education_enum
+                         ORDER BY  name");
     while ($arr_appli = $res->next()) {
-        $html .= '<option value="'.$arr_appli["id"].'"';
-        if ($arr_appli["id"]==$current) $html .= " selected='selected'";
-        $html .= '>'.htmlspecialchars($arr_appli["text"])."</option>\n";
+        $html .= '<option value="' . $arr_appli["id"] . '"';
+        if ($arr_appli["id"]==$current) {
+            $html .= " selected='selected'";
+        }
+        $html .= '>' . htmlspecialchars($arr_appli["name"]) . "</option>\n";
     }
     return $html;
 }
+
 /** pour appeller applis_options depuis smarty
  */
-function _applis_options_smarty($params){
-    if(!isset($params['selected']))
+function _applis_options_smarty($params)
+{
+    if(!isset($params['selected'])) {
         $params['selected'] = 0;
+    }
     return applis_options($params['selected']);
 }
-Platal::page()->register_function('applis_options','_applis_options_smarty');
-
+Platal::page()->register_function('applis_options', '_applis_options_smarty');
 
 /** affiche un Array javascript contenant les types de chaque appli
  */
-function applis_type(){
+function applis_type()
+{
     $html = "";
-    $res=XDB::iterRow("select type from applis_def order by text");
-    if (list($appli_type) = $res->next()) {
-        $html .= "new Array('".str_replace(",","','",$appli_type)."')";
+    $res = XDB::iterRow("SELECT  eduid, degreeid
+                           FROM  profile_education_degree AS d
+                     INNER JOIN  profile_education_enum   AS e ON (e.id = d.eduid)
+                       ORDER BY  e.name");
+    if ($appli_type = $res->next()) {
+        $eduid = $appli_type['0'];
+        $html .= "[";
+        $html .= $appli_type['1'];
+        $appli_type = $res->next();
+        while ($appli_type['0'] == $eduid) {
+            $html .= "," . $appli_type['1'];
+            $appli_type = $res->next();
+        }
+        $html .= "]";
     }
-    while (list($appli_type) = $res->next()) {
-        $html .= ",\nnew Array('".str_replace(",","','",$appli_type)."')";
+    while ($appli_type) {
+        $eduid = $appli_type['0'];
+        $html .= ",\n[";
+        $html .= $appli_type['1'];
+        $appli_type = $res->next();
+        while ($appli_type['0'] == $eduid) {
+            $html .= "," . $appli_type['1'];
+            $appli_type = $res->next();
+        }
+        $html .= "]";
     }
     return $html;
 }
-Platal::page()->register_function('applis_type','applis_type');
+Platal::page()->register_function('applis_type', 'applis_type');
 
 /** affiche tous les types possibles d'applis
  */
-function applis_type_all(){
-    $res = XDB::query("show columns from applis_def like 'type'");
-    $arr_appli = $res->fetchOneAssoc();
-    return str_replace(")","",str_replace("set(","",$arr_appli["Type"]));
+function applis_type_all()
+{
+    $html = "";
+    $res = XDB::query("SELECT  id
+                         FROM  profile_education_degree_enum
+                     ORDER BY  id");
+    return implode(',', $res->fetchColumn());
+}
+Platal::page()->register_function('applis_type_all', 'applis_type_all');
+
+/** affiche les noms de tous les types possibles d'applis
+ */
+function applis_type_name()
+{
+    $html = "";
+    $res = XDB::query("SELECT  degree
+                           FROM  profile_education_degree_enum
+                       ORDER BY  id");
+    return '\'' . implode('\',\'', $res->fetchColumn()) . '\'';
 }
-Platal::page()->register_function('applis_type_all','applis_type_all');
+Platal::page()->register_function('applis_type_name', 'applis_type_name');
 
 /** formatte une ecole d'appli pour l'affichage
  */
-function applis_fmt($type, $text, $url) {
-    $txt="";
-    if (($type != "Ingénieur") && ($type != "Diplôme"))
-        $txt .= $type;
-    if ($text != "Université") {
-        if ($txt) $txt .= ' ';
-        if ($url)
-            $txt .= "<a href=\"$url\" onclick=\"return popup(this)\">$text</a>";
-        else
-            $txt .= $text;
+function applis_fmt($name, $url, $degree, $grad_year, $field, $sexe, $long)
+{
+    $field = strtolower($field);
+    $txt = "";
+
+    if ($grad_year || $field) {
+        $txt .= "<span  title=\"(";
+        if ($grad_year) {
+            if ($sexe) {
+                $txt .= "diplômée en $grad_year";
+            } else {
+                $txt .= "diplômé en $grad_year";
+            }
+            if ($field) {
+                $txt .= ", ";
+            }
+        }
+        if ($field) {
+            $txt .= "domaine : $field)\">";
+        }
     }
-    if (!$txt) {
-        $txt .= $text;
+
+    if (($degree != "Licence") || ($long)) {
+        if (($degree != "Ingénieur") && ($degree != "Diplôme")) {
+            $txt .= $degree;
+        }
+        if ($name != "Université") {
+            if ($name) {
+                $txt .= ' ';
+            }
+            if ($url != ' ') {
+                $txt .= "<a href=\"$url\" onclick=\"return popup(this)\">$name</a>";
+            } else {
+                $txt .= $name;
+            }
+        }
     }
+    $txt .= "</span>";
+
     return $txt;
 }
-function _applis_fmt($params, &$smarty) {
+
+function _applis_fmt($params, &$smarty)
+{
     extract($params);
-    return applis_fmt($type, $text, $url);
+    return applis_fmt($name, $url, $degree, $grad_year, $field, $sexe, $long);
 }
-Platal::page()->register_function('applis_fmt','_applis_fmt');
+Platal::page()->register_function('applis_fmt', '_applis_fmt');
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>