autocompletion (suite)
authorx2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sun, 1 Apr 2007 22:06:02 +0000 (22:06 +0000)
committerx2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sun, 1 Apr 2007 22:06:02 +0000 (22:06 +0000)
git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1647 839d8a87-29fc-0310-9880-83ba4fa771e5

htdocs/css/base.css
modules/search.php
templates/search/adv.form.tpl

index a5c499f..ff65763 100644 (file)
@@ -57,4 +57,9 @@
 .ac_loading {
        background:window url(../images/wait.gif) no-repeat scroll right center;
 }
+
+.hidden_valid {
+       background-color: #bfb;
+}
+
 /* vim: set et ts=4 sts=4 sw=4: */
index a0b7a62..29d4c0b 100644 (file)
@@ -29,7 +29,8 @@ class SearchModule extends PLModule
             'search/ajax/region'  => $this->make_hook('region', AUTH_COOKIE, 'user', NO_AUTH),
             'search/ajax/grade'   => $this->make_hook('grade',  AUTH_COOKIE, 'user', NO_AUTH),
             'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC),
-            'search/autocomplete' => $this->make_hook('autocomplete', AUTH_PUBLIC),
+            'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH),
+            'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH),
         );
     }
 
@@ -93,25 +94,8 @@ class SearchModule extends PLModule
         global $page;
 
         $page->assign('formulaire',1);
-        $page->assign('choix_nats',
-                      XDB::iterator('SELECT  g.a2 AS id, IF(nat=\'\', g.pays, g.nat) AS text
-                                       FROM  geoloc_pays AS g
-                                 INNER JOIN  auth_user_md5 AS u ON (u.nationalite = g.a2)
-                                   GROUP BY  g.a2
-                                   ORDER BY  text'));
-        $page->assign('choix_postes',
-                      XDB::iterator('SELECT id,fonction_fr FROM fonctions_def
-                                             ORDER BY fonction_fr'));
-        $page->assign('choix_binets',
-                      XDB::iterator('SELECT id,text FROM binets_def ORDER BY text'));
-        $page->assign('choix_groupesx',
-                      XDB::iterator('SELECT id,text FROM groupesx_def ORDER BY text'));
-        $page->assign('choix_sections',
-                      XDB::iterator('SELECT id,text FROM sections ORDER BY text'));
         $page->assign('choix_schools',
                       XDB::iterator('SELECT id,text FROM applis_def ORDER BY text'));
-        $page->assign('choix_secteurs',
-                      XDB::iterator('SELECT id,label FROM emploi_secteur ORDER BY label'));
         $this->get_diplomas();
     }
 
@@ -290,31 +274,134 @@ class SearchModule extends PLModule
         header('Content-Type: text/plain; charset="UTF-8"');
         $q = $_REQUEST['q'];
         if (!$q) exit();
+        // default search
         $unique = 'user_id';
         $db = 'auth_user_md5';
+        $realid = false;
+        $contains = false;
+        
         switch ($type) {
+        case 'binetTxt':
+                                               $db = 'binets_def INNER JOIN binets_ins ON(binets_def.id = binets_ins.binet_id)';
+                                               $field='binets_def.text';
+                                               if (strlen($q) > 2)
+                                                               $contains = true;
+                                               $realid = 'binets_def.id';
+                                               break;
+        case 'city': $db = 'geoloc_city INNER JOIN adresses ON(geoloc_city.id = adresses.cityid)'; $unique='uid'; $field='geoloc_city.name'; break;
+        case 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; break;
         case 'firstname': $field = 'prenom'; break;
+        case 'fonctionTxt':
+                       $db = 'fonctions_def INNER JOIN entreprises ON(entreprises.fonction = fonctions_def.id)';
+                       $field = 'fonction_fr';
+                       $unique = 'uid';
+                       $realid = 'fonctions_def.id';
+                       break;
+        case 'groupexTxt':
+                                               $db = 'groupesx_def INNER JOIN groupesx_ins ON(groupesx_def.id = groupesx_ins.gid)';
+                                               $field='groupesx_def.text';
+                                               if (strlen($q) > 2)
+                                                               $contains = true;
+                                               $realid = 'groupesx_def.id';
+                                               $unique = 'guid';
+                                               break;
         case 'name': $field = 'nom'; break;
+               case 'nationaliteTxt':
+                               $db = 'geoloc_pays INNER JOIN auth_user_md5 ON(geoloc_pays.a2 = auth_user_md5.nationalite)';
+                               $field = 'IF(geoloc_pays.nat=\'\', geoloc_pays.pays, geoloc_pays.nat)';
+                               $realid = 'geoloc_pays.a2';
+                               break;
         case 'nickname': $field = 'profile_nick'; $db = 'auth_user_quick'; break;
-        case 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; break;
-        case 'city': $db = 'geoloc_city INNER JOIN adresses ON(geoloc_city.id = adresses.cityid)'; $unique='uid'; $field='geoloc_city.name'; break;
         case 'poste': $db = 'entreprises'; $field = 'poste'; $unique='uid'; break;
+               case 'secteurTxt':
+                               $db = 'emploi_secteur INNER JOIN entreprises ON(entreprises.secteur = emploi_secteur.id)';
+                               $field = 'emploi_secteur.label';
+                               $realid = 'emploi_secteur.id';
+                               $unique = 'uid';
+                               break;
+               case 'sectionTxt':
+                               $db = 'sections INNER JOIN auth_user_md5 ON(auth_user_md5.section = sections.id)';
+                               $field = 'sections.text';
+                               $realid = 'sections.id';
+                               break;
         default: exit();
         }
 
-        $liste = XDB::iterator('SELECT '.$field.' AS field, COUNT(DISTINCT '.$unique.') AS nb FROM '.$db.' WHERE '.$field.' LIKE {?} GROUP BY '.$field.' LIMIT 11', $q.'%');
+        $list = XDB::iterator('
+                                               SELECT
+                                                               '.$field.' AS field,
+                                                               COUNT(DISTINCT '.$unique.') AS nb
+                                                               '.($realid?(', '.$realid.' AS id'):'').'
+                                               FROM '.$db.'
+                                               WHERE '.$field.' LIKE {?}
+                                               GROUP BY '.$field.'
+                                               ORDER BY nb DESC
+                                               LIMIT 11',
+                                               ($contains?'%':'').str_replace('*','%',$q).'%');
         $nbResults = 0;
-        while ($result = $liste->next()) {
+        while ($result = $list->next()) {
             $nbResults++;
             if ($nbResults == 11) {
                 echo '...|1'."\n";
             } else {
-                echo $result['field'].'|'.$result['nb']."\n";
+                echo $result['field'].'|'.$result['nb'].(isset($result['id'])?('|'.$result['id']):'')."\n";
             }
         }
 
         exit();
     }
+    
+    function handler_list(&$page, $type = null, $idVal = null)
+    {
+               // Give the list of all values possible of type and builds a select input for it
+                               $field = 'text';
+                               $id = 'id';
+               switch ($type) {
+               case 'binet':
+                               $db = 'binets_def';
+                               break;
+               case 'fonction':
+                               $db = 'fonctions_def';
+                               $field = 'fonction_fr';
+                               break;
+               case 'groupex':
+                               $db = 'groupesx_def';
+                               break;
+               case 'nationalite':
+                               $db = 'geoloc_pays';
+                               $field = 'IF(nat=\'\', pays, nat)';
+                               $id = 'a2';
+                               break;
+               case 'section':
+                               $db = 'sections';
+                               break;
+               case 'secteur':
+                               $db = 'emploi_secteur';
+                               $field = 'label';
+                               break;
+               default: exit();
+               }
+               if (isset($idVal)) {
+                               header('Content-Type: text/plain; charset="UTF-8"');
+                               $result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal);
+                               echo $result->fetchOneCell();
+               } else {
+                       header('Content-Type: text/xml; charset="UTF-8"');
+                               $list = XDB::iterator('
+                                               SELECT
+                                                               '.$field.' AS field,
+                                                               '.$id.' AS id
+                                               FROM '.$db.'
+                                               ORDER BY '.$field);
+                               echo '<select name="'.$type.'">';
+                               while ($result = $list->next()) {
+                                               echo '<option value="'.$result['id'].'">'.htmlspecialchars($result['field']).'</option>';
+                               }
+                               echo '</select>';
+                               }
+                                               
+               exit();
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
index f31defd..76d289e 100644 (file)
          }
          return row[0] + ' ('+ row[1] + ')';
        }
+       function select_autocomplete(name) {
+         nameRealField = name.replace(/Txt$/, '');
+         if (nameRealField == name)
+               return null;
+         return function(i) {
+               nameRealField = this.field.replace(/Txt$/, '');
+               $(".autocompleteTarget[@name='"+nameRealField+"']").attr('value',i.extra[1]);
+               $(".autocomplete[@name='"+this.field+"']").addClass('hidden_valid');
+         }
+       }
        $(document).ready(function() {
-             $(".autocomplete").each(function() {
-               $(this).autocomplete("search/autocomplete/"+this.name,{selectOnly:1,formatItem:format_autocomplete,matchSubset:0,width:$(this).width()});
-             });
+               $(".autocompleteTarget").hide();
+           $(".autocomplete").show().each(function() {
+                       targeted = $("../.autocompleteTarget",this)[0];
+                       if (targeted && targeted.value) {
+                               me = $(this);
+                               $.get('search/list/'+ targeted.name +'/'+targeted.value, {},function(textValue) {
+                                       me.attr('value', textValue);
+                                       me.addClass('hidden_valid');
+                               });
+                       }
+               $(this).autocomplete("search/autocomplete/"+this.name,{
+                         selectOnly:1,
+                         formatItem:format_autocomplete,
+                         field:this.name,
+                         onItemSelect:select_autocomplete(this.name),
+                         matchSubset:0,
+                         width:$(this).width()});
+           });
+           $(".autocomplete").change(function() { $(this).removeClass('hidden_valid'); });
+           $(".autocompleteToSelect").each(function() {
+               var fieldName = $(this).attr('href');
+               $(this).attr('href','search/list/'+fieldName).click(function() {
+                       var oldval = $("input.autocompleteTarget[@name='"+fieldName+"']")[0].value;
+                       $(".autocompleteTarget[@name='"+fieldName+"']").parent().load('search/list/'+fieldName,{},function(selectBox) {
+                               $(".autocompleteTarget[@name='"+fieldName+"']").remove();
+                               $(".autocomplete[@name='"+fieldName+"Txt']").remove();
+                               $("select[@name='"+fieldName+"']").attr('value', oldval);
+                                 });
+                               return false;
+               });
+           });
        });
        -->
 {/literal}</script>
@@ -195,14 +233,9 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Fonction</td>
       <td>
-        <select name="fonction">
-          <option value="0"></option>
-          {iterate from=$choix_postes item=cp}
-          <option value="{$cp.id}" {if $smarty.request.fonction eq $cp.id}selected{/if}>
-            {$cp.fonction_fr}
-          </option>
-          {/iterate}
-        </select>
+       <input name="fonctionTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="fonction" class="autocompleteTarget" type="hidden" value="{$smarty.request.fonction}"/>
+               <a href="fonction" class="autocompleteToSelect">{icon name="table" title="Toutes les fonctions"}</a>
       </td>
     </tr>
     <tr>
@@ -212,14 +245,9 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Secteur</td>
       <td>
-        <select name="secteur">
-          <option value="0"></option>
-          {iterate item=cs from=$choix_secteurs}
-          <option value="{$cs.id}" {if $smarty.request.secteur eq $cs.id}selected{/if}>
-            {$cs.label}
-          </option>
-          {/iterate}
-        </select>
+       <input name="secteurTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="secteur" class="autocompleteTarget" type="hidden" value="{$smarty.request.secteur}"/>
+               <a href="secteur" class="autocompleteToSelect">{icon name="table" title="Tous les secteurs"}</a>
       </td>
     </tr>
     <tr>
@@ -238,51 +266,33 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Nationalité</td>
       <td>
-        <select name="nationalite">
-          {iterate from=$choix_nats item=cn}
-          <option value="{$cn.id}" {if $smarty.request.nationalite eq $cn.id}selected="selected"{/if}>
-            {$cn.text}
-          </option>
-          {/iterate}
-        </select>
+       <input name="nationaliteTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="nationalite" class="autocompleteTarget" type="hidden" value="{$smarty.request.nationalite}"/>
+               <a href="nationalite" class="autocompleteToSelect">{icon name="table" title="Toutes les nationalités"}</a>
       </td>
     </tr>
     <tr>
       <td>Binet</td>
       <td>
-        <select name="binet">
-        <option value="0"></option>
-        {iterate item=cb from=$choix_binets}
-          <option value="{$cb.id}" {if $smarty.request.binet eq $cb.id}selected="selected"{/if}>
-            {$cb.text|htmlspecialchars}
-          </option>
-        {/iterate}
-        </select>
+       <input name="binetTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="binet" class="autocompleteTarget" type="hidden" value="{$smarty.request.binet}"/>
+               <a href="binet" class="autocompleteToSelect">{icon name="table" title="Tous les binets"}</a>
       </td>
     </tr>
     <tr>
       <td>Groupe X</td>
       <td>
-        <select name="groupex">
-        <option value="0"></option>
-        {iterate item=cg from=$choix_groupesx}
-          <option value="{$cg.id}" {if $smarty.request.groupex eq $cg.id}selected="selected"{/if}>
-            {$cg.text}
-          </option>
-        {/iterate}
-        </select>
+       <input name="groupexTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="groupex" class="autocompleteTarget" type="hidden" value="{$smarty.request.groupex}"/>
+               <a href="groupex" class="autocompleteToSelect">{icon name="table" title="Tous les groupes X"}</a>
       </td>
     </tr>
     <tr>
       <td>Section</td>
       <td>
-        <select name="section">
-          {iterate item=cs from=$choix_sections}
-          <option value="{$cs.id}" {if $smarty.request.section eq $cs.id}selected="selected"{/if}>
-            {$cs.text}
-          </option>
-          {/iterate}
-        </select>
+       <input name="sectionTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+               <input name="section" class="autocompleteTarget" type="hidden" value="{$smarty.request.section}"/>
+               <a href="section" class="autocompleteToSelect">{icon name="table" title="Toutes les sections"}</a>
       </td>
     </tr>
     <tr>