X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fsearch%2Fadv.form.tpl;h=77aac6655314ad28a21587f663f127c6a4207d49;hb=6720bd539b442abebd1064af458fd55fbbae8f95;hp=76d289e58e5115ab68c19fa09378efa073ea8dd1;hpb=2ab7a09f6f1ec835efb29a86c25edc43729b2b8f;p=platal.git

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 76d289e..77aac66 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -24,63 +24,123 @@
 
 {javascript name="jquery"}
 {javascript name="jquery.autocomplete"}
-<script type="text/javascript">{literal}
-	// <!--
-	function launch_form(url) {
-	  var f = document.getElementById('recherche');
-	  f.action = url;
-	  f.submit();
-	}
-	function format_autocomplete(row) {
-	  if (row[1] == 1) {
-	    return row[0];
-	  }
-	  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() {
-		$(".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;
-	      	});
-	    });
-	});
-	-->
+<script type="text/javascript">// <!-- 
+        var baseurl = "{#globals.baseurl#}/search/";
+        {literal}
+        // display an autocomplete row : blabla (nb of found matches)
+        function make_format_autocomplete(block) {
+          return function(row) {
+              regexp = new RegExp('(' + RegExp.escape(block.value) + ')', 'i');
+              name = row[0].replace(regexp, '<strong>$1</strong>');
+              if (row[1] == 1) {
+                return name;
+              }
+              return name + '<em>&nbsp;&nbsp;-&nbsp;&nbsp;'+ row[1] + ' camarades</em>';
+            };
+        }
+        
+        // when changing country, open up region choice
+        function changeCountry(a2) {
+          $(".autocompleteTarget[@name='country']").attr('value',a2);
+          if (a2) {
+            $(".autocomplete[@name='countryTxt']").addClass('hidden_valid');
+            $("[@name='region']").parent().load(baseurl + 'list/region/', { country:a2 }, function() {
+              if ($("select[@name='region']").children("option").size() > 1) {
+                $("select[@name='region']").attr('value', '{/literal}{$smarty.request.region}{literal}');
+                $("tr#region_ln").show();
+              } else {
+                $("select[@name='region']").attr('value', '');
+                $("tr#region_ln").hide();
+              }
+            });
+          } else {
+            $(".autocomplete[@name='countryTxt']").removeClass('hidden_valid');
+            $("select[@name='region']").attr('value', '');
+            $("tr#region_ln").hide();
+          }
+        }
+        
+        // when changing school, open diploma choice
+        function changeSchool(schoolId) {
+          $(".autocompleteTarget[@name='school']").attr('value',schoolId);
+          if (schoolId) {
+            $(".autocomplete[@name='schoolTxt']").addClass('hidden_valid');
+            $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
+              if ($("select[@name='diploma']").children("option").size() > 1) {
+                $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
+                $("tr#diploma_ln").show();
+              } else {
+                $("select[@name='diploma']").attr('value', '');
+                $("tr#diploma_ln").hide();
+              }
+            });
+          } else {
+            $(".autocomplete[@name='schoolTxt']").removeClass('hidden_valid');
+            $("select[@name='diploma']").attr('value', '');
+            $("tr#diploma_ln").hide();
+          }
+        }
+        
+        // when choosing autocomplete from list, must validate
+        function select_autocomplete(name) {
+          nameRealField = name.replace(/Txt$/, '');
+          // nothing to do if field is not a text field for a list
+          if (nameRealField == name)
+            return null;
+          // if changing country, might want to open region choice
+          if (nameRealField == 'country')
+            return function(i) {
+                changeCountry(i.extra[1]);
+              }
+          if (nameRealField == 'school')
+            return function(i) {
+                changeSchool(i.extra[1]);
+              }
+          // change field in list and display text field as valid
+          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() {
+            $(".autocompleteTarget").hide();
+            $(".autocomplete").show().each(function() {
+              targeted = $("../.autocompleteTarget",this)[0];
+              if (targeted && targeted.value) {
+                me = $(this);
+                $.get(baseurl + 'list/'+ targeted.name +'/'+targeted.value, {},function(textValue) {
+                  me.attr('value', textValue);
+                  me.addClass('hidden_valid');
+                });
+              }
+              $(this).autocomplete(baseurl + "autocomplete/"+this.name,{
+                selectOnly:1,
+                formatItem:make_format_autocomplete(this),
+                field:this.name,
+                onItemSelect:select_autocomplete(this.name),
+                matchSubset:0,
+                width:$(this).width()});
+              });
+              $(".autocomplete").change(function() { $(this).removeClass('hidden_valid'); });
+              $(".autocomplete[@name='countryTxt']").change(function() { changeCountry(''); });
+              changeCountry({/literal}'{$smarty.request.country}'{literal});
+              $(".autocomplete[@name='schoolTxt']").change(function() { changeSchool(''); });
+              changeSchool({/literal}'{$smarty.request.school}'{literal});
+              $(".autocompleteToSelect").each(function() {
+                var fieldName = $(this).attr('href');
+                $(this).attr('href', baseurl + 'list/'+fieldName).click(function() {
+                  var oldval = $("input.autocompleteTarget[@name='"+fieldName+"']")[0].value;
+                  $(".autocompleteTarget[@name='"+fieldName+"']").parent().load(baseurl + 'list/'+fieldName,{},function(selectBox) {
+                    $(".autocompleteTarget[@name='"+fieldName+"']").remove();
+                    $(".autocomplete[@name='"+fieldName+"Txt']").remove();
+                    $("select[@name='"+fieldName+"']").attr('value', oldval);
+                  });
+                  return false;
+                });
+              });
+            });
+        -->
 {/literal}</script>
 <form id="recherche" action="search/adv" method="get">
   <table class="bicol" cellpadding="3" summary="Recherche">
@@ -92,8 +152,8 @@
     <tr>
       <td>Nom</td>
       <td>
-    	<input type="hidden" name="rechercher" value="Chercher"/>
-    	<input type="submit" style="display:none"/>
+        <input type="hidden" name="rechercher" value="Chercher"/>
+        <input type="submit" style="display:none"/>
         <input type="text" class="autocomplete" name="name" size="32" value="{$smarty.request.name}" />
       </td>
     </tr>
@@ -122,7 +182,7 @@
         <select name="egal2">
           <option value="=" {if $smarty.request.egal2 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
           <option value="&gt;=" {if $smarty.request.egal2 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
-          <option value="&lt;=" {if $smarty.request.egal2 eq "&lt;="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
+          <option value="&lt;=" {if $smarty.request.egal2 neq "&gt;=" && $smarty.request.egal2 neq "="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
         </select>
         <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
       </td>
@@ -133,13 +193,13 @@
         <table>
           <tr>
             <td style="width:100px">
-              <input type="radio" name="woman" value="0" {if !$smarty.request.woman}checked="checked"{/if} />Indifférent
+              <input type="radio" name="woman" value="0" {if !$smarty.request.woman}checked="checked"{/if} id="woman0"/><label for="woman0">Indifférent</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="woman" value="1" {if $smarty.request.woman eq 1}checked="checked"{/if} />Homme
+              <input type="radio" name="woman" value="1" {if $smarty.request.woman eq 1}checked="checked"{/if} id="woman1"/><label for="woman1">Homme</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="woman" value="2" {if $smarty.request.woman eq 2}checked="checked"{/if} />Femme
+              <input type="radio" name="woman" value="2" {if $smarty.request.woman eq 2}checked="checked"{/if} id="woman2"/><label for="woman2">Femme</label>
             </td>
           </tr>
         </table>
@@ -151,13 +211,13 @@
         <table>
           <tr>
             <td style="width:100px">
-              <input type="radio" name="subscriber" value="0" {if !$smarty.request.subscriber}checked="checked"{/if} />Indifférent
+              <input type="radio" name="subscriber" value="0" {if !$smarty.request.subscriber}checked="checked"{/if} id="subscriber0"/><label for="subscriber0">Indifférent</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="subscriber" value="1" {if $smarty.request.subscriber eq 1}checked="checked"{/if} />Inscrit
+              <input type="radio" name="subscriber" value="1" {if $smarty.request.subscriber eq 1}checked="checked"{/if} id="subscriber1"/><label for="subscriber1">Inscrit</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="subscriber" value="2" {if $smarty.request.subscriber eq 2}checked="checked"{/if} />Non inscrit
+              <input type="radio" name="subscriber" value="2" {if $smarty.request.subscriber eq 2}checked="checked"{/if} id="subscriber2"/><label for="subscriber2">Non inscrit</label>
             </td>
           </tr>
         </table>
@@ -169,13 +229,13 @@
         <table>
           <tr>
             <td style="width:100px">
-              <input type="radio" name="alive" value="0" {if !$smarty.request.alive}checked="checked"{/if} />Indifférent
+              <input type="radio" name="alive" value="0" {if !$smarty.request.alive}checked="checked"{/if} id="alive0"/><label for="alive0">Indifférent</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="alive" value="1" {if $smarty.request.alive eq 1}checked="checked"{/if} />Vivant
+              <input type="radio" name="alive" value="1" {if $smarty.request.alive eq 1}checked="checked"{/if} id="alive1"/><label for="alive1">Vivant</label>
             </td>
             <td style="width:100px">
-              <input type="radio" name="alive" value="2" {if $smarty.request.alive eq 2}checked="checked"{/if} />Décédé
+              <input type="radio" name="alive" value="2" {if $smarty.request.alive eq 2}checked="checked"{/if} id="alive2"/><label for="alive2">Décédé</label>
             </td>
           </tr>
         </table>
@@ -197,25 +257,15 @@
     <tr>
       <td>Pays</td>
       <td>
-        <select name="country" onchange="return Ajax.update_html('region', '{#globals.baseurl#}/search/ajax/region/' + this.value);">
-        {if $smarty.request.country}
-          {assign var="country" value=$smarty.request.country}
-        {else}
-          {assign var="country" value=""}
-        {/if}
-        {geoloc_country country=$country available=true}
-        </select>
+        <input name="countryTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="country" class="autocompleteTarget" type="hidden" value="{$smarty.request.country}"/>
+        <a href="country" class="autocompleteToSelect">{icon name="table" title="Tous les pays"}</a>
       </td>
     </tr>
-    <tr>
+    <tr id="region_ln">
       <td>Région ou département</td>
-      <td id="region">
-        {if $smarty.request.region}
-          {assign var="region" value=$smarty.request.region}
-        {else}
-          {assign var="region" value=""}
-        {/if}
-        {include file="search/adv.region.form.tpl" country=$smarty.request.country}
+      <td>
+        <input name="region" type="hidden" size="32" value="{$smarty.request.region}"/>
       </td>
     </tr>
     <tr>
@@ -233,9 +283,9 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Fonction</td>
       <td>
-      	<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>
+        <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>
@@ -245,9 +295,9 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Secteur</td>
       <td>
-      	<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>
+        <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>
@@ -256,8 +306,8 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     </tr>
     <tr>
       <td colspan="2">
-        <input type='checkbox' name='only_referent' {if $smarty.request.only_referent}checked='checked'{/if} />
-        chercher uniquement parmi les camarades se proposant comme référents
+        <input type='checkbox' name='only_referent' {if $smarty.request.only_referent}checked='checked'{/if} id="only_referent"/>
+        <label for="only_referent">chercher uniquement parmi les camarades se proposant comme référents</label>
       </td>
     </tr>
     <tr>
@@ -266,52 +316,47 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td>Nationalité</td>
       <td>
-      	<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>
+        <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>
-      	<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>
+        <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>
-      	<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>
+        <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>
-      	<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>
+        <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>
       <td>Formation</td>
       <td>
-        <select name="school" onchange="return Ajax.update_html('grade', '{#globals.baseurl#}/search/ajax/grade/' + this.value);">
-          <option value="0"></option>
-          {iterate item=cs from=$choix_schools}
-          <option value="{$cs.id}" {if $smarty.request.school eq $cs.id}selected="selected"{/if}>
-            {$cs.text|htmlspecialchars}
-          </option>
-          {/iterate}
-        </select>
+        <input name="schoolTxt" type="text" class="autocomplete" style="display:none" size="32"/>
+        <input name="school" class="autocompleteTarget" type="hidden" value="{$smarty.request.school}"/>
+        <a href="school" class="autocompleteToSelect">{icon name="table" title="Toutes les formations"}</a>
       </td>
     </tr>
-    <tr>
-      <td></td>
-      <td id="grade">
-        {include file="search/adv.grade.form.tpl" grade=$smarty.request.diploma}
+    <tr id="diploma_ln">
+      <td>Diplôme</td>
+      <td>
+        <input name="diploma" type="hidden" size="32" value="{$smarty.request.diploma}"/>
       </td>
     </tr>
     <tr>
@@ -321,19 +366,16 @@ checked="checked"{/if}/>chercher uniquement les adresses où les camarades sont
     <tr>
       <td colspan="2" style="padding-top: 1.5em">
         <div style="float: right">
-          <input type="button" value="Chercher" onclick="launch_form('search/adv')"/>
+          <input type="button" value="Chercher" />
         </div>
         {if $smarty.session.auth ge AUTH_COOKIE}
-          <input type='checkbox' name='order' value='date_mod' {if $smarty.request.order eq "date_mod"}checked='checked'{/if} />
-          mettre les fiches modifiées récemment en premier
+          <input type='checkbox' name='order' value='date_mod' {if $smarty.request.order eq "date_mod"}checked='checked'{/if} id="order"/>
+          <label for="order">mettre les fiches modifiées récemment en premier</label>
         {/if}
       </td>
     </tr>
   </table>
 </form>
-<p class="center">
-  <input type="button" value="Voir les résultats sur une carte" onclick="launch_form('geoloc/')"/>
-</p>
 <p>
   <strong>N.B.</strong> Le caractère joker * peut remplacer une ou plusieurs lettres dans les recherches.
 </p>